@shuvi/toolpack 2.0.0-dev.15 → 2.0.0-dev.17

package/lib/webpack/config/base.rspack.js

@@ -43,6 +43,7 @@ const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
 const constants_1 = require("@shuvi/shared/constants");
 const fix_watching_plugin_1 = __importDefault(require("../plugins/fix-watching-plugin"));
+const crypto = __importStar(require("crypto"));
 const resolveLocalLoader = (name) => path.join(__dirname, `../loaders/${name}`);
 function getDefineEnv(env) {
     return Object.assign(Object.assign({}, Object.keys(process.env).reduce((prev, key) => {
@@ -221,35 +222,41 @@ function baseRspackChain({ dev, outputDir, lightningCss, compiler, projectRoot,
             'process.env.NODE_ENV': JSON.stringify(dev ? 'development' : 'production')
         }
     ]);
-    // const getCacheConfig = () => {
-    //   const projectHash = crypto
-    //     .createHash('md5')
-    //     .update(projectRoot)
-    //     .digest('hex');
-    //   const stringifiedEnvs = Object.entries({
-    //     ...getDefineEnv(env)
-    //   }).reduce((prev: string, [key, value]) => {
-    //     return `${prev}|${key}=${value}`;
-    //   }, '');
-    //   const PACKAGE_JSON = path.resolve(__dirname, '../../../package.json');
-    //   const SHUVI_VERSION = require(PACKAGE_JSON).version;
-    //   return {
-    //     cacheDirectory: path.join(cacheDir, 'webpack', projectHash),
-    //     type: 'filesystem',
-    //     name: `${name.replace(/\//, '-')}-${config.get('mode')}`,
-    //     version: `${SHUVI_VERSION}|${stringifiedEnvs}`
-    //   };
-    // };
-    /**
-     * @unsupported Rspack only supports `cache: boolean`. Object cache config is not supported.
-     * See: https://rspack.dev/config/cache
-     */
-    // config.cache(
-    //   typeof process.env.SHUVI_DEV_DISABLE_CACHE !== 'undefined'
-    //     ? false
-    //     : getCacheConfig()
-    // );
-    config.cache(typeof process.env.SHUVI_DEV_DISABLE_CACHE !== 'undefined' ? false : true);
+    const getCacheConfig = () => {
+        const projectHash = crypto
+            .createHash('md5')
+            .update(projectRoot)
+            .digest('hex');
+        const stringifiedEnvs = Object.entries(Object.assign({}, getDefineEnv(env))).reduce((prev, [key, value]) => {
+            return `${prev}|${key}=${value}`;
+        }, '');
+        const PACKAGE_JSON = path.resolve(__dirname, '../../../package.json');
+        const SHUVI_VERSION = require(PACKAGE_JSON).version;
+        return {
+            cacheDirectory: path.join(cacheDir, 'rspack', projectHash),
+            type: 'filesystem',
+            name: `${name.replace(/\//, '-')}-${config.get('mode')}`,
+            version: `${SHUVI_VERSION}|${stringifiedEnvs}`
+        };
+    };
+    // Enable filesystem cache for Rspack using experiments.cache
+    if (typeof process.env.SHUVI_DEV_DISABLE_CACHE === 'undefined') {
+        const cacheConfig = getCacheConfig();
+        config.cache(true);
+        config.set('experiments', {
+            cache: {
+                type: 'persistent',
+                version: cacheConfig.version,
+                storage: {
+                    type: 'filesystem',
+                    directory: cacheConfig.cacheDirectory
+                }
+            }
+        });
+    }
+    else {
+        config.cache(false);
+    }
     const tsConfigPath = path.join(projectRoot, 'tsconfig.json');
     const jsConfigPath = path.join(projectRoot, 'jsconfig.json');
     if (jsConfig === null || jsConfig === void 0 ? void 0 : jsConfig.useTypeScript) {

package/lib/webpack/config/browser.rspack.js

@@ -154,28 +154,11 @@ function createBrowserRspackChain(options) {
                         return (module.size() > BIG_LIBRARY_THRESHOLD &&
                             helpers_rspack_1.NODE_MODULES_REGEXP.test(module.nameForCondition() || ''));
                     },
-                    /**
-                     * @unsupported Rspack does not support libIdent directly.
-                     */
-                    // name(module: {
-                    //   type: string;
-                    //   libIdent?: Function;
-                    //   updateHash: (hash: crypto.Hash) => void;
-                    // }): string {
-                    //   const hash = crypto.createHash('sha1');
-                    //   if (module.type === `css/mini-extract`) {
-                    //     module.updateHash(hash);
-                    //   } else {
-                    //     if (!module.libIdent) {
-                    //       throw new Error(
-                    //         `Encountered unknown module type: ${module.type}. Please open an issue.`
-                    //       );
-                    //     }
-                    //     hash.update(module.libIdent({ context: options.projectRoot }));
-                    //   }
-                    //   return hash.digest('hex').substring(0, 8);
-                    // },
-                    name: 'lib',
+                    name(module) {
+                        const hash = crypto.createHash('sha1');
+                        hash.update(module.identifier());
+                        return hash.digest('hex').substring(0, 8);
+                    },
                     filename: (0, helpers_rspack_1.commonChunkFilename)({ dev: false }),
                     priority: 30,
                     minChunks: 1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/toolpack",
-  "version": "2.0.0-dev.15",
+  "version": "2.0.0-dev.17",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -36,9 +36,9 @@
     "@rspack/cli": "^1.4.2",
     "@rspack/core": "^1.4.2",
     "@rspack/plugin-html": "^0.5.8",
-    "@shuvi/compiler": "2.0.0-dev.15",
-    "@shuvi/shared": "2.0.0-dev.15",
-    "@shuvi/utils": "2.0.0-dev.15",
+    "@shuvi/compiler": "2.0.0-dev.17",
+    "@shuvi/shared": "2.0.0-dev.17",
+    "@shuvi/utils": "2.0.0-dev.17",
     "@swc/helpers": "0.4.3",
     "babel-loader": "8.2.2",
     "babel-plugin-syntax-jsx": "6.18.0",