Cleanup node scripts (#1858)

.github/workflows/build.yml

@@ -96,7 +96,7 @@ jobs:
         include:
           - service_name: Admin
             base_path: ./src
-            gulp: true
+            node: true
           - service_name: Api
             base_path: ./src
           - service_name: Billing
@@ -117,7 +117,7 @@ jobs:
             base_path: ./util
           - service_name: Sso
             base_path: ./bitwarden_license/src
-            gulp: true
+            node: true
     steps:
       - name: Checkout repo
         uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
@@ -125,10 +125,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea
         with:
-          node-version: '14'
+          node-version: '16'
-
-      - name: Update NPM
-        run: npm install -g npm@7
 
       - name: Print environment
         run: |
@@ -136,15 +133,9 @@ jobs:
           dotnet --info
           node --version
           npm --version
-          gulp --version
           echo "GitHub ref: $GITHUB_REF"
           echo "GitHub event: $GITHUB_EVENT"
 
-      - name: Set up Gulp
-        if: ${{ matrix.gulp }}
-        working-directory: ${{ matrix.base_path }}/${{ matrix.service_name }}
-        run: npm install -g gulp
-
       - name: Restore/Clean service
         working-directory: ${{ matrix.base_path }}/${{ matrix.service_name }}
         run: |
@@ -153,12 +144,12 @@ jobs:
           echo "Clean"
           dotnet clean -c "Release" -o obj/build-output/publish
 
-      - name: Execute Gulp
+      - name: Build node
-        if: ${{ matrix.gulp }}
+        if: ${{ matrix.node }}
         working-directory: ${{ matrix.base_path }}/${{ matrix.service_name }}
         run: |
-          npm install
+          npm ci
-          gulp --gulpfile gulpfile.js build
+          npm run build
 
       - name: Publish service
         working-directory: ${{ matrix.base_path }}/${{ matrix.service_name }}

bitwarden_license/src/Sso/build.ps1

@@ -11,8 +11,8 @@ echo "Clean"
 dotnet clean $dir\Sso.csproj -c "Release" -o $dir\obj\Azure\publish
 echo "Node Build"
 cd $dir
-npm install
+npm ci
+npm run build
 cd $curDir
-gulp --gulpfile $dir\gulpfile.js build
 echo "Publish"
 dotnet publish $dir\Sso.csproj -c "Release" -o $dir\obj\Azure\publish

bitwarden_license/src/Sso/build.sh

@@ -14,8 +14,8 @@ echo "Clean"
 dotnet clean "$DIR/Sso.csproj" -c "Release" -o "$DIR/obj/build-output/publish"
 echo "Node Build"
 cd "$DIR"
-npm install
+npm ci
+npm run build
 cd "$CUR_DIR"
-gulp --gulpfile "$DIR/gulpfile.js" build
 echo "Publish"
 dotnet publish "$DIR/Sso.csproj" -c "Release" -o "$DIR/obj/build-output/publish"

bitwarden_license/src/Sso/gulpfile.js

@@ -2,7 +2,7 @@
 
 const gulp = require('gulp');
 const merge = require('merge-stream');
-const sass = require('gulp-sass');
+const sass = require('gulp-sass')(require("sass"));
 const del = require('del');
 
 const paths = {};

bitwarden_license/src/Sso/package.json

@@ -4,14 +4,18 @@
   "description": "Bitwarden SSO",
   "repository": "https://github.com/bitwarden/enterprise",
   "license": "-",
+  "scripts": {
+    "build": "gulp build"
+  },
   "devDependencies": {
     "bootstrap": "4.5.0",
-    "del": "5.1.0",
+    "del": "6.0.0",
     "font-awesome": "4.7.0",
     "gulp": "4.0.2",
-    "gulp-sass": "4.0.1",
+    "gulp-sass": "5.1.0",
     "jquery": "3.5.1",
-    "merge-stream": "1.0.1",
+    "merge-stream": "2.0.0",
-    "popper.js": "1.16.1"
+    "popper.js": "1.16.1",
+    "sass": "^1.49.7"
   }
 }

src/Admin/build.ps1

@@ -11,8 +11,8 @@ echo "Clean"
 dotnet clean $dir\Admin.csproj -c "Release" -o $dir\obj\Azure\publish
 echo "Node Build"
 cd $dir
-npm install
+npm ci
+npm run build
 cd $curDir
-gulp --gulpfile $dir\gulpfile.js build
 echo "Publish"
 dotnet publish $dir\Admin.csproj -c "Release" -o $dir\obj\Azure\publish

src/Admin/build.sh

@@ -14,8 +14,8 @@ echo "Clean"
 dotnet clean "$DIR/Admin.csproj" -c "Release" -o "$DIR/obj/build-output/publish"
 echo "Node Build"
 cd "$DIR"
-npm install
+npm ci
+npm run build
 cd "$CUR_DIR"
-gulp --gulpfile "$DIR/gulpfile.js" build
 echo "Publish"
 dotnet publish "$DIR/Admin.csproj" -c "Release" -o "$DIR/obj/build-output/publish"

src/Admin/gulpfile.js

@@ -2,7 +2,7 @@
 
 const gulp = require('gulp');
 const merge = require('merge-stream');
-const sass = require('gulp-sass');
+const sass = require('gulp-sass')(require("sass"));
 const del = require('del');
 
 const paths = {};

src/Admin/package.json

@@ -4,15 +4,19 @@
   "description": "Bitwarden System Admin Portal",
   "repository": "https://github.com/bitwarden/server",
   "license": "GPL-3.0",
+  "scripts": {
+    "build": "gulp build"
+  },
   "devDependencies": {
     "bootstrap": "4.5.0",
-    "del": "5.1.0",
+    "del": "6.0.0",
     "font-awesome": "4.7.0",
     "gulp": "4.0.2",
-    "gulp-sass": "4.0.1",
+    "gulp-sass": "5.1.0",
     "jquery": "3.5.1",
-    "merge-stream": "1.0.1",
+    "merge-stream": "2.0.0",
     "popper.js": "1.16.1",
+    "sass": "^1.49.7",
     "toastr": "^2.1.4"
   }
 }