Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Frontend/implementations/typescript/webpack.base.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module.exports = {
/node_modules/,
],
options: {
configFile: "tsconfig.cjs.json"
configFile: "tsconfig.esm.json"
}
},
{
Expand Down
7 changes: 5 additions & 2 deletions SignallingWebServer/platform_scripts/bash/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,14 @@ function setup_frontend() {
if [ ! -d "${WEBPACK_OUTPUT_PATH}" ] || [ "$BUILD_FRONTEND" == "1" ] ; then
echo "Building Typescript Frontend."
# Using our bundled NodeJS, build the web frontend files
pushd "${SCRIPT_DIR}/../../../Common" > /dev/null
npm run build:esm
popd > /dev/null
pushd "${SCRIPT_DIR}/../../../Frontend/library" > /dev/null
npm run build:cjs
npm run build:esm
popd > /dev/null
pushd "${SCRIPT_DIR}/../../../Frontend/ui-library" > /dev/null
npm run build:cjs
npm run build:esm
popd > /dev/null
pushd "${SCRIPT_DIR}/../../../Frontend/implementations/typescript" > /dev/null
npm run build:dev
Expand Down
8 changes: 6 additions & 2 deletions SignallingWebServer/platform_scripts/cmd/common.bat
Original file line number Diff line number Diff line change
Expand Up @@ -216,13 +216,17 @@ IF "%BUILD_FRONTEND%"=="1" (
rem We could replace this all with a single npm script that does all this. we do have several build-all scripts already
rem but this does give a good reference about the dependency chain for all of this.
echo Building Typescript frontend...
pushd %CD%\Common
call %NPM% run build:esm
popd
pushd %CD%\Frontend\library
call %NPM% run build:cjs
call %NPM% run build:esm
popd
pushd %CD%\Frontend\ui-library
call %NPM% run build:cjs
call %NPM% run build:esm
popd
pushd %CD%\Frontend\implementations\typescript
rem Note: build:dev implicitly uses esm deps due to node16/bundler module resolution
call %NPM% run build:dev
popd
popd
Expand Down