run scripts individually

AerisG222 · Dec 23, 2023 · cb2b016 · cb2b016
1 parent da0f7ad
commit cb2b016
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/Containerfile.auth b/Containerfile.auth
@@ -8,7 +8,6 @@ RUN apk --no-cache add \
     g++ \
     make \
     nodejs \
-    npm \
     rsync \
     sed
 

diff --git a/Containerfile.www b/Containerfile.www
@@ -8,7 +8,6 @@ RUN apk --no-cache add \
     g++ \
     make \
     nodejs \
-    npm \
     rsync \
     sed
 

diff --git a/_build.sh b/_build.sh
@@ -181,7 +181,9 @@ build_assets() {
     rm -rf node_modules
 
     pnpm i
-    pnpm run all
+    pnpm run sass:lint
+    pnpm run sass:site
+    pnpm run sass:games
 
     popd
 }

diff --git a/src/auth/package.json b/src/auth/package.json
@@ -19,11 +19,9 @@
     "stylelint-scss": "^6.0.0"
   },
   "scripts": {
-    "all": "npx run-p sass",
-    "sass": "npx run-p sass:lint sass:site",
-    "sass:lint": "npx stylelint scss/*.scss 2> /dev/null",
-    "sass:site": "npx sass --load-path node_modules scss/site.scss wwwroot/css/site.css",
-    "sass:watch": "npx chokidar 'scss/**/*.scss' -c 'npm run sass'"
+    "sass:lint": "stylelint scss/*.scss 2> /dev/null",
+    "sass:site": "sass --load-path node_modules scss/site.scss wwwroot/css/site.css",
+    "sass:watch": "chokidar 'scss/**/*.scss' -c 'pnpm run sass'"
   },
   "author": "",
   "license": "MIT"

diff --git a/src/www/package.json b/src/www/package.json
@@ -4,12 +4,10 @@
   "license": "MIT",
   "main": "index.js",
   "scripts": {
-    "all": "npx run-p sass",
-    "sass": "npx run-p sass:lint sass:site sass:games",
-    "sass:lint": "npx stylelint scss/*.scss 2> /dev/null",
-    "sass:site": "npx sass --load-path node_modules scss/site.scss wwwroot/css/site.css",
-    "sass:games": "npx sass --load-path node_modules scss/games.scss wwwroot/css/games.css",
-    "sass:watch": "npx chokidar 'scss/**/*.scss' -c 'npm run sass'"
+    "sass:lint": "stylelint scss/*.scss 2> /dev/null",
+    "sass:site": "sass --load-path node_modules scss/site.scss wwwroot/css/site.css",
+    "sass:games": "sass --load-path node_modules scss/games.scss wwwroot/css/games.css",
+    "sass:watch": "chokidar 'scss/**/*.scss' -c 'npm run sass'"
   },
   "dependencies": {
     "bootstrap": "^5.2.3",
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ RUN apk --no-cache add \ @@
         g++ \
         make \
         nodejs \
-        npm \
         rsync \
         sed
@@ Expand Down @@