Merge pull request #12389 from keymanapp/refactor/web/12385_es-bundling

refactor(web): move `common/web/es-bundling` → `web/src/tools/es-bundling` 🏗️
This commit is contained in:
Eberhard Beilharz 2024-09-12 13:49:37 +07:00 • committed by GitHub
commit 66d815efc7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 23 additions and 24 deletions

1
.gitignore vendored
View file

@ -183,4 +183,3 @@ lcov.info
/keyman*.buildinfo
/keyman*.changes
/keyman*.tar.?z

View file

@ -10,7 +10,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
BUNDLE_CMD="node $KEYMAN_ROOT/common/web/es-bundling/build/common-bundle.mjs"
BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
builder_describe "Builds the Sentry-reporting module used with Keyman Engine for Web" \
"@/common/web/keyman-version" \

View file

@ -71,7 +71,7 @@ builder_describe_outputs \
build:tools "/web/build/tools/building/sourcemap-root/index.js" \
build:test-pages "/web/build/test-resources/sentry-manager.js"
BUNDLE_CMD="node ${KEYMAN_ROOT}/common/web/es-bundling/build/common-bundle.mjs"
BUNDLE_CMD="node ${KEYMAN_ROOT}/web/src/tools/es-bundling/build/common-bundle.mjs"
#### Build action definitions ####

View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash
#
BUNDLE_CMD="node $KEYMAN_ROOT/common/web/es-bundling/build/common-bundle.mjs"
BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
# Compiles all build products corresponding to the specified target.
# This should be called from the working directory of a child project's

View file

@ -6,7 +6,7 @@
*/
import esbuild from 'esbuild';
import { iifeConfiguration, prepareTslibTreeshaking } from '../../../../common/web/es-bundling/build/index.mjs';
import { iifeConfiguration, prepareTslibTreeshaking } from '../../tools/es-bundling/build/index.mjs';
const commonConfig = {
...iifeConfiguration,

View file

@ -14,14 +14,14 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
SUBPROJECT_NAME=engine/common/web-utils
BUILD_DIR="/web/src/engine/common/web-utils/build"
BUNDLE_CMD="node $KEYMAN_ROOT/common/web/es-bundling/build/common-bundle.mjs"
BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
################################ Main script ################################
builder_describe \
"Compiles the web-oriented utility function module." \
"@/common/web/keyman-version" \
"@/common/web/es-bundling" \
"@/web/src/tools/es-bundling" \
clean configure build test \
"--ci For use with action ${BUILDER_TERM_START}test${BUILDER_TERM_END} - emits CI-friendly test reports"

View file

@ -13,7 +13,7 @@ SUBPROJECT_NAME=engine/interfaces
# ################################ Main script ################################
builder_describe "Builds configuration subclasses used by the Keyman Engine for Web (KMW)." \
"@/common/web/es-bundling" \
"@/web/src/tools/es-bundling" \
"@/web/src/engine/keyboard" \
"@/web/src/engine/js-processor" \
"clean" \

View file

@ -13,7 +13,7 @@ SUBPROJECT_NAME=engine/keyboard-storage
# ################################ Main script ################################
builder_describe "Builds Keyman Engine modules for keyboard cloud-querying & caching + model caching." \
"@/common/web/es-bundling" \
"@/web/src/tools/es-bundling" \
"clean" \
"configure" \
"build" \

View file

@ -17,10 +17,10 @@ SUBPROJECT_NAME=engine/keyboard
builder_describe \
"Compiles the web-oriented utility function module." \
"@/web/src/tools/testing/recorder-core test" \
"@/common/web/keyman-version" \
"@/common/web/es-bundling" \
"@/common/web/types" \
"@/web/src/tools/testing/recorder-core test" \
"@/web/src/tools/es-bundling" \
"@/web/src/engine/common/web-utils" \
configure \
clean \

View file

@ -11,14 +11,14 @@ SUBPROJECT_NAME=engine/osk/gesture-processor
. "${KEYMAN_ROOT}/web/common.inc.sh"
. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
BUNDLE_CMD="node $KEYMAN_ROOT/common/web/es-bundling/build/common-bundle.mjs"
BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
BUILD_DIR="/web/src/engine/osk/gesture-processor/build"
################################ Main script ################################
builder_describe "Builds the gesture-recognition model for Web-based on-screen keyboards" \
"@/common/web/es-bundling build" \
"@/web/src/tools/es-bundling build" \
"@/web/src/engine/common/web-utils build" \
"clean" \
"configure" \

View file

@ -9,7 +9,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "$KEYMAN_ROOT/web/common.inc.sh"
. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
BUNDLE_CMD="node $KEYMAN_ROOT/common/web/es-bundling/build/common-bundle.mjs"
BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
BASE_DIR="/web/src/engine/osk/gesture-processor"
BUILD_DIR="${BASE_DIR}/build"

View file

@ -1,5 +1,5 @@
import esbuild from 'esbuild';
import { esmConfiguration, bundleObjEntryPoints } from '../../../../es-bundling/build/index.mjs';
import { esmConfiguration, bundleObjEntryPoints } from '../../../../../../tools/es-bundling/build/index.mjs';
await esbuild.build({
...esmConfiguration,

View file

@ -14,7 +14,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
builder_describe "Builds the predictive-text model template implementation module" \
"@/common/web/keyman-version" \
"@/common/web/es-bundling" \
"@/web/src/tools/es-bundling" \
"@../wordbreakers" \
"clean" \
"configure" \

View file

@ -13,14 +13,14 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
BUNDLE_CMD="node $KEYMAN_ROOT/common/web/es-bundling/build/common-bundle.mjs"
BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
################################ Main script ################################
builder_describe "Builds the lm-layer module" \
"@/common/web/keyman-version" \
"@/common/web/es-bundling" \
"@/common/web/types" \
"@/web/src/tools/es-bundling" \
"@/web/src/engine/predictive-text/worker-thread" \
"clean" \
"configure" \

View file

@ -17,7 +17,7 @@ WORKER_OUTPUT_FILENAME=build/lib/worker-main.js
INTERMEDIATE=./build/intermediate
LIB=./build/lib
bundle_cmd="node ${KEYMAN_ROOT}/common/web/es-bundling/build/common-bundle.mjs"
bundle_cmd="node ${KEYMAN_ROOT}/web/src/tools/es-bundling/build/common-bundle.mjs"
SRCMAP_CLEANER="node $KEYMAN_ROOT/web/build/tools/building/sourcemap-root/index.js"
@ -25,9 +25,9 @@ SRCMAP_CLEANER="node $KEYMAN_ROOT/web/build/tools/building/sourcemap-root/index.
builder_describe \
"Compiles the Language Modeling Layer for common use in predictive text and autocorrective applications." \
"@/web/src/tools/building/sourcemap-root" \
"@/common/web/keyman-version" \
"@/common/web/es-bundling" \
"@/web/src/tools/building/sourcemap-root" \
"@/web/src/tools/es-bundling" \
"@../wordbreakers" \
"@../templates" \
configure clean build test --ci

View file

@ -3,7 +3,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"
@ -17,7 +17,7 @@ builder_describe "Builds KMW's esbuild-oriented common configuration & tooling"
builder_describe_outputs \
configure /node_modules \
build /common/web/es-bundling/build/index.mjs
build /web/src/tools/es-bundling/build/index.mjs
builder_parse "$@"

View file

@ -1,5 +1,5 @@
{
"extends": "../../../tsconfig.base.json",
"extends": "../../../../tsconfig.base.json",
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"baseUrl": "./",