@shuvi/toolpack 2.0.0-dev.7 → 2.0.0-dev.8

package/lib/webpack/index.js

@@ -28,5 +28,7 @@ function resolveRspackModule(path) {
         console.error('path need startWith "@rspack/core/" to resolve rspack module');
     }
     const p = require(`${rspackResolveContext}/${path}`);
+    // debug
+    console.debug(`[rspack][resolveRspackModule] ${path} -> ${p}`);
     return p;
 }

package/lib/webpack/plugins/module-replace-plugin/index.d.ts

@@ -1 +1 @@
-export { default } from './plugin.rspack';
+export { default } from "./plugin";

package/lib/webpack/plugins/module-replace-plugin/index.js

@@ -4,5 +4,5 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = void 0;
-var plugin_rspack_1 = require("./plugin.rspack");
-Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(plugin_rspack_1).default; } });
+var plugin_1 = require("./plugin");
+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(plugin_1).default; } });

package/lib/webpack/plugins/require-cache-hot-reloader-plugin.rspack.js

@@ -1,30 +1,6 @@
 "use strict";
 // ref: https://github.com/vercel/next.js/blob/canary/packages/next/build/webpack/plugins/nextjs-require-cache-hot-reloader.ts
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const Rspack = __importStar(require("../../webpack"));
 const fs_1 = require("fs");
 function deleteCache(filePath) {
     try {
@@ -49,7 +25,8 @@ class RequireCacheHotReloader {
         compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
             compilation.hooks.additionalTreeRuntimeRequirements.tap(PLUGIN_NAME, (_chunk, runtimeRequirements) => {
                 // add this so that the server.js would be emitted after every compilation
-                runtimeRequirements.add(Rspack.RuntimeGlobals.getFullHash);
+                // @ts-ignore webpack typing bug
+                runtimeRequirements.add(RuntimeGlobals.getFullHash);
             });
         });
         compiler.hooks.assetEmitted.tap(PLUGIN_NAME, (_file, { targetPath }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/toolpack",
-  "version": "2.0.0-dev.7",
+  "version": "2.0.0-dev.8",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -20,6 +20,7 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
+    "@shuvi/compiler": "2.0.0-dev.8",
     "@babel/core": "7.12.10",
     "@babel/plugin-proposal-class-properties": "7.12.1",
     "@babel/plugin-proposal-nullish-coalescing-operator": "7.10.1",
@@ -33,13 +34,9 @@
     "@babel/preset-react": "7.10.1",
     "@babel/preset-typescript": "7.12.7",
     "@babel/runtime": "7.12.5",
-    "@rspack/cli": "^1.4.2",
-    "@rspack/core": "^1.4.2",
-    "@rspack/plugin-html": "^0.5.8",
-    "@shuvi/compiler": "2.0.0-dev.7",
-    "@shuvi/shared": "2.0.0-dev.7",
-    "@shuvi/utils": "2.0.0-dev.7",
-    "@swc/helpers": "0.4.3",
+    "lightningcss": "1.19.0",
+    "@shuvi/shared": "2.0.0-dev.8",
+    "@shuvi/utils": "2.0.0-dev.8",
     "babel-loader": "8.2.2",
     "babel-plugin-syntax-jsx": "6.18.0",
     "babel-plugin-transform-define": "2.0.0",
@@ -56,7 +53,6 @@
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "fs-extra": "9.0.1",
     "ignore-loader": "0.1.2",
-    "lightningcss": "1.19.0",
     "loader-utils": "3.0.0",
     "mini-css-extract-plugin": "1.3.9",
     "mrmime": "1.0.0",
@@ -67,19 +63,23 @@
     "postcss-preset-env": "6.7.0",
     "process": "0.11.10",
     "regenerator-runtime": "0.13.9",
-    "rspack-chain": "1.2.6",
+    "@swc/helpers": "0.4.3",
     "sass-loader": "10.1.0",
     "stream-browserify": "3.0.0",
     "style-loader": "2.0.0",
     "terser-webpack-plugin": "5.2.5",
-    "ts-checker-rspack-plugin": "^1.1.4",
     "typescript": "5.5.2",
     "vm-browserify": "1.1.2",
     "webpack": "5.73.0",
     "webpack-bundle-analyzer": "4.3.0",
     "webpack-chain": "6.5.1",
     "webpack-sources": "2.2.0",
-    "webpack-virtual-modules": "0.4.3"
+    "webpack-virtual-modules": "0.4.3",
+    "rspack-chain": "^1.2.5",
+    "@rspack/cli": "^1.3.15",
+    "@rspack/core": "^1.4.0",
+    "@rspack/plugin-html": "^0.5.8",
+    "ts-checker-rspack-plugin": "^1.1.4"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.19",