From 820aacafd770a3cb38fdef7f0517c23c62d02a7f Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Fri, 2 Aug 2024 12:32:24 +0200 Subject: [PATCH] =?UTF-8?q?refactor(web):=20Move=20`common/web/recorder`?= =?UTF-8?q?=20=E2=86=92=20`web/src/tools/testing/recorder-core`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: #12091 --- common/web/keyboard-processor/build.sh | 2 +- common/web/recorder/tsconfig.json | 22 ------------------- package-lock.json | 4 ++-- .../tools/testing/recorder-core}/.gitignore | 0 .../src/tools/testing/recorder-core}/build.sh | 4 ++-- .../tools/testing/recorder-core}/package.json | 0 .../tools/testing/recorder-core}/src/index.ts | 0 .../testing/recorder-core}/src/nodeProctor.ts | 0 .../testing/recorder-core}/src/proctor.ts | 0 .../tools/testing/recorder-core/tsconfig.json | 22 +++++++++++++++++++ web/src/tools/testing/recorder/build.sh | 2 +- web/src/tools/testing/recorder/tsconfig.json | 4 ++-- 12 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 common/web/recorder/tsconfig.json rename {common/web/recorder => web/src/tools/testing/recorder-core}/.gitignore (100%) rename {common/web/recorder => web/src/tools/testing/recorder-core}/build.sh (88%) rename {common/web/recorder => web/src/tools/testing/recorder-core}/package.json (100%) rename {common/web/recorder => web/src/tools/testing/recorder-core}/src/index.ts (100%) rename {common/web/recorder => web/src/tools/testing/recorder-core}/src/nodeProctor.ts (100%) rename {common/web/recorder => web/src/tools/testing/recorder-core}/src/proctor.ts (100%) create mode 100644 web/src/tools/testing/recorder-core/tsconfig.json diff --git a/common/web/keyboard-processor/build.sh b/common/web/keyboard-processor/build.sh index a7647983f9c..3921063bb93 100755 --- a/common/web/keyboard-processor/build.sh +++ b/common/web/keyboard-processor/build.sh @@ -16,7 +16,7 @@ BUNDLE_CMD="node ${KEYMAN_ROOT}/common/web/es-bundling/build/common-bundle.mjs" builder_describe \ "Compiles the web-oriented utility function module." \ - "@/common/web/recorder test" \ + "@/web/src/tools/testing/recorder-core test" \ "@/common/web/keyman-version" \ "@/common/web/es-bundling" \ "@/common/web/types" \ diff --git a/common/web/recorder/tsconfig.json b/common/web/recorder/tsconfig.json deleted file mode 100644 index 1a38d48f035..00000000000 --- a/common/web/recorder/tsconfig.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "extends": "../tsconfig.kmw-main-base.json", - - "compilerOptions": { - "types": ["node"], - "baseUrl": "./", - "outDir": "build/obj/", - "tsBuildInfoFile": "build/obj/tsconfig.tsbuildinfo", - "rootDir": "./src" - }, - - "include": [ - "src/**/*.ts" - ], - - "references": [ - { "path": "../keyman-version" }, - { "path": "../utils/" }, - { "path": "../keyboard-processor/" }, - { "path": "../lm-message-types" } - ], -} diff --git a/package-lock.json b/package-lock.json index 26e925843d9..cba41c04a1b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -245,7 +245,7 @@ "typescript": "^5.4.5" } }, - "common/web/recorder": { + "web/src/tools/testing/recorder-core": { "name": "@keymanapp/recorder-core", "license": "MIT", "dependencies": { @@ -2851,7 +2851,7 @@ "link": true }, "node_modules/@keymanapp/recorder-core": { - "resolved": "common/web/recorder", + "resolved": "web/src/tools/testing/recorder-core", "link": true }, "node_modules/@keymanapp/resources-gosh": { diff --git a/common/web/recorder/.gitignore b/web/src/tools/testing/recorder-core/.gitignore similarity index 100% rename from common/web/recorder/.gitignore rename to web/src/tools/testing/recorder-core/.gitignore diff --git a/common/web/recorder/build.sh b/web/src/tools/testing/recorder-core/build.sh similarity index 88% rename from common/web/recorder/build.sh rename to web/src/tools/testing/recorder-core/build.sh index f34bbc3111c..0b89ce77012 100755 --- a/common/web/recorder/build.sh +++ b/web/src/tools/testing/recorder-core/build.sh @@ -7,7 +7,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" @@ -24,7 +24,7 @@ builder_describe \ builder_describe_outputs \ configure "/node_modules" \ - build "/common/web/recorder/build/obj/index.js" + build "/web/src/tools/testing/recorder-core/build/obj/index.js" builder_parse "$@" diff --git a/common/web/recorder/package.json b/web/src/tools/testing/recorder-core/package.json similarity index 100% rename from common/web/recorder/package.json rename to web/src/tools/testing/recorder-core/package.json diff --git a/common/web/recorder/src/index.ts b/web/src/tools/testing/recorder-core/src/index.ts similarity index 100% rename from common/web/recorder/src/index.ts rename to web/src/tools/testing/recorder-core/src/index.ts diff --git a/common/web/recorder/src/nodeProctor.ts b/web/src/tools/testing/recorder-core/src/nodeProctor.ts similarity index 100% rename from common/web/recorder/src/nodeProctor.ts rename to web/src/tools/testing/recorder-core/src/nodeProctor.ts diff --git a/common/web/recorder/src/proctor.ts b/web/src/tools/testing/recorder-core/src/proctor.ts similarity index 100% rename from common/web/recorder/src/proctor.ts rename to web/src/tools/testing/recorder-core/src/proctor.ts diff --git a/web/src/tools/testing/recorder-core/tsconfig.json b/web/src/tools/testing/recorder-core/tsconfig.json new file mode 100644 index 00000000000..a7bd08c3745 --- /dev/null +++ b/web/src/tools/testing/recorder-core/tsconfig.json @@ -0,0 +1,22 @@ +{ + "extends": "../../../../tsconfig.base.json", + + "compilerOptions": { + "types": ["node"], + "baseUrl": "./", + "outDir": "./build/obj/", + "tsBuildInfoFile": "./build/obj/tsconfig.tsbuildinfo", + "rootDir": "./src" + }, + + "include": [ + "src/**/*.ts" + ], + + "references": [ + { "path": "../../../../../common/web/keyman-version" }, + { "path": "../../../../../common/web/utils/" }, + { "path": "../../../../../common/web/keyboard-processor/" }, + { "path": "../../../../../common/web/lm-message-types" } + ], +} diff --git a/web/src/tools/testing/recorder/build.sh b/web/src/tools/testing/recorder/build.sh index d165585400a..28cc43a767d 100755 --- a/web/src/tools/testing/recorder/build.sh +++ b/web/src/tools/testing/recorder/build.sh @@ -17,7 +17,7 @@ SUBPROJECT_NAME=tools/testing/recorder builder_describe "Builds the Keyman Engine for Web's test-sequence recording tool" \ "@/common/web/keyman-version" \ "@/common/web/keyboard-processor" \ - "@/common/web/recorder" \ + "@../recorder-core" \ "clean" \ "configure" \ "build" diff --git a/web/src/tools/testing/recorder/tsconfig.json b/web/src/tools/testing/recorder/tsconfig.json index 14dbcb58a22..63cb543efa1 100644 --- a/web/src/tools/testing/recorder/tsconfig.json +++ b/web/src/tools/testing/recorder/tsconfig.json @@ -13,8 +13,8 @@ { "path": "../../../../../common/web/keyman-version" }, { "path": "../../../../../common/web/utils" }, { "path": "../../../../../common/web/keyboard-processor" }, - { "path": "../../../../../common/web/recorder" }, { "path": "../../../../../common/web/lm-message-types" }, - { "path": "../../../../../web/src/app/browser" } + { "path": "../../../../../web/src/app/browser" }, + { "path": "../recorder-core" }, ] }