From 7b7fa52a951ffa05eba83aa5766e09798ceed714 Mon Sep 17 00:00:00 2001 From: "Joshua A. Horton" Date: Wed, 12 Apr 2023 09:00:17 +0700 Subject: [PATCH] chore(web): renames app/webview output, preserves name within embedding apps --- android/.gitignore | 3 ++- android/KMEA/app/src/main/assets/keyboard.html | 2 +- .../app/src/main/java/com/keyman/engine/KMManager.java | 4 ++-- android/KMEA/build.sh | 6 +++--- common/web/sentry-manager/src/index.ts | 5 +---- ios/.gitignore | 2 ++ .../Classes/Resource Management/Storage.swift | 6 +++--- .../Keyman.bundle/Contents/Resources/keyboard.html | 2 +- ios/kmbuild.sh | 8 ++++---- web/src/app/webview/build-bundler.js | 4 ++-- web/src/app/webview/build.sh | 2 +- web/src/test/manual/embed/android-harness/build.sh | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/android/.gitignore b/android/.gitignore index ff6d940b39..ad30f1a79d 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -34,7 +34,8 @@ gradle_models.ser KMEA/**/assets/ajax-loader.gif KMEA/**/assets/keymanandroid.js KMEA/**/assets/keyman.js.map -KMEA/**/assets/keymanandroid.js.map +KMEA/**/assets/keymanweb-webview.js +KMEA/**/assets/keymanweb-webview.js.map KMEA/**/assets/sentry.min.js KMEA/**/assets/keyman-sentry.js KMEA/**/assets/es6-shim.min.js diff --git a/android/KMEA/app/src/main/assets/keyboard.html b/android/KMEA/app/src/main/assets/keyboard.html index 85d7f5b3c7..b11a21124e 100644 --- a/android/KMEA/app/src/main/assets/keyboard.html +++ b/android/KMEA/app/src/main/assets/keyboard.html @@ -15,7 +15,7 @@ polyfill. --> - + diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java index 9b90d6d72e..877d297a4d 100644 --- a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java +++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java @@ -293,8 +293,8 @@ public final class KMManager { // Keyman files protected static final String KMFilename_KeyboardHtml = "keyboard.html"; - protected static final String KMFilename_JSEngine = "keymanandroid.js"; - protected static final String KMFilename_JSEngine_Sourcemap = "keyman.js.map"; + protected static final String KMFilename_JSEngine = "keymanweb-webview.js"; + protected static final String KMFilename_JSEngine_Sourcemap = "keymanweb-webview.js.map"; protected static final String KMFilename_JSSentry = "sentry.min.js"; protected static final String KMFilename_JSSentryInit = "keyman-sentry.js"; protected static final String KMFilename_AndroidHost = "android-host.js"; diff --git a/android/KMEA/build.sh b/android/KMEA/build.sh index fa5697915c..cc38865bf4 100755 --- a/android/KMEA/build.sh +++ b/android/KMEA/build.sh @@ -50,7 +50,7 @@ if builder_is_debug_build; then fi builder_describe_outputs \ - configure:engine /android/KMEA/app/src/main/assets/keymanandroid.js \ + configure:engine /android/KMEA/app/src/main/assets/keymanweb-webview.js \ build:engine /android/KMEA/app/build/outputs/aar/${CONFIG}/keyman-engine.aar #### Build @@ -75,8 +75,8 @@ if builder_start_action configure:engine; then # Copy KeymanWeb artifacts echo "Copying Keyman Web artifacts" - cp "$KEYMAN_WEB_ROOT/build/app/webview/$CONFIG/index.js" "$ENGINE_ASSETS/keymanandroid.js" - cp "$KEYMAN_WEB_ROOT/build/app/webview/$CONFIG/index.js.map" "$ENGINE_ASSETS/keymanandroid.js.map" + cp "$KEYMAN_WEB_ROOT/build/app/webview/$CONFIG/index.js" "$ENGINE_ASSETS/keymanweb-webview.js" + cp "$KEYMAN_WEB_ROOT/build/app/webview/$CONFIG/index.js.map" "$ENGINE_ASSETS/keymanweb-webview.js.map" cp "$KEYMAN_WEB_ROOT/build/app/resources/osk/ajax-loader.gif" "$ENGINE_ASSETS/ajax-loader.gif" cp "$KEYMAN_WEB_ROOT/build/app/resources/osk/kmwosk.css" "$ENGINE_ASSETS/kmwosk.css" cp "$KEYMAN_WEB_ROOT/build/app/resources/osk/globe-hint.css" "$ENGINE_ASSETS/globe-hint.css" diff --git a/common/web/sentry-manager/src/index.ts b/common/web/sentry-manager/src/index.ts index 5021aacbf1..b5bb89c0ff 100644 --- a/common/web/sentry-manager/src/index.ts +++ b/common/web/sentry-manager/src/index.ts @@ -26,8 +26,7 @@ export class KeymanSentryManager { static STANDARD_ALIASABLE_FILES = { 'keymanweb.js': 'keymanweb.js', - 'keymanandroid.js': 'keyman.js', // Android's embedded name -> embedded compilation - 'keymanios.js': 'keyman.js', // iOS's embedded name -> embedded compilation + 'keymanweb-webview.js': 'keymanweb-webview.js', 'kmwuibutton.js': 'kmwuibutton.js', 'kmwuifloat.js': 'kmwuifloat.js', 'kmwuitoggle.js': 'kmwuitoggle.js', @@ -49,8 +48,6 @@ export class KeymanSentryManager { return null; } - filename = KeymanSentryManager.STANDARD_ALIASABLE_FILES[filename]; - switch(location.protocol) { case 'http:': return 'http://' + location.host + '/' + filename; diff --git a/ios/.gitignore b/ios/.gitignore index f319df5257..31d4700aec 100644 --- a/ios/.gitignore +++ b/ios/.gitignore @@ -15,6 +15,8 @@ engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keymanios.js engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keymanweb-osk.ttf engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/kmwosk.css engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keyman.js.map +engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keymanweb-webview.js +engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keymanweb-webview.js.map engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keyman-sentry.js engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/sentry.min.js Keyman 2* diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/Storage.swift b/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/Storage.swift index f56bd9eb90..a344d445b9 100644 --- a/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/Storage.swift +++ b/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/Storage.swift @@ -225,7 +225,7 @@ extension Storage { dstDir: baseDir, excludeFromBackup: true) try Storage.copy(from: bundle, - resourceName: "keymanios.js", + resourceName: "keymanweb-webview.js", dstDir: baseDir, excludeFromBackup: true) try Storage.copy(from: bundle, @@ -237,9 +237,9 @@ extension Storage { dstDir: baseDir, excludeFromBackup: true) // For debug compilations - IF we have a sourcemap file, copy that over too. - if bundle.url(forResource: "keyman.js.map", withExtension: nil) != nil { + if bundle.url(forResource: "keymanweb-webview.js.map", withExtension: nil) != nil { try Storage.copy(from: bundle, - resourceName: "keyman.js.map", + resourceName: "keymanweb-webview.js.map", dstDir: baseDir, excludeFromBackup: true) } diff --git a/ios/engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keyboard.html b/ios/engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keyboard.html index 79bf074bce..266a9ea1b4 100644 --- a/ios/engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keyboard.html +++ b/ios/engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keyboard.html @@ -3,7 +3,7 @@ Keyman - + diff --git a/ios/kmbuild.sh b/ios/kmbuild.sh index 25ade2aab8..8f082eb165 100755 --- a/ios/kmbuild.sh +++ b/ios/kmbuild.sh @@ -180,12 +180,12 @@ update_bundle ( ) { #Copy over the relevant resources! It's easiest to do if we navigate to the resulting folder. cp "$KEYMAN_ROOT/$KMW_RESOURCES/osk/kmwosk.css" "$base_dir/$BUNDLE_PATH/kmwosk.css" cp "$KEYMAN_ROOT/$KMW_RESOURCES/osk/keymanweb-osk.ttf" "$base_dir/$BUNDLE_PATH/keymanweb-osk.ttf" - cp "$KEYMAN_ROOT/$KMW_PRODUCT/index.js" "$base_dir/$BUNDLE_PATH/keymanios.js" + cp "$KEYMAN_ROOT/$KMW_PRODUCT/keymanweb-webview.js" "$base_dir/$BUNDLE_PATH/keymanweb-webview.js" if [ "$CONFIG" == "Debug" ]; then - cp "$KEYMAN_ROOT/$KMW_PRODUCT/index.js.map" "$base_dir/$BUNDLE_PATH/keyman.js.map" - elif [ -f "$base_dir/$BUNDLE_PATH/keyman.js.map" ]; then - rm "$base_dir/$BUNDLE_PATH/keyman.js.map" + cp "$KEYMAN_ROOT/$KMW_PRODUCT/keymanweb-webview.js.map" "$base_dir/$BUNDLE_PATH/keymanweb-webview.js.map" + elif [ -f "$base_dir/$BUNDLE_PATH/keymanweb-webview.js.map" ]; then + rm "$base_dir/$BUNDLE_PATH/keymanweb-webview.js.map" fi # Linked in by dependency for builder scripts... but this script isn't builder-based yet. diff --git a/web/src/app/webview/build-bundler.js b/web/src/app/webview/build-bundler.js index 95a71505da..0f166cd5d8 100644 --- a/web/src/app/webview/build-bundler.js +++ b/web/src/app/webview/build-bundler.js @@ -38,7 +38,7 @@ await esbuild.build({ entryPoints: { 'index': '../../../build/app/webview/obj/debug-main.js', }, - outfile: '../../../build/app/webview/debug/index.js', + outfile: '../../../build/app/webview/debug/keymanweb-webview.js', plugins: [ es5ClassAnnotationAsPurePlugin ], target: "es5", treeShaking: true, @@ -56,7 +56,7 @@ await esbuild.build({ entryPoints: { 'index': '../../../build/app/webview/obj/release-main.js', }, - outfile: '../../../build/app/webview/release/index.js', + outfile: '../../../build/app/webview/release/keymanweb-webview.js', plugins: [ es5ClassAnnotationAsPurePlugin ], target: "es5", treeShaking: true, diff --git a/web/src/app/webview/build.sh b/web/src/app/webview/build.sh index 0030eb5004..8b87b290c7 100755 --- a/web/src/app/webview/build.sh +++ b/web/src/app/webview/build.sh @@ -45,7 +45,7 @@ fi builder_describe_outputs \ configure /node_modules \ - build /web/build/$SUBPROJECT_NAME/$config/index.js + build /web/build/$SUBPROJECT_NAME/$config/keymanweb-webview.js #### Build action definitions #### diff --git a/web/src/test/manual/embed/android-harness/build.sh b/web/src/test/manual/embed/android-harness/build.sh index 6ec4fa25cf..f8e7975d59 100755 --- a/web/src/test/manual/embed/android-harness/build.sh +++ b/web/src/test/manual/embed/android-harness/build.sh @@ -39,8 +39,8 @@ fi if builder_start_action build; then mkdir -p "host/osk" cp -R "$KEYMAN_ROOT/android/KMEA/app/src/main/assets/"* "host/" - cp "$KEYMAN_ROOT/web/build/app/webview/debug/index.js" "host/keymanandroid.js" - cp "$KEYMAN_ROOT/web/build/app/webview/debug/index.js.map" "host/keymanandroid.js.map" + cp "$KEYMAN_ROOT/web/build/app/webview/debug/keymanweb-webview.js" "host/keymanweb-webview.js" + cp "$KEYMAN_ROOT/web/build/app/webview/debug/keymanweb-webview.js.map" "host/keymanweb-webview.js.map" cp "$KEYMAN_ROOT/web/build/app/resources/osk/ajax-loader.gif" "host/ajax-loader.gif" cp "$KEYMAN_ROOT/web/build/app/resources/osk/kmwosk.css" "host/kmwosk.css" cp "$KEYMAN_ROOT/web/build/app/resources/osk/globe-hint.css" "host/globe-hint.css"