balm-core 4.7.0 → 4.10.0

package/lib/balm.js

@@ -28,12 +28,10 @@ class Balm {
       value: void 0
     });
 
-    _classPrivateFieldSet(this, _config, setConfig({}));
+    BalmJS.loading = false;
+    loading.succeed();
 
-    if (!BalmJS.useCacache) {
-      BalmJS.loading = false;
-      loading.succeed();
-    }
+    _classPrivateFieldSet(this, _config, setConfig({}));
   }
 
   get config() {

package/lib/bundler/webpack/config/common.js

@@ -37,7 +37,7 @@ function getDefaultPlugins(webpack, scripts) {
 
     BalmJS.entries.forEach((entry, index) => {
       const entryName = isSPA ? 'index' : entry.key;
-      const chunks = isSPA ? '?' : [entryName];
+      const chunks = isSPA ? 'all' : [entryName];
       const title = titles[index];
       const options = Object.assign({
         filename: BalmJS.file.absPath(`${BalmJS.config.src.base}/${entryName}.html`),
@@ -63,7 +63,7 @@ function getSplitChunks() {
     cacheGroups = {
       allVendors: {
         name: 'vendors',
-        chunks: 'all',
+        chunks: 'initial',
         test: /[\\/](node_modules|bower_components)[\\/]/,
         filename: BalmJS.file.assetsPath(`${jsFolder}/${vendorsFilename}`) // Output: `js/vendors.js`
 

package/lib/bundler/webpack/loaders.js

@@ -1,6 +1,5 @@
 import { mergeWithRules, CustomizeRule } from 'webpack-merge';
 import LOADERS from './rules/index.js';
-import fileLoader from './rules/file.js';
 
 function getLoaders(customLoaders) {
   const enableDefaultLoaders = Object.assign({
@@ -46,10 +45,6 @@ function getLoaders(customLoaders) {
     module: {
       rules: customLoaders
     }
-  }, {
-    module: {
-      rules: [fileLoader()]
-    }
   });
   const defaultModule = result.module;
   BalmJS.logger.debug('webpack loaders', defaultModule.rules, {

package/lib/plugins/postcss-plugins.js

@@ -8,9 +8,7 @@ function getDefaultPostcssPlugins(isPostCSS = false) {
   const defaultPostcssPlugins = isPostCSS || BalmJS.config.styles.extname === 'css' ? [atImport({
     path: BalmJS.file.stylePaths
   }), postcssFlexbugsFixes(), postcssPresetEnv(BalmJS.config.styles.postcssEnvOptions)] : [];
-  const cssnanoPlugin = BalmJS.config.env.isProd || BalmJS.config.styles.minify ? [cssnano(Object.assign(BalmJS.config.styles.options, {
-    autoprefixer: false
-  }))] : [];
+  const cssnanoPlugin = BalmJS.config.env.isProd || BalmJS.config.styles.minify ? [cssnano(BalmJS.config.styles.options)] : [];
   return defaultPostcssPlugins.concat([autoprefixer(), ...cssnanoPlugin, ...BalmJS.config.styles.postcssPlugins]);
 }
 

package/lib/tasks/private/clean.js

@@ -10,7 +10,7 @@ function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!priva
 
 function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
 
-import del from 'del';
+import { deleteAsync } from 'del';
 import { ASSETS_TYPES } from '../../config/constants.js';
 
 function unique(arr) {
@@ -53,7 +53,7 @@ class CleanTask extends BalmJS.BalmTask {
       }, {
         pre: true
       });
-      const deletedPaths = await del(directories, {
+      const deletedPaths = await deleteAsync(directories, {
         force: true
       });
       BalmJS.logger.warn(taskName, {

package/lib/tasks/private/pwa-cache.js

@@ -1,6 +1,6 @@
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import del from 'del';
+import { deleteAsync } from 'del';
 
 class PwaCacheTask extends BalmJS.BalmTask {
   constructor() {
@@ -21,7 +21,7 @@ class PwaCacheTask extends BalmJS.BalmTask {
 
   clear() {
     const swOrigin = BalmJS.file.absPath(node.path.join(BalmJS.config.dest.base, BalmJS.config.pwa.swSrcFilename));
-    del(swOrigin, {
+    deleteAsync(swOrigin, {
       force: true
     });
   }

package/lib/tasks/public/pwa.js

@@ -1,4 +1,4 @@
-import workboxBuild from 'workbox-build';
+import { generateSW, injectManifest } from 'workbox-build';
 
 class PwaTask extends BalmJS.BalmTask {
   constructor() {
@@ -53,7 +53,8 @@ class PwaTask extends BalmJS.BalmTask {
         BalmJS.logger.debug(`pwa - ${mode}`, options, {
           pre: true
         });
-        await workboxBuild[mode](options).then(({
+        const workboxBuild = mode === 'generateSW' ? generateSW(options) : injectManifest(options);
+        await workboxBuild.then(({
           count,
           size
         }) => {

package/lib/tasks/public/remove.js

@@ -8,7 +8,7 @@ function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!priva
 
 function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
 
-import del from 'del';
+import { deleteAsync } from 'del';
 
 var _getFiles = /*#__PURE__*/new WeakMap();
 
@@ -39,7 +39,7 @@ class RemoveTask extends BalmJS.BalmTask {
         }, {
           pre: true
         });
-        const deletedPaths = await del(files, {
+        const deletedPaths = await deleteAsync(files, {
           force: true
         });
         BalmJS.logger.warn(`${this.name} task`, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balm-core",
-  "version": "4.7.0",
+  "version": "4.10.0",
   "description": "BalmJS compiler core",
   "keywords": [
     "balm",
@@ -42,18 +42,18 @@
   },
   "dependencies": {
     "ansi-colors": "^4.1.3",
-    "async": "^3.2.3",
+    "async": "^3.2.4",
     "autoprefixer": "^10.4.7",
     "babel-loader": "^8.2.5",
     "browser-sync": "^2.27.10",
-    "connect-history-api-fallback": "^1.6.0",
+    "connect-history-api-fallback": "^2.0.0",
     "css-loader": "^6.7.1",
     "css-minimizer-webpack-plugin": "^4.0.0",
-    "cssnano": "^5.1.9",
-    "del": "^6.1.0",
+    "cssnano": "^5.1.12",
+    "del": "^7.0.0",
     "dotenv": "^16.0.1",
     "dotenv-expand": "^8.0.3",
-    "esbuild": "^0.14",
+    "esbuild": "^0.14.0",
     "fancy-log": "^2.0.0",
     "gulp-eslint": "^6.0.0",
     "gulp-if": "^3.0.0",
@@ -63,41 +63,41 @@
     "gulp-size": "^4.0.1",
     "gulp-useref": "^5.0.0",
     "gulp-zip": "^5.1.0",
-    "gulp.spritesmith": "^6.12.1",
-    "html-loader": "^3.1.0",
+    "gulp.spritesmith": "^6.13.0",
+    "html-loader": "^4.1.0",
     "html-minifier": "^4.0.0",
     "html-webpack-plugin": "^5.5.0",
     "http-proxy-middleware": "^2.0.6",
     "imagemin": "^8.0.1",
     "istextorbinary": "^6.0.0",
-    "less": "^4.1.2",
-    "mini-css-extract-plugin": "2.5.2",
+    "less": "^4.1.3",
+    "mini-css-extract-plugin": "^2.6.1",
     "modernizr": "^3.12.0",
     "parents": "^1.0.1",
-    "plugin-error": "^1.0.1",
+    "plugin-error": "^2.0.0",
     "postcss": "^8.4.14",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-import": "^14.1.0",
-    "postcss-load-config": "^3.1.4",
-    "postcss-loader": "7.0.0",
-    "postcss-preset-env": "^7.6.0",
+    "postcss-load-config": "^4.0.1",
+    "postcss-loader": "7.0.1",
+    "postcss-preset-env": "^7.7.2",
     "pretty-bytes": "^6.0.0",
-    "readable-stream": "^3.6.0",
+    "readable-stream": "^4.1.0",
     "replace-ext": "^2.0.0",
-    "rollup": "^2.74.1",
+    "rollup": "^2.77.0",
     "rollup-plugin-terser": "^7.0.2",
-    "sass": "^1.52.1",
-    "sass-loader": "^13.0.0",
-    "ssh2": "^1.10.0",
+    "sass": "^1.53.0",
+    "sass-loader": "^13.0.2",
+    "ssh2": "^1.11.0",
     "strip-ansi": "^7.0.1",
     "style-loader": "^3.3.1",
-    "terser": "^5.13.1",
-    "terser-webpack-plugin": "^5.3.1",
+    "terser": "^5.14.2",
+    "terser-webpack-plugin": "^5.3.3",
     "through2": "^4.0.2",
     "through2-concurrent": "^2.0.0",
     "tslib": "^2.4.0",
     "vinyl-sourcemaps-apply": "^0.2.1",
-    "webpack": "^5.72.1",
+    "webpack": "^5.73.0",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-dev-middleware": "^5.3.3",
     "webpack-hot-middleware": "^2.25.1",
@@ -106,10 +106,10 @@
   },
   "devDependencies": {
     "@swc/core": "^1.2",
-    "@types/express": "^4.17.13",
-    "@types/node": "^17",
-    "@types/uglify-js": "^3.13.2",
-    "@types/webpack": "^5.28.0"
+    "@types/express": "4",
+    "@types/node": "18",
+    "@types/uglify-js": "3",
+    "@types/webpack": "5"
   },
   "optionalDependencies": {
     "imagemin-gifsicle": "^7.0.0",
@@ -120,5 +120,5 @@
   "engines": {
     "node": ">=14.15.0"
   },
-  "gitHead": "fd93945ebc7775dac2de9b8eac42f7908c0c7009"
+  "gitHead": "53947df2bdca620a2a915c4b055bf26a52600583"
 }

package/tslib/balm.js

@@ -9,11 +9,9 @@ import loading from './utilities/loading.js';
 class Balm {
     constructor() {
         _Balm_config.set(this, void 0);
+        BalmJS.loading = false;
+        loading.succeed();
         __classPrivateFieldSet(this, _Balm_config, setConfig({}), "f");
-        if (!BalmJS.useCacache) {
-            BalmJS.loading = false;
-            loading.succeed();
-        }
     }
     get config() {
         return __classPrivateFieldGet(this, _Balm_config, "f");

package/tslib/bundler/webpack/config/common.js

@@ -22,7 +22,7 @@ function getDefaultPlugins(webpack, scripts) {
         }
         BalmJS.entries.forEach((entry, index) => {
             const entryName = isSPA ? 'index' : entry.key;
-            const chunks = isSPA ? '?' : [entryName];
+            const chunks = isSPA ? 'all' : [entryName];
             const title = titles[index];
             const options = Object.assign({
                 filename: BalmJS.file.absPath(`${BalmJS.config.src.base}/${entryName}.html`),
@@ -46,7 +46,7 @@ function getSplitChunks() {
         cacheGroups = {
             allVendors: {
                 name: 'vendors',
-                chunks: 'all',
+                chunks: 'initial',
                 test: /[\\/](node_modules|bower_components)[\\/]/,
                 filename: BalmJS.file.assetsPath(`${jsFolder}/${vendorsFilename}`)
             }

package/tslib/bundler/webpack/loaders.js

@@ -1,6 +1,5 @@
 import { mergeWithRules, CustomizeRule } from 'webpack-merge';
 import LOADERS from './rules/index.js';
-import fileLoader from './rules/file.js';
 function getLoaders(customLoaders) {
     const enableDefaultLoaders = Object.assign({
         js: true,
@@ -42,10 +41,6 @@ function getLoaders(customLoaders) {
         module: {
             rules: customLoaders
         }
-    }, {
-        module: {
-            rules: [fileLoader()]
-        }
     });
     const defaultModule = result.module;
     BalmJS.logger.debug('webpack loaders', defaultModule.rules, {

package/tslib/plugins/postcss-plugins.js

@@ -12,11 +12,7 @@ function getDefaultPostcssPlugins(isPostCSS = false) {
         ]
         : [];
     const cssnanoPlugin = BalmJS.config.env.isProd || BalmJS.config.styles.minify
-        ? [
-            cssnano(Object.assign(BalmJS.config.styles.options, {
-                autoprefixer: false
-            }))
-        ]
+        ? [cssnano(BalmJS.config.styles.options)]
         : [];
     return defaultPostcssPlugins.concat([
         autoprefixer(),

package/tslib/tasks/private/clean.js

@@ -1,6 +1,6 @@
 var _CleanTask_getAssetsDir;
 import { __classPrivateFieldGet } from "tslib";
-import del from 'del';
+import { deleteAsync } from 'del';
 import { ASSETS_TYPES } from '../../config/constants.js';
 function unique(arr) {
     const obj = {};
@@ -32,7 +32,7 @@ class CleanTask extends BalmJS.BalmTask {
             }, {
                 pre: true
             });
-            const deletedPaths = await del(directories, {
+            const deletedPaths = await deleteAsync(directories, {
                 force: true
             });
             BalmJS.logger.warn(taskName, {

package/tslib/tasks/private/pwa-cache.js

@@ -1,4 +1,4 @@
-import del from 'del';
+import { deleteAsync } from 'del';
 class PwaCacheTask extends BalmJS.BalmTask {
     constructor() {
         super('pwa-cache');
@@ -18,7 +18,7 @@ class PwaCacheTask extends BalmJS.BalmTask {
     }
     clear() {
         const swOrigin = BalmJS.file.absPath(node.path.join(BalmJS.config.dest.base, BalmJS.config.pwa.swSrcFilename));
-        del(swOrigin, { force: true });
+        deleteAsync(swOrigin, { force: true });
     }
 }
 export default PwaCacheTask;

package/tslib/tasks/public/pwa.js

@@ -1,4 +1,4 @@
-import workboxBuild from 'workbox-build';
+import { generateSW, injectManifest } from 'workbox-build';
 class PwaTask extends BalmJS.BalmTask {
     constructor() {
         super('pwa');
@@ -43,7 +43,10 @@ class PwaTask extends BalmJS.BalmTask {
                 BalmJS.logger.debug(`pwa - ${mode}`, options, {
                     pre: true
                 });
-                await workboxBuild[mode](options)
+                const workboxBuild = mode === 'generateSW'
+                    ? generateSW(options)
+                    : injectManifest(options);
+                await workboxBuild
                     .then(({ count, size }) => {
                     BalmJS.logger.info(`pwa - ${mode}`, `Generated '${swDest}', which will precache ${count} files, totaling ${size} bytes`);
                     gulp.parallel(BalmJS.toNamespace('pwa-cache'))();

package/tslib/tasks/public/remove.js

@@ -1,6 +1,6 @@
 var _RemoveTask_getFiles;
 import { __classPrivateFieldGet } from "tslib";
-import del from 'del';
+import { deleteAsync } from 'del';
 class RemoveTask extends BalmJS.BalmTask {
     constructor() {
         super('remove');
@@ -23,7 +23,7 @@ class RemoveTask extends BalmJS.BalmTask {
                 }, {
                     pre: true
                 });
-                const deletedPaths = await del(files, {
+                const deletedPaths = await deleteAsync(files, {
                     force: true
                 });
                 BalmJS.logger.warn(`${this.name} task`, {

package/lib/bundler/webpack/rules/file.js

@@ -1,20 +0,0 @@
-import { jsRegex, htmlRegex } from '../config/regex.js';
-
-function fileLoader() {
-  // "file" loader makes sure those assets get served by WebpackDevServer.
-  // When you `import` an asset, you get its (virtual) filename.
-  // In production, they would get copied to the `build` folder.
-  // This loader doesn't use a "test" so it will catch all modules
-  // that fall through the other loaders.
-  return {
-    // Exclude `js` files to keep "css" loader working as it injects
-    // its runtime that would otherwise be processed through "file" loader.
-    // Also exclude `html` and `json` extensions so they get processed
-    // by webpacks internal loaders.
-    exclude: [/^$/, jsRegex, htmlRegex, /\.json$/],
-    type: 'asset/resource'
-  }; // ** STOP ** Are you adding a new loader?
-  // Make sure to add the new loader(s) before the "file" loader.
-}
-
-export default fileLoader;

package/tslib/bundler/webpack/rules/file.js

@@ -1,8 +0,0 @@
-import { jsRegex, htmlRegex } from '../config/regex.js';
-function fileLoader() {
-    return {
-        exclude: [/^$/, jsRegex, htmlRegex, /\.json$/],
-        type: 'asset/resource'
-    };
-}
-export default fileLoader;