From 4ed88d8fa6295104bd00a01bf7c9c3be1740c85c Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 24 May 2024 15:41:10 +0700
Subject: [PATCH] refactor(developer): move developer-utils files into src/ and
 sub-folder

In preparation for moving source file types into developer-utils, move
the existing developer-utils files into src/ and src/utils subfolders.
---
 developer/src/common/web/utils/index.ts                     | 5 -----
 developer/src/common/web/utils/package.json                 | 2 +-
 developer/src/common/web/utils/src/index.ts                 | 6 ++++++
 .../src/common/web/utils/src/{ => utils}/KeymanSentry.ts    | 0
 .../src/common/web/utils/src/{ => utils}/keyman-urls.ts     | 0
 developer/src/common/web/utils/src/{ => utils}/markdown.ts  | 0
 developer/src/common/web/utils/src/{ => utils}/options.ts   | 0
 .../web/utils/src/{ => utils}/validate-mit-license.ts       | 0
 developer/src/common/web/utils/test/test-license.ts         | 2 +-
 developer/src/common/web/utils/tsconfig.json                | 1 -
 10 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 developer/src/common/web/utils/index.ts
 create mode 100644 developer/src/common/web/utils/src/index.ts
 rename developer/src/common/web/utils/src/{ => utils}/KeymanSentry.ts (100%)
 rename developer/src/common/web/utils/src/{ => utils}/keyman-urls.ts (100%)
 rename developer/src/common/web/utils/src/{ => utils}/markdown.ts (100%)
 rename developer/src/common/web/utils/src/{ => utils}/options.ts (100%)
 rename developer/src/common/web/utils/src/{ => utils}/validate-mit-license.ts (100%)

diff --git a/developer/src/common/web/utils/index.ts b/developer/src/common/web/utils/index.ts
deleted file mode 100644
index 8465175063..0000000000
--- a/developer/src/common/web/utils/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export { validateMITLicense } from './src/validate-mit-license.js';
-export { KeymanSentry, SentryNodeOptions } from './src/KeymanSentry.js';
-export { getOption, loadOptions, clearOptions } from './src/options.js';
-export { escapeMarkdownChar } from './src/markdown.js';
-export { KeymanUrls } from './src/keyman-urls.js';
\ No newline at end of file
diff --git a/developer/src/common/web/utils/package.json b/developer/src/common/web/utils/package.json
index b93cca8efa..ad3b796a21 100644
--- a/developer/src/common/web/utils/package.json
+++ b/developer/src/common/web/utils/package.json
@@ -3,7 +3,7 @@
   "description": "Keyman Developer utilities",
   "type": "module",
   "exports": {
-    ".": "./build/index.js"
+    ".": "./build/src/index.js"
   },
   "files": [
     "/build/"
diff --git a/developer/src/common/web/utils/src/index.ts b/developer/src/common/web/utils/src/index.ts
new file mode 100644
index 0000000000..5da5e4c48c
--- /dev/null
+++ b/developer/src/common/web/utils/src/index.ts
@@ -0,0 +1,6 @@
+export { validateMITLicense } from './utils/validate-mit-license.js';
+export { KeymanSentry, SentryNodeOptions } from './utils/KeymanSentry.js';
+export { getOption, loadOptions, clearOptions } from './utils/options.js';
+export { escapeMarkdownChar } from './utils/markdown.js';
+export { KeymanUrls } from './utils/keyman-urls.js';
+
diff --git a/developer/src/common/web/utils/src/KeymanSentry.ts b/developer/src/common/web/utils/src/utils/KeymanSentry.ts
similarity index 100%
rename from developer/src/common/web/utils/src/KeymanSentry.ts
rename to developer/src/common/web/utils/src/utils/KeymanSentry.ts
diff --git a/developer/src/common/web/utils/src/keyman-urls.ts b/developer/src/common/web/utils/src/utils/keyman-urls.ts
similarity index 100%
rename from developer/src/common/web/utils/src/keyman-urls.ts
rename to developer/src/common/web/utils/src/utils/keyman-urls.ts
diff --git a/developer/src/common/web/utils/src/markdown.ts b/developer/src/common/web/utils/src/utils/markdown.ts
similarity index 100%
rename from developer/src/common/web/utils/src/markdown.ts
rename to developer/src/common/web/utils/src/utils/markdown.ts
diff --git a/developer/src/common/web/utils/src/options.ts b/developer/src/common/web/utils/src/utils/options.ts
similarity index 100%
rename from developer/src/common/web/utils/src/options.ts
rename to developer/src/common/web/utils/src/utils/options.ts
diff --git a/developer/src/common/web/utils/src/validate-mit-license.ts b/developer/src/common/web/utils/src/utils/validate-mit-license.ts
similarity index 100%
rename from developer/src/common/web/utils/src/validate-mit-license.ts
rename to developer/src/common/web/utils/src/utils/validate-mit-license.ts
diff --git a/developer/src/common/web/utils/test/test-license.ts b/developer/src/common/web/utils/test/test-license.ts
index 653f89ba69..501f4f4711 100644
--- a/developer/src/common/web/utils/test/test-license.ts
+++ b/developer/src/common/web/utils/test/test-license.ts
@@ -2,7 +2,7 @@ import * as fs from 'fs';
 import { assert } from 'chai';
 import 'mocha';
 import { makePathToFixture } from './helpers/index.js';
-import { validateMITLicense } from '../src/validate-mit-license.js';
+import { validateMITLicense } from '../src/utils/validate-mit-license.js';
 
 function verifyLicenseFile(filename: string) {
   return validateMITLicense(fs.readFileSync(makePathToFixture('license', filename), 'utf-8'));
diff --git a/developer/src/common/web/utils/tsconfig.json b/developer/src/common/web/utils/tsconfig.json
index c5980c82f9..fa41799c2e 100644
--- a/developer/src/common/web/utils/tsconfig.json
+++ b/developer/src/common/web/utils/tsconfig.json
@@ -7,7 +7,6 @@
       "baseUrl": ".",
     },
   "include": [
-    "index.ts",
     "src/**/*.ts",
   ],
 }
\ No newline at end of file