Rebuild all assets

.github/workflows/assets_validation.yml

@@ -1,7 +1,18 @@
-name: Frontend Assets Build Validation
+name: Assets Build Validation
 on:
   # Manual trigger.
   workflow_dispatch:
+  push:
+    paths-ignore:
+      - '**/*.md'
+      - 'mkdocs.yml'
+      - 'src/docs/**/*'
+    branches: [ main ]
+  pull_request:
+    branches: [ main, release/** ]
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 jobs:
   test-npm-build:
     name: Test building assets
@@ -21,16 +32,17 @@ jobs:
     - name: Check if git has changes
       shell: pwsh
       run: |
+        git status
         $changes = git status --porcelain
 
-        if ($changes)
+        if ([string]::IsNullOrEmpty($changes))
+        {
+            Write-Host "No uncommitted changes found. Repository is clean."
+        } 
+        else 
         {
             Write-Output 'Please make sure to build the assets properly before pushing, see https://docs.orchardcore.net/en/latest/docs/guides/gulp-pipeline/.'
             Write-Output 'The following files changed:'
             Write-Output $changes
             exit -1
         }
-        else
-        {
-            Write-Host "No uncommitted changes found. Repository is clean."
-        }

gulpfile.js

@@ -21,7 +21,8 @@ var fs = require("graceful-fs"),
     util = require('gulp-util'),
     postcss = require('gulp-postcss'),
     rtl = require('postcss-rtl'),
-    babel = require('gulp-babel');
+    babel = require('gulp-babel'),
+    sort = require('gulp-sort');
 
 // For compat with older versions of Node.js.
 require("es6-promise").polyfill();
@@ -108,15 +109,17 @@ function getAssetGroups() {
             assetGroups.push(assetGroup);
         });
     });
+
     return assetGroups;
 }
 
 function resolveAssetGroupPaths(assetGroup, assetManifestPath) {
     assetGroup.manifestPath = assetManifestPath;
     assetGroup.basePath = path.dirname(assetManifestPath);
-    assetGroup.inputPaths = assetGroup.inputs.map(function (inputPath) {
+    const inputPaths = assetGroup.inputs.map(function (inputPath) {
         return path.resolve(path.join(assetGroup.basePath, inputPath)).replace(/\\/g, '/');
     });
+    assetGroup.inputPaths = inputPaths.sort();
     assetGroup.watchPaths = [];
     if (!!assetGroup.watch) {
         assetGroup.watchPaths = assetGroup.watch.map(function (watchPath) {
@@ -174,6 +177,7 @@ function buildCssPipeline(assetGroup, doConcat, doRebuild) {
         generateSourceMaps = false;
 
     var minifiedStream = gulp.src(assetGroup.inputPaths) // Minified output, source mapping completely disabled.
+        .pipe(sort())
         .pipe(gulpif(!doRebuild,
             gulpif(doConcat,
                 newer(assetGroup.outputPath),
@@ -208,6 +212,7 @@ function buildCssPipeline(assetGroup, doConcat, doRebuild) {
     // Uncomment to copy assets to wwwroot
     //.pipe(gulp.dest(assetGroup.webroot));
     var devStream = gulp.src(assetGroup.inputPaths) // Non-minified output, with source mapping
+        .pipe(sort())
         .pipe(gulpif(!doRebuild,
             gulpif(doConcat,
                 newer(assetGroup.outputPath),
@@ -255,8 +260,9 @@ function buildJsPipeline(assetGroup, doConcat, doRebuild) {
         target: "es5",
     };
 
-    console.log(assetGroup.inputPaths);
+    // console.log(assetGroup.inputPaths);
     return gulp.src(assetGroup.inputPaths)
+        .pipe(sort())
         .pipe(gulpif(!doRebuild,
             gulpif(doConcat,
                 newer(assetGroup.outputPath),
@@ -301,6 +307,8 @@ function buildJsPipeline(assetGroup, doConcat, doRebuild) {
 function buildCopyPipeline(assetGroup, doRebuild) {
     var stream = gulp.src(assetGroup.inputPaths);
 
+    stream = stream.pipe(sort());
+
     if (!doRebuild) {
         stream = stream.pipe(newer(assetGroup.outputDir))
     }

package.json

@@ -46,7 +46,8 @@
     "postcss": "8.4.28",
     "postcss-rtl": "^2.0.0",
     "rtlcss": "4.1.0",
+    "source-map": "^0.7.4",
     "typescript": "^5.2.2",
-    "source-map": "^0.7.4"
+    "gulp-sort": "^2.0.0"
   }
 }