neaten up install scripts (#106)

EpicGames · Feb 20, 2023 · 673a260 · 673a260
1 parent 259068d
commit 673a260
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 15 deletions.
diff --git a/Frontend/implementations/EpicGames/package-lock.json b/Frontend/implementations/EpicGames/package-lock.json
diff --git 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
diff --git 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
@@ -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
@@ -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 ----------------------------