balm-core 4.15.0 → 4.16.0

package/lib/plugins/sass.js

@@ -1,3 +1,5 @@
+import path from 'node:path';
+import fs from 'node:fs';
 // Reference `gulp-sass@5.1.0`
 import { Transform } from 'node:stream';
 import sass from 'sass';
@@ -5,6 +7,11 @@ import replaceExtension from 'replace-ext';
 import stripAnsi from 'strip-ansi';
 import applySourceMap from 'vinyl-sourcemaps-apply';
 import ansiColors from 'ansi-colors';
+
+// Just for `npm i -D sass@1.39.2`
+process.env.BALM_CWD = process.env.INIT_CWD || process.cwd();
+const localSassModule = path.join(process.env.BALM_ROOT || process.env.BALM_CWD, 'node_modules', 'sass', 'sass.dart.js');
+const sassModule = fs.existsSync(localSassModule) ? requireModule(localSassModule) : sass;
 const PLUGIN_NAME = 'sass';
 const transformObj = transform => new Transform({
   transform,
@@ -119,5 +126,5 @@ const gulpSass = options => transformObj((file, encoding, callback) => {
     handleError(error, file, callback);
   }
 });
-gulpSass.compiler = sass;
+gulpSass.compiler = sassModule;
 export default gulpSass;

package/lib/tasks/private/cache.js

@@ -1,13 +1,14 @@
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import revAll from 'gulp-rev-all';
 import { ASSETS_TYPES, CHUNK, ASSET } from '../../config/constants.js';
 class CacheTask extends BalmJS.BalmTask {
   constructor() {
     super('cache');
     _defineProperty(this, "fn", () => {
       this.init();
-      return this.src.pipe($.revAll.revision(BalmJS.config.assets.options)).pipe($.if(/\.html$/, BalmJS.file.setPublicPath())).pipe(gulp.dest(this.output)).pipe($.revDeleteOriginal()).pipe($.revAll.manifestFile()).pipe(gulp.dest(this.output));
+      return this.src.pipe(revAll.revision(BalmJS.config.assets.options)).pipe($.if(/\.html$/, BalmJS.file.setPublicPath())).pipe(gulp.dest(this.output)).pipe($.revDeleteOriginal()).pipe(revAll.manifestFile()).pipe(gulp.dest(this.output));
     });
     const defaultIncludes = BalmJS.config.scripts.useCache ? ASSETS_TYPES.filter(assetType => assetType !== 'js').map(assetType => BalmJS.file.matchAllFiles(BalmJS.config.dest[assetType])) : ASSETS_TYPES.map(assetType => BalmJS.file.matchAllFiles(BalmJS.config.dest[assetType]));
     const defaultExcludes = [node.path.join(`!${BalmJS.config.dest.js}`, CHUNK.dir, '*'), node.path.join(`!${BalmJS.config.dest.js}`, ASSET.dir, '*'), node.path.join(`!${BalmJS.config.dest.base}`, BalmJS.config.pwa.manifest)];

package/lib/tasks/public/version.js

@@ -1,3 +1,4 @@
+import revAll from 'gulp-rev-all';
 class VersionTask extends BalmJS.BalmTask {
   constructor() {
     super('version');
@@ -11,7 +12,7 @@ class VersionTask extends BalmJS.BalmTask {
       this.init(input, output, {
         version: assetsOptions
       });
-      return this.src.pipe($.revAll.revision(this.options)).pipe(gulp.dest(this.output)).pipe($.revAll.versionFile()).pipe(gulp.dest(this.output));
+      return this.src.pipe(revAll.revision(this.options)).pipe(gulp.dest(this.output)).pipe(revAll.versionFile()).pipe(gulp.dest(this.output));
     };
     return balmVersion;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balm-core",
-  "version": "4.15.0",
+  "version": "4.16.0",
   "description": "BalmJS compiler core",
   "keywords": [
     "balm",
@@ -120,5 +120,5 @@
   "engines": {
     "node": ">=14.18.0"
   },
-  "gitHead": "ab628f37a5519cd1c8b3fcf42828ca4bdfd2c503"
+  "gitHead": "fa3bd6dd7f008aa9a67cf3447c98ad5535083aa7"
 }

package/tslib/plugins/sass.js

@@ -1,9 +1,16 @@
+import path from 'node:path';
+import fs from 'node:fs';
 import { Transform } from 'node:stream';
 import sass from 'sass';
 import replaceExtension from 'replace-ext';
 import stripAnsi from 'strip-ansi';
 import applySourceMap from 'vinyl-sourcemaps-apply';
 import ansiColors from 'ansi-colors';
+process.env.BALM_CWD = process.env.INIT_CWD || process.cwd();
+const localSassModule = path.join(process.env.BALM_ROOT || process.env.BALM_CWD, 'node_modules', 'sass', 'sass.dart.js');
+const sassModule = fs.existsSync(localSassModule)
+    ? requireModule(localSassModule)
+    : sass;
 const PLUGIN_NAME = 'sass';
 const transformObj = (transform) => new Transform({ transform, objectMode: true });
 const filePush = (file, sassObject, callback) => {
@@ -86,5 +93,5 @@ const gulpSass = (options) => transformObj((file, encoding, callback) => {
         handleError(error, file, callback);
     }
 });
-gulpSass.compiler = sass;
+gulpSass.compiler = sassModule;
 export default gulpSass;

package/tslib/tasks/private/cache.js

@@ -1,3 +1,4 @@
+import revAll from 'gulp-rev-all';
 import { ASSETS_TYPES, CHUNK, ASSET } from '../../config/constants.js';
 class CacheTask extends BalmJS.BalmTask {
     constructor() {
@@ -5,11 +6,11 @@ class CacheTask extends BalmJS.BalmTask {
         this.fn = () => {
             this.init();
             return this.src
-                .pipe($.revAll.revision(BalmJS.config.assets.options))
+                .pipe(revAll.revision(BalmJS.config.assets.options))
                 .pipe($.if(/\.html$/, BalmJS.file.setPublicPath()))
                 .pipe(gulp.dest(this.output))
                 .pipe($.revDeleteOriginal())
-                .pipe($.revAll.manifestFile())
+                .pipe(revAll.manifestFile())
                 .pipe(gulp.dest(this.output));
         };
         const defaultIncludes = BalmJS.config.scripts.useCache

package/tslib/tasks/public/version.js

@@ -1,3 +1,4 @@
+import revAll from 'gulp-rev-all';
 class VersionTask extends BalmJS.BalmTask {
     constructor() {
         super('version');
@@ -12,9 +13,9 @@ class VersionTask extends BalmJS.BalmTask {
                 version: assetsOptions
             });
             return this.src
-                .pipe($.revAll.revision(this.options))
+                .pipe(revAll.revision(this.options))
                 .pipe(gulp.dest(this.output))
-                .pipe($.revAll.versionFile())
+                .pipe(revAll.versionFile())
                 .pipe(gulp.dest(this.output));
         };
         return balmVersion;