From f705cbd487bb0e449ef790ceda657388579dd201 Mon Sep 17 00:00:00 2001 From: jahorton Date: Wed, 17 Jun 2020 10:41:01 +0700 Subject: [PATCH] refactor(web/resources): fixes up core/web/tools --- common/core/web/tools/recorder/package.json | 1 + common/core/web/tools/recorder/src/nodeProctor.tsconfig.json | 1 + common/core/web/tools/recorder/src/tsconfig.json | 1 + common/core/web/tools/sentry-manager/package.json | 1 + common/core/web/tools/sentry-manager/src/build.sh | 3 --- common/core/web/tools/sentry-manager/src/tsconfig.json | 2 +- 6 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/core/web/tools/recorder/package.json b/common/core/web/tools/recorder/package.json index c8e169a9f2..ab44cc02ab 100644 --- a/common/core/web/tools/recorder/package.json +++ b/common/core/web/tools/recorder/package.json @@ -19,6 +19,7 @@ "dependencies": { "@keymanapp/keyboard-processor": "^14.0.95", "@keymanapp/models-types": "^14.0.95", + "@keymanapp/web-environment": "^14.0.95", "@keymanapp/web-utils": "^14.0.95" }, "devDependencies": { diff --git a/common/core/web/tools/recorder/src/nodeProctor.tsconfig.json b/common/core/web/tools/recorder/src/nodeProctor.tsconfig.json index a7eff4f10d..d13317335d 100644 --- a/common/core/web/tools/recorder/src/nodeProctor.tsconfig.json +++ b/common/core/web/tools/recorder/src/nodeProctor.tsconfig.json @@ -12,6 +12,7 @@ }, "files": [ "../node_modules/@keymanapp/models-types/index.d.ts", + "../node_modules/@keymanapp/web-environment/environment.inc.ts", "../node_modules/@keymanapp/web-utils/src/index.ts", "nodeProctor.ts" ] diff --git a/common/core/web/tools/recorder/src/tsconfig.json b/common/core/web/tools/recorder/src/tsconfig.json index 9f675626ae..6a1816e052 100644 --- a/common/core/web/tools/recorder/src/tsconfig.json +++ b/common/core/web/tools/recorder/src/tsconfig.json @@ -12,6 +12,7 @@ }, "files": [ "../node_modules/@keymanapp/models-types/index.d.ts", + "../node_modules/@keymanapp/web-environment/environment.inc.ts", "../node_modules/@keymanapp/web-utils/src/index.ts", "index.ts" ] diff --git a/common/core/web/tools/sentry-manager/package.json b/common/core/web/tools/sentry-manager/package.json index cc4b2e68f9..e1c778191d 100644 --- a/common/core/web/tools/sentry-manager/package.json +++ b/common/core/web/tools/sentry-manager/package.json @@ -20,6 +20,7 @@ "typescript": "^3.8.3" }, "dependencies": { + "@keymanapp/web-environment": "^14.0.95", "@sentry/browser": "^5.15.5" } } diff --git a/common/core/web/tools/sentry-manager/src/build.sh b/common/core/web/tools/sentry-manager/src/build.sh index 932d624591..18a7a6696c 100755 --- a/common/core/web/tools/sentry-manager/src/build.sh +++ b/common/core/web/tools/sentry-manager/src/build.sh @@ -54,9 +54,6 @@ OUTPUT="index.js" # (Facilitates automated setup for build agents.) PATH="../node_modules/.bin:$PATH" -# Ensure the environment definition variables are available. -exportEnvironmentDefinitionTS - compiler="npm run tsc --" compilecmd="$compiler" diff --git a/common/core/web/tools/sentry-manager/src/tsconfig.json b/common/core/web/tools/sentry-manager/src/tsconfig.json index b23d357baa..7a552cecca 100644 --- a/common/core/web/tools/sentry-manager/src/tsconfig.json +++ b/common/core/web/tools/sentry-manager/src/tsconfig.json @@ -10,7 +10,7 @@ "outFile": "../dist/index.js" }, "files": [ - "environment.inc.ts", + "../node_modules/@keymanapp/web-environment/environment.inc.ts", "index.ts" ] } \ No newline at end of file