From 8ebae9515e04a097d31bd8b762c14485d119fb4a Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Wed, 24 Aug 2022 14:26:44 +1000 Subject: [PATCH] =?UTF-8?q?Revert=20"feat(core):=20turn=20@keymanapp/ldml-?= =?UTF-8?q?keyboard-constants=20into=20a=20module=20=F0=9F=99=80"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/include/ldml/.gitignore | 1 - core/include/ldml/package.json | 16 ---------------- core/include/ldml/tsconfig.build.json | 18 ------------------ core/include/ldml/tsconfig.json | 4 ++-- core/tools/ldml-const-builder/build.sh | 4 ++-- .../src/kmldmlc/src/keyman/kmx/kmx-plus.ts | 11 ----------- developer/src/kmldmlc/tsconfig.json | 1 - package-lock.json | 14 +------------- package.json | 1 - 9 files changed, 5 insertions(+), 65 deletions(-) delete mode 100644 core/include/ldml/.gitignore delete mode 100644 core/include/ldml/package.json delete mode 100644 core/include/ldml/tsconfig.build.json delete mode 100644 developer/src/kmldmlc/src/keyman/kmx/kmx-plus.ts diff --git a/core/include/ldml/.gitignore b/core/include/ldml/.gitignore deleted file mode 100644 index 3e39f0a460..0000000000 --- a/core/include/ldml/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ldml-const-builder/ \ No newline at end of file diff --git a/core/include/ldml/package.json b/core/include/ldml/package.json deleted file mode 100644 index 61b71870d9..0000000000 --- a/core/include/ldml/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "@keymanapp/ldml-keyboard-constants", - "description": "Keyman LDML keyboard constants", - "keywords": [ - "keyboard", - "keyman", - "ldml", - "unicode" - ], - "license": "MIT", - "main": "build/keyboardprocessor_ldml.js", - "repository": { - "type": "git", - "url": "git+https://github.com/keymanapp/keyman.git" - } -} diff --git a/core/include/ldml/tsconfig.build.json b/core/include/ldml/tsconfig.build.json deleted file mode 100644 index 1a7b9fdfbb..0000000000 --- a/core/include/ldml/tsconfig.build.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extends": "../../../tsconfig-base.json", - "compilerOptions": { - "composite": true, - "declaration": true, - "module": "CommonJS", - "moduleResolution": "node", - "rootDir": ".", - "outDir": "ldml-const-builder/", - }, - "exclude": [ - "node_modules" - ], - "files": [ - "keyboardprocessor_ldml.ts", - "ldml-const-builder.ts" - ] -} diff --git a/core/include/ldml/tsconfig.json b/core/include/ldml/tsconfig.json index f8a56d0687..01411ba39e 100644 --- a/core/include/ldml/tsconfig.json +++ b/core/include/ldml/tsconfig.json @@ -5,13 +5,13 @@ "declaration": true, "module": "CommonJS", "moduleResolution": "node", - "rootDir": ".", "outDir": "build/", }, "exclude": [ "node_modules" ], "files": [ - "keyboardprocessor_ldml.ts" + "keyboardprocessor_ldml.ts", + "ldml-const-builder.ts" ] } diff --git a/core/tools/ldml-const-builder/build.sh b/core/tools/ldml-const-builder/build.sh index d231d2967d..c19e34e27c 100755 --- a/core/tools/ldml-const-builder/build.sh +++ b/core/tools/ldml-const-builder/build.sh @@ -36,13 +36,13 @@ fi if builder_has_action build; then # Generate index.ts - npx tsc -b ../../include/ldml/tsconfig.build.json + npx tsc -b ../../include/ldml/ builder_report success build fi if builder_has_action run; then - node ../../include/ldml/ldml-const-builder/ldml-const-builder.js > ${KBP_LDML_H_FILE} + node ../../include/ldml/build/core/include/ldml/ldml-const-builder.js > ${KBP_LDML_H_FILE} echo "Updated ${KBP_LDML_H_FILE}" builder_report success run diff --git a/developer/src/kmldmlc/src/keyman/kmx/kmx-plus.ts b/developer/src/kmldmlc/src/keyman/kmx/kmx-plus.ts deleted file mode 100644 index f464a05272..0000000000 --- a/developer/src/kmldmlc/src/keyman/kmx/kmx-plus.ts +++ /dev/null @@ -1,11 +0,0 @@ -// import * as r from 'restructure'; - -import { constants } from '@keymanapp/ldml-keyboard-constants'; - -// Uses defns from ... - -export default class KMXPlusFile { - constructor() { - console.log(constants); - } -} \ No newline at end of file diff --git a/developer/src/kmldmlc/tsconfig.json b/developer/src/kmldmlc/tsconfig.json index d6f6004769..ccdb2efcfe 100644 --- a/developer/src/kmldmlc/tsconfig.json +++ b/developer/src/kmldmlc/tsconfig.json @@ -22,6 +22,5 @@ ], "references": [ { "path": "../../../common/web/keyman-version" }, - { "path": "../../../core/include/ldml/"} ] } diff --git a/package-lock.json b/package-lock.json index 027c55279f..8fc6dbd502 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,6 @@ "workspaces": [ "resources/gosh", "resources/build/version", - "core/include/ldml", "developer/src/kmlmc", "developer/src/kmldmlc", "developer/src/server", @@ -377,10 +376,6 @@ "integrity": "sha512-B9EoJFjhqcQ9OmQrNorItO+OwEOORNn3S31WuiHvZY/dm9ajkB7AKD/8toessEtHHNL+58jofbq7hMMY9v4yig==", "dev": true }, - "core/include/ldml": { - "name": "@keymanapp/ldml-keyboard-constants", - "license": "MIT" - }, "developer/js": { "name": "@keymanapp/lexical-model-compiler", "extraneous": true, @@ -1062,10 +1057,6 @@ "resolved": "developer/src/kmldmlc", "link": true }, - "node_modules/@keymanapp/ldml-keyboard-constants": { - "resolved": "core/include/ldml", - "link": true - }, "node_modules/@keymanapp/lexical-model-compiler": { "resolved": "developer/src/kmlmc", "link": true @@ -7744,7 +7735,7 @@ "chai": "^4.3.4", "chalk": "^2.4.2", "commander": "^3.0.0", - "crc-32": "^1.2.2", + "crc-32": "*", "mocha": "^8.4.0", "restructure": "^3.0.0", "ts-node": "^9.1.1", @@ -7816,9 +7807,6 @@ } } }, - "@keymanapp/ldml-keyboard-constants": { - "version": "file:core/include/ldml" - }, "@keymanapp/lexical-model-compiler": { "version": "file:developer/src/kmlmc", "requires": { diff --git a/package.json b/package.json index fadefef382..f6d54cb36d 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "workspaces": [ "resources/gosh", "resources/build/version", - "core/include/ldml", "developer/src/kmlmc", "developer/src/kmldmlc", "developer/src/server",