@modern-js/runtime 2.17.0 → 2.18.0

package/dist/esm/ssr/utils.js

@@ -12,7 +12,7 @@ function _array_with_holes(arr) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -91,10 +91,10 @@ export var isReact18 = function() {
 export var formatServer = function(request) {
   var _ref = request.headers || {}, _ref_cookie = _ref.cookie, cookie = _ref_cookie === void 0 ? "" : _ref_cookie, tmp = _ref["user-agent"], userAgent = tmp === void 0 ? "" : tmp, referer = _ref.referer;
   return _object_spread({
-    cookie,
+    cookie: cookie,
     cookieMap: cookieTool.parse(cookie || "") || {},
-    userAgent,
-    referer
+    userAgent: userAgent,
+    referer: referer
   }, request);
 };
 var getQuery = function() {

package/dist/esm/state/cli/index.js

@@ -40,8 +40,8 @@ export default function() {
             });
           }
           return {
-            entrypoint,
-            imports
+            entrypoint: entrypoint,
+            imports: imports
           };
         },
         modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(param) {
@@ -54,8 +54,8 @@ export default function() {
             });
           }
           return {
-            entrypoint,
-            plugins
+            entrypoint: entrypoint,
+            plugins: plugins
           };
         },
         validateSchema: function validateSchema() {

package/dist/esm/state/runtime/plugin.js

@@ -12,7 +12,7 @@ function _array_with_holes(arr) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -117,10 +117,10 @@ import { immer, effects, autoActions, devtools } from "../plugins";
 import { RuntimeReactContext } from "../../core";
 import { isBrowser } from "../../common";
 var StatePluginHandleMap = {
-  immer,
-  effects,
-  autoActions,
-  devtools
+  immer: immer,
+  effects: effects,
+  autoActions: autoActions,
+  devtools: devtools
 };
 var getStoreConfig = function(config) {
   var internalPlugins = [
@@ -189,13 +189,13 @@ var state = function(config) {
           }
           context.store = createStore(storeConfig);
           return next({
-            context
+            context: context
           });
         },
         pickContext: function pickContext(param, next) {
           var context = param.context, pickedContext = param.pickedContext;
           return next({
-            context,
+            context: context,
             pickedContext: _object_spread_props(_object_spread({}, pickedContext), {
               store: context.store
             })

package/dist/esm-node/ssr/cli/index.js

@@ -29,16 +29,31 @@ export default () => {
         config() {
           const appContext = api.useAppContext();
           pluginsExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "plugins");
+          const userConfig = api.useResolvedConfigContext();
           const { bundlerType = "webpack" } = api.useAppContext();
-          const babelConfig = bundlerType === "webpack" ? (config) => {
-            var _config_plugins;
-            (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
-            const userConfig = api.useResolvedConfigContext();
-            if (isUseSSRBundle(userConfig) && hasStringSSREntry(userConfig)) {
-              var _config_plugins1;
-              (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
+          const babelConfig = (() => {
+            if (bundlerType === "webpack") {
+              return (config) => {
+                var _config_plugins;
+                (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
+                if (isUseSSRBundle(userConfig) && hasStringSSREntry(userConfig)) {
+                  var _config_plugins1;
+                  (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
+                }
+              };
+            } else if (bundlerType === "rspack") {
+              if (isUseSSRBundle(userConfig)) {
+                return (config) => {
+                  var _config_plugins;
+                  (_config_plugins = config.plugins) === null || _config_plugins === void 0 ? void 0 : _config_plugins.push(path.join(__dirname, "./babel-plugin-ssr-loader-id"));
+                  if (hasStringSSREntry(userConfig)) {
+                    var _config_plugins1;
+                    (_config_plugins1 = config.plugins) === null || _config_plugins1 === void 0 ? void 0 : _config_plugins1.push(require.resolve("@loadable/babel-plugin"));
+                  }
+                };
+              }
             }
-          } : void 0;
+          })();
           return {
             source: {
               alias: {
@@ -51,11 +66,11 @@ export default () => {
               }
             },
             tools: {
-              webpackChain: (chain, { isServer, isServiceWorker, CHAIN_ID }) => {
-                const userConfig = api.useResolvedConfigContext();
-                if (isUseSSRBundle(userConfig) && !isServer && !isServiceWorker && hasStringSSREntry(userConfig)) {
-                  const LoadableWebpackPlugin = require("@loadable/webpack-plugin");
-                  chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableWebpackPlugin, [
+              bundlerChain(chain, { isServer, isServiceWorker, CHAIN_ID }) {
+                const userConfig2 = api.useResolvedConfigContext();
+                if (isUseSSRBundle(userConfig2) && !isServer && !isServiceWorker && hasStringSSREntry(userConfig2)) {
+                  const LoadableBundlerPlugin = require("./loadable-bundler-plugin.js");
+                  chain.plugin(CHAIN_ID.PLUGIN.LOADABLE).use(LoadableBundlerPlugin, [
                     {
                       filename: LOADABLE_STATS_FILE
                     }

package/dist/esm-node/ssr/cli/loadable-bundler-plugin.js

@@ -0,0 +1,103 @@
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+import path from "path";
+import { fs } from "@modern-js/utils";
+class LoadablePlugin {
+  apply(compiler) {
+    this.compiler = compiler;
+    compiler.options.output.chunkLoadingGlobal = this.opts.chunkLoadingGlobal;
+    if (this.opts.outputAsset || this.opts.writeToDisk) {
+      compiler.hooks.make.tap(LoadablePlugin.name, (compilation) => {
+        compilation.hooks.processAssets.tap({
+          name: LoadablePlugin.name,
+          stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_REPORT
+        }, () => {
+          const asset = this.handleEmit(compilation);
+          if (asset) {
+            compilation.emitAsset(this.opts.filename, asset);
+          }
+        });
+      });
+    }
+  }
+  handleEmit(compilation) {
+    const stats = compilation.getStats().toJson({
+      all: false,
+      assets: true,
+      // rspack not support cachedAssets,
+      cachedAssets: true,
+      chunks: true,
+      chunkGroups: true,
+      entrypoints: true,
+      // rspack not support chunkGroupChildren.
+      chunkGroupChildren: true,
+      hash: true,
+      ids: true,
+      outputPath: true,
+      publicPath: true
+    });
+    const output = {
+      ...stats,
+      generator: "loadable-components",
+      chunks: [
+        ...stats.chunks || []
+      ].map((chunk) => {
+        return {
+          id: chunk.id,
+          files: [
+            ...chunk.files || []
+          ]
+        };
+      })
+    };
+    const result = JSON.stringify(output, null, 2);
+    if (this.opts.writeToDisk) {
+      this.writeAssetsFile(result);
+    }
+    if (this.opts.outputAsset) {
+      return {
+        source() {
+          return result;
+        },
+        size() {
+          return result.length;
+        }
+      };
+    }
+    return null;
+  }
+  writeAssetsFile(manifest) {
+    var _this_compiler;
+    const outputFolder = (_this_compiler = this.compiler) === null || _this_compiler === void 0 ? void 0 : _this_compiler.options.output.path;
+    const outputFile = path.resolve(outputFolder || "", this.opts.filename);
+    fs.outputFileSync(outputFile, manifest);
+  }
+  constructor({ filename = "loadable-stats.json", path: path2, writeToDisk, outputAsset = true, chunkLoadingGlobal = "__LOADABLE_LOADED_CHUNKS__" } = {
+    filename: "loadable-stats.json",
+    outputAsset: true,
+    chunkLoadingGlobal: "__LOADABLE_LOADED_CHUNKS__"
+  }) {
+    _define_property(this, "opts", void 0);
+    _define_property(this, "compiler", void 0);
+    this.opts = {
+      filename,
+      path: path2,
+      writeToDisk,
+      outputAsset,
+      chunkLoadingGlobal
+    };
+    this.compiler = null;
+  }
+}
+module.exports = LoadablePlugin;

package/dist/types/ssr/cli/loadable-bundler-plugin.d.ts

@@ -0,0 +1,10 @@
+/**
+ * The following code is modified based on
+ * https://github.com/gregberge/loadable-components
+ *
+ * MIT Licensed
+ * Author Greg Bergé
+ * Copyright 2019 Greg Bergé
+ * https://github.com/gregberge/loadable-components/blob/main/LICENSE
+ */
+export {};

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.17.0",
+  "version": "2.18.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -162,9 +162,9 @@
     "react-side-effect": "^2.1.1",
     "redux-logger": "^3.0.6",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.17.0",
-    "@modern-js/types": "2.17.0",
-    "@modern-js/utils": "2.17.0"
+    "@modern-js/plugin": "2.18.0",
+    "@modern-js/types": "2.18.0",
+    "@modern-js/utils": "2.18.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -184,11 +184,11 @@
     "react-dom": "^18",
     "ts-jest": "^29.0.5",
     "typescript": "^4",
-    "@modern-js/app-tools": "2.17.0",
-    "@modern-js/core": "2.17.0",
-    "@modern-js/server-core": "2.17.0",
-    "@scripts/build": "2.17.0",
-    "@scripts/jest-config": "2.17.0"
+    "@modern-js/app-tools": "2.18.0",
+    "@modern-js/core": "2.18.0",
+    "@modern-js/server-core": "2.18.0",
+    "@scripts/build": "2.18.0",
+    "@scripts/jest-config": "2.18.0"
   },
   "sideEffects": false,
   "modernConfig": {},