webpack => rspack

Author: johanneswilm

MANIFEST.in

@@ -3,4 +3,4 @@ include README.md
 include requirements.txt
 include npm_mjs/package.json5
 include npm_mjs/templates/npm_mjs/static_urls_js.html
-include npm_mjs/management/commands/webpack.config.template.js
+include npm_mjs/management/commands/rspack.config.template.js

npm_mjs/management/commands/npm_install.py

@@ -22,8 +22,8 @@ def install_npm(force, stdout, post_npm_signal=True):
         change_times.append(os.path.getmtime(path))
     settings_change = max(change_times)
     package_path = os.path.join(TRANSPILE_CACHE_PATH, "package.json")
-    webpack_bin_path = os.path.join(TRANSPILE_CACHE_PATH, "node_modules/.bin/webpack")
-    if os.path.exists(package_path) and os.path.exists(webpack_bin_path):
+    rspack_bin_path = os.path.join(TRANSPILE_CACHE_PATH, "node_modules/.bin/rspack")
+    if os.path.exists(package_path) and os.path.exists(rspack_bin_path):
         package_change = os.path.getmtime(package_path)
     else:
         package_change = -1
@@ -36,6 +36,13 @@ def install_npm(force, stdout, post_npm_signal=True):
                 os.path.getmtime(app_package_path),
                 app_package_change,
             )
+        else:
+            app_package_path = os.path.join(config.path, "package.json5")
+            if os.path.exists(app_package_path):
+                app_package_change = max(
+                    os.path.getmtime(app_package_path),
+                    app_package_change,
+                )
     npm_install = False
     if (
         settings_change > get_last_run("npm_install")

npm_mjs/management/commands/webpack.config.template.js renamed to npm_mjs/management/commands/rspack.config.template.js

@@ -1,25 +1,15 @@
-const webpack = require("webpack") // eslint-disable-line no-undef
+const rspack = require('@rspack/core') // eslint-disable-line no-undef
 
 const settings = window.settings // Replaced by django-npm-mjs
 const transpile = window.transpile // Replaced by django-npm-mjs
 
-const baseRule = {
-    test: /\.(js|mjs)$/,
-    use: {
-        loader: "babel-loader",
-        options: {
-            presets: ["@babel/preset-env"]
-        }
-    }
-}
-
 
 const predefinedVariables = {
     transpile_VERSION: transpile.VERSION
 }
 
 if (settings.DEBUG) {
-    baseRule.exclude = /node_modules/
+    //baseRule.exclude = /node_modules/
     predefinedVariables.staticUrl = `(url => ${JSON.stringify(
         settings.STATIC_URL
     )} + url)`
@@ -35,14 +25,14 @@ if (settings.DEBUG) {
 module.exports = {
     // eslint-disable-line no-undef
     mode: settings.DEBUG ? "development" : "production",
-    module: {
-        rules: [baseRule]
-    },
+    // module: {
+    //     rules: [] // [baseRule]
+    // },
     output: {
         path: transpile.OUT_DIR,
         chunkFilename: transpile.VERSION + "-[id].js",
         publicPath: transpile.BASE_URL
     },
-    plugins: [new webpack.DefinePlugin(predefinedVariables)],
+    plugins: [new rspack.DefinePlugin(predefinedVariables)],
     entry: transpile.ENTRIES
 }

npm_mjs/management/commands/transpile.py

@@ -23,13 +23,13 @@
 # Run this script every time you update an *.mjs file or any of the
 # modules it loads.
 
-OLD_WEBPACK_CONFIG_JS = ""
+OLD_RSPACK_CONFIG_JS = ""
 
-WEBPACK_CONFIG_JS_PATH = os.path.join(TRANSPILE_CACHE_PATH, "webpack.config.js")
+RSPACK_CONFIG_JS_PATH = os.path.join(TRANSPILE_CACHE_PATH, "rspack.config.js")
 
 try:
-    with open(WEBPACK_CONFIG_JS_PATH) as file:
-        OLD_WEBPACK_CONFIG_JS = file.read()
+    with open(RSPACK_CONFIG_JS_PATH) as file:
+        OLD_RSPACK_CONFIG_JS = file.read()
 except OSError:
     pass
 
@@ -199,14 +199,14 @@ def handle(self, *args, **options):
             static_base_url = PrefixNode.handle_simple("STATIC_URL")
         transpile_base_url = urljoin(static_base_url, "js/")
         if (
-            hasattr(settings, "WEBPACK_CONFIG_TEMPLATE")
-            and settings.WEBPACK_CONFIG_TEMPLATE
+            hasattr(settings, "RSPACK_CONFIG_TEMPLATE")
+            and settings.RSPACK_CONFIG_TEMPLATE
         ):
-            webpack_config_template_path = settings.WEBPACK_CONFIG_TEMPLATE
+            rspack_config_template_path = settings.RSPACK_CONFIG_TEMPLATE
         else:
-            webpack_config_template_path = os.path.join(
+            rspack_config_template_path = os.path.join(
                 os.path.dirname(os.path.realpath(__file__)),
-                "webpack.config.template.js",
+                "rspack.config.template.js",
             )
         entries = {}
         for mainfile in mainfiles:
@@ -242,8 +242,8 @@ def handle(self, *args, **options):
                 urljoin(static_base_url, x) for x in static_frontend_files
             ],
         }
-        with open(webpack_config_template_path) as f:
-            webpack_config_template = f.read()
+        with open(rspack_config_template_path) as f:
+            rspack_config_template = f.read()
         settings_dict = {}
         for var in dir(settings):
             if var in ["DATABASES", "SECRET_KEY"]:
@@ -253,15 +253,15 @@ def handle(self, *args, **options):
                 settings_dict[var] = getattr(settings, var)
             except AttributeError:
                 pass
-        webpack_config_js = webpack_config_template.replace(
+        rspack_config_js = rspack_config_template.replace(
             "window.transpile",
             json.dumps(transpile),
         ).replace("window.settings", json.dumps(settings_dict, default=lambda x: False))
 
-        if webpack_config_js is not OLD_WEBPACK_CONFIG_JS:
-            with open(WEBPACK_CONFIG_JS_PATH, "w") as f:
-                f.write(webpack_config_js)
-        call(["./node_modules/.bin/webpack"], cwd=TRANSPILE_CACHE_PATH)
+        if rspack_config_js is not OLD_RSPACK_CONFIG_JS:
+            with open(RSPACK_CONFIG_JS_PATH, "w") as f:
+                f.write(rspack_config_js)
+        call(["./node_modules/.bin/rspack"], cwd=TRANSPILE_CACHE_PATH)
         end = int(round(time.time()))
         self.stdout.write("Time spent transpiling: " + str(end - start) + " seconds")
         signals.post_transpile.send(sender=None)

npm_mjs/package.json5

@@ -5,11 +5,7 @@
   description: "Install dependencies for ES6 transpilation",
   private: true,
   dependencies: {
-    "@babel/preset-env": "^7.24.6",
-    "@babel/core": "^7.24.6",
-    "@babel/cli": "^7.24.6",
-    "babel-loader": "9.1.3",
-    webpack: "5.91.0",
-    "webpack-cli": "5.1.4",
+    "@rspack/core": "1.0.5",
+    "@rspack/cli": "1.0.5"
   },
 }