From b9a4760b446c930469122c637ca1d9194d7b7269 Mon Sep 17 00:00:00 2001
From: Per Bothner <per@bothner.com>
Date: Tue, 8 Aug 2023 18:32:37 -0700
Subject: [PATCH] Move files imported from unicode-properties into subdirectory

Specifically  addons/xterm-addon-unicode-graphemes/src/third-party/.
---
 .eslintrc.json                                                | 4 +---
 .../src/UnicodeGraphemeProvider.ts                            | 2 +-
 .../src/{ => third-party}/UnicodeProperties.ts                | 0
 .../src/{ => third-party}/tiny-inflate.ts                     | 0
 .../src/{ => third-party}/unicode-trie.ts                     | 0
 test/api/Terminal.api.ts                                      | 2 +-
 test/api/TestUtils.ts                                         | 3 ++-
 7 files changed, 5 insertions(+), 6 deletions(-)
 rename addons/xterm-addon-unicode-graphemes/src/{ => third-party}/UnicodeProperties.ts (100%)
 rename addons/xterm-addon-unicode-graphemes/src/{ => third-party}/tiny-inflate.ts (100%)
 rename addons/xterm-addon-unicode-graphemes/src/{ => third-party}/unicode-trie.ts (100%)

diff --git a/.eslintrc.json b/.eslintrc.json
index 701c3a72..2ad17123 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -39,9 +39,7 @@
     "sourceType": "module"
   },
   "ignorePatterns": [
-    "addons/xterm-addon-unicode-graphemes/src/tiny-inflate.ts",
-    "addons/xterm-addon-unicode-graphemes/src/unicode-trie.ts",
-    "addons/xterm-addon-unicode-graphemes/src/UnicodeProperties.ts",
+    "addons/*/src/third-party/*.ts",
     "**/inwasm-sdks/*",
     "**/typings/*.d.ts",
     "**/node_modules",
diff --git a/addons/xterm-addon-unicode-graphemes/src/UnicodeGraphemeProvider.ts b/addons/xterm-addon-unicode-graphemes/src/UnicodeGraphemeProvider.ts
index 06987c18..b1c62020 100644
--- a/addons/xterm-addon-unicode-graphemes/src/UnicodeGraphemeProvider.ts
+++ b/addons/xterm-addon-unicode-graphemes/src/UnicodeGraphemeProvider.ts
@@ -6,7 +6,7 @@
 import { IUnicodeVersionProvider } from 'xterm';
 import { UnicodeCharProperties, UnicodeCharWidth } from 'common/services/Services';
 import { UnicodeService } from 'common/services/UnicodeService';
-import * as UC from './UnicodeProperties';
+import * as UC from './third-party/UnicodeProperties';
 
 export class UnicodeGraphemeProvider implements IUnicodeVersionProvider {
   public readonly version = '15-graphemes';
diff --git a/addons/xterm-addon-unicode-graphemes/src/UnicodeProperties.ts b/addons/xterm-addon-unicode-graphemes/src/third-party/UnicodeProperties.ts
similarity index 100%
rename from addons/xterm-addon-unicode-graphemes/src/UnicodeProperties.ts
rename to addons/xterm-addon-unicode-graphemes/src/third-party/UnicodeProperties.ts
diff --git a/addons/xterm-addon-unicode-graphemes/src/tiny-inflate.ts b/addons/xterm-addon-unicode-graphemes/src/third-party/tiny-inflate.ts
similarity index 100%
rename from addons/xterm-addon-unicode-graphemes/src/tiny-inflate.ts
rename to addons/xterm-addon-unicode-graphemes/src/third-party/tiny-inflate.ts
diff --git a/addons/xterm-addon-unicode-graphemes/src/unicode-trie.ts b/addons/xterm-addon-unicode-graphemes/src/third-party/unicode-trie.ts
similarity index 100%
rename from addons/xterm-addon-unicode-graphemes/src/unicode-trie.ts
rename to addons/xterm-addon-unicode-graphemes/src/third-party/unicode-trie.ts
diff --git a/test/api/Terminal.api.ts b/test/api/Terminal.api.ts
index 17c8555f..81eaada2 100644
--- a/test/api/Terminal.api.ts
+++ b/test/api/Terminal.api.ts
@@ -33,7 +33,7 @@ describe('API Integration Tests', function(): void {
   });
 
   // fails with the grapheme injection, not sure why...
-  it.skip('Proposed API check', async () => {
+  it('Proposed API check', async () => {
     await openTerminal(page, { allowProposedApi: false });
     await page.evaluate(`
       try {
diff --git a/test/api/TestUtils.ts b/test/api/TestUtils.ts
index 4b7a1d69..220bd42c 100644
--- a/test/api/TestUtils.ts
+++ b/test/api/TestUtils.ts
@@ -47,13 +47,14 @@ export async function openTerminal(page: playwright.Page, options: ITerminalOpti
   await page.evaluate(`window.term = new Terminal(${JSON.stringify({ allowProposedApi: true, ...options })})`);
   await page.evaluate(`window.term.open(document.querySelector('#terminal-container'))`);
   
+    /*
   // TODO: make this injection configurable from outside
   await page.evaluate(`
     window.unicode = new UnicodeGraphemesAddon();
     window.term.loadAddon(window.unicode);
     window.term.unicode.activeVersion = '15-graphemes';
   `);
-
+*/
   await page.waitForSelector('.xterm-rows');
 }