From 78354e47ae6cec20881353d5269f20bd94f396b2 Mon Sep 17 00:00:00 2001 From: William Belcher Date: Mon, 20 Feb 2023 10:37:58 +1000 Subject: [PATCH] neaten up install scripts --- Frontend/implementations/EpicGames/package-lock.json | 1 - Frontend/implementations/EpicGames/package.json | 8 +++----- Frontend/library/package-lock.json | 4 ++-- Frontend/library/package.json | 5 ++--- SignallingWebServer/platform_scripts/bash/setup.sh | 4 ++-- .../platform_scripts/cmd/setup_frontend.bat | 4 ++-- 6 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Frontend/implementations/EpicGames/package-lock.json b/Frontend/implementations/EpicGames/package-lock.json index 360d7dcc..e8f099ec 100644 --- a/Frontend/implementations/EpicGames/package-lock.json +++ b/Frontend/implementations/EpicGames/package-lock.json @@ -7,7 +7,6 @@ "": { "name": "@epicgames-ps/reference-pixelstreamingfrontend", "version": "0.0.1", - "hasInstallScript": true, "devDependencies": { "css-loader": "^6.7.3", "html-loader": "^4.2.0", diff --git a/Frontend/implementations/EpicGames/package.json b/Frontend/implementations/EpicGames/package.json index 67407a76..02c527fb 100644 --- a/Frontend/implementations/EpicGames/package.json +++ b/Frontend/implementations/EpicGames/package.json @@ -2,17 +2,15 @@ "name": "@epicgames-ps/reference-pixelstreamingfrontend", "version": "0.0.1", "description": "", - "main": "player.ts", + "main": "./src/player.ts", "scripts": { "build": "npx webpack --config webpack.prod.js", "build-dev": "npx webpack --config webpack.dev.js", "watch": "npx webpack --watch", "serve": "webpack serve --config webpack.dev.js", "serve-prod": "webpack serve --config webpack.prod.js", - "install": "cd ../../library && npm run build-webpack && cd ../implementations/EpicGames && npm link ../../library", - "install-dev": "cd ../../library && npm run build-webpack-dev && cd ../implementations/EpicGames && npm link ../../library", - "build-all": "npm run install && npm run build", - "build-all-dev": "npm run install-dev && npm run build-dev" + "build-all": "cd ../../library && npm run build && cd ../implementations/EpicGames && npm link ../../library && npm run build", + "build-all-dev": "cd ../../library && npm run build-dev && cd ../implementations/EpicGames && npm link ../../library && npm run build-dev" }, "devDependencies": { "webpack-cli": "^5.0.1", diff --git a/Frontend/library/package-lock.json b/Frontend/library/package-lock.json index dbd1a6a4..dfa51e9e 100644 --- a/Frontend/library/package-lock.json +++ b/Frontend/library/package-lock.json @@ -1,12 +1,12 @@ { "name": "@epicgames-ps/lib-pixelstreamingfrontend-dev", - "version": "0.0.1", + "version": "0.1.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@epicgames-ps/lib-pixelstreamingfrontend-dev", - "version": "0.0.1", + "version": "0.1.1", "license": "MIT", "dependencies": { "@types/webxr": "^0.5.1", diff --git a/Frontend/library/package.json b/Frontend/library/package.json index 87980864..004ab731 100644 --- a/Frontend/library/package.json +++ b/Frontend/library/package.json @@ -6,9 +6,8 @@ "types": "types/pixelstreamingfrontend.d.ts", "scripts": { "compile": "tsc --build --clean && tsc", - "build": "npm run build-webpack", - "build-webpack": "npx webpack --config webpack.prod.js", - "build-webpack-dev": "npx webpack --config webpack.dev.js", + "build": "npx webpack --config webpack.prod.js", + "build-dev": "npx webpack --config webpack.dev.js", "lint": "eslint . --ext .js,.jsx,.ts,.tsx", "spellcheck": "cspell \"{README.md,.github/*.md,src/**/*.ts}\"" }, diff --git a/SignallingWebServer/platform_scripts/bash/setup.sh b/SignallingWebServer/platform_scripts/bash/setup.sh index d7d8dced..1b46c5c0 100644 --- a/SignallingWebServer/platform_scripts/bash/setup.sh +++ b/SignallingWebServer/platform_scripts/bash/setup.sh @@ -98,13 +98,13 @@ function setup_frontend() { # Using our bundled NodeJS, build the web frontend files pushd ${BASH_LOCATION}/../../../Frontend/library > /dev/null ../../SignallingWebServer/platform_scripts/bash/node/bin/npm install - ../../SignallingWebServer/platform_scripts/bash/node/bin/npx webpack + ../../SignallingWebServer/platform_scripts/bash/node/bin/npm run build-dev popd pushd ${BASH_LOCATION}/../../../Frontend/implementations/EpicGames > /dev/null ../../../SignallingWebServer/platform_scripts/bash/node/bin/npm install ../../../SignallingWebServer/platform_scripts/bash/node/bin/npm link ../../library - ../../../SignallingWebServer/platform_scripts/bash/node/bin/npx webpack + ../../../SignallingWebServer/platform_scripts/bash/node/bin/npm run build-dev popd else echo 'Skipping building Frontend because files already exist. Please run with "--build" to force a rebuild' diff --git a/SignallingWebServer/platform_scripts/cmd/setup_frontend.bat b/SignallingWebServer/platform_scripts/cmd/setup_frontend.bat index 5132480c..609a5038 100644 --- a/SignallingWebServer/platform_scripts/cmd/setup_frontend.bat +++ b/SignallingWebServer/platform_scripts/cmd/setup_frontend.bat @@ -53,7 +53,7 @@ echo Building frontend library... pushd %CD%\Frontend\library call ..\..\SignallingWebServer\platform_scripts\cmd\node\npm install - call ..\..\SignallingWebServer\platform_scripts\cmd\node\npx webpack + call ..\..\SignallingWebServer\platform_scripts\cmd\node\npm run build-dev popd echo End of build PS frontend lib step. @@ -63,7 +63,7 @@ pushd %CD%\Frontend\implementations\EpicGames call ..\..\..\SignallingWebServer\platform_scripts\cmd\node\npm install call ..\..\..\SignallingWebServer\platform_scripts\cmd\node\npm link ../../library - call ..\..\..\SignallingWebServer\platform_scripts\cmd\node\npx webpack + call ..\..\..\SignallingWebServer\platform_scripts\cmd\node\npm run build-dev popd echo End of build reference frontend step. echo ----------------------------