@modern-js/app-tools 2.48.2 → 2.48.4

package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js

@@ -42,14 +42,16 @@ const builderPluginAdapterSSR = (options) => ({
   setup(api) {
     const { normalizedConfig } = options;
     api.modifyRsbuildConfig((config) => {
-      if (isStreamingSSR(normalizedConfig)) {
-        return (0, import_core.mergeRsbuildConfig)(config, {
-          html: {
-            inject: "body"
-          }
-        });
-      }
-      return config;
+      return (0, import_core.mergeRsbuildConfig)(config, {
+        html: {
+          inject: isStreamingSSR(normalizedConfig) ? "body" : void 0
+        },
+        server: {
+          // the http-compression can't handler stream http.
+          // so we disable compress when user use stream ssr temporarily.
+          compress: isStreamingSSR(normalizedConfig) || isSSRPreload(normalizedConfig) ? false : void 0
+        }
+      });
     });
     api.modifyBundlerChain(async (chain, { target, isProd, HtmlPlugin: HtmlBundlerPlugin, isServer }) => {
       const builderConfig = api.getNormalizedConfig();
@@ -79,6 +81,11 @@ const builderPluginAdapterSSR = (options) => ({
     });
   }
 });
+const isSSRPreload = (userConfig) => {
+  const { server: { ssr, ssrByEntries } } = userConfig;
+  const checkUsePreload = (ssr2) => typeof ssr2 === "object" && Boolean(ssr2.preload);
+  return checkUsePreload(ssr) || Object.values(ssrByEntries || {}).some((ssr2) => checkUsePreload(ssr2));
+};
 const isStreamingSSR = (userConfig) => {
   const isStreaming = (ssr) => ssr && typeof ssr === "object" && ssr.mode === "stream";
   const { server } = userConfig;

package/dist/esm/builder/shared/builderPlugins/adapterSSR.js

@@ -12,14 +12,16 @@ var builderPluginAdapterSSR = function(options) {
     setup: function setup(api) {
       var normalizedConfig = options.normalizedConfig;
       api.modifyRsbuildConfig(function(config) {
-        if (isStreamingSSR(normalizedConfig)) {
-          return mergeRsbuildConfig(config, {
-            html: {
-              inject: "body"
-            }
-          });
-        }
-        return config;
+        return mergeRsbuildConfig(config, {
+          html: {
+            inject: isStreamingSSR(normalizedConfig) ? "body" : void 0
+          },
+          server: {
+            // the http-compression can't handler stream http.
+            // so we disable compress when user use stream ssr temporarily.
+            compress: isStreamingSSR(normalizedConfig) || isSSRPreload(normalizedConfig) ? false : void 0
+          }
+        });
       });
       api.modifyBundlerChain(function() {
         var _ref = _async_to_generator(function(chain, param) {
@@ -75,6 +77,15 @@ var builderPluginAdapterSSR = function(options) {
     }
   };
 };
+var isSSRPreload = function(userConfig) {
+  var _userConfig_server = userConfig.server, ssr = _userConfig_server.ssr, ssrByEntries = _userConfig_server.ssrByEntries;
+  var checkUsePreload = function(ssr2) {
+    return typeof ssr2 === "object" && Boolean(ssr2.preload);
+  };
+  return checkUsePreload(ssr) || Object.values(ssrByEntries || {}).some(function(ssr2) {
+    return checkUsePreload(ssr2);
+  });
+};
 var isStreamingSSR = function(userConfig) {
   var isStreaming = function(ssr) {
     return ssr && typeof ssr === "object" && ssr.mode === "stream";

package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.js

@@ -9,14 +9,16 @@ const builderPluginAdapterSSR = (options) => ({
   setup(api) {
     const { normalizedConfig } = options;
     api.modifyRsbuildConfig((config) => {
-      if (isStreamingSSR(normalizedConfig)) {
-        return mergeRsbuildConfig(config, {
-          html: {
-            inject: "body"
-          }
-        });
-      }
-      return config;
+      return mergeRsbuildConfig(config, {
+        html: {
+          inject: isStreamingSSR(normalizedConfig) ? "body" : void 0
+        },
+        server: {
+          // the http-compression can't handler stream http.
+          // so we disable compress when user use stream ssr temporarily.
+          compress: isStreamingSSR(normalizedConfig) || isSSRPreload(normalizedConfig) ? false : void 0
+        }
+      });
     });
     api.modifyBundlerChain(async (chain, { target, isProd, HtmlPlugin: HtmlBundlerPlugin, isServer }) => {
       const builderConfig = api.getNormalizedConfig();
@@ -46,6 +48,11 @@ const builderPluginAdapterSSR = (options) => ({
     });
   }
 });
+const isSSRPreload = (userConfig) => {
+  const { server: { ssr, ssrByEntries } } = userConfig;
+  const checkUsePreload = (ssr2) => typeof ssr2 === "object" && Boolean(ssr2.preload);
+  return checkUsePreload(ssr) || Object.values(ssrByEntries || {}).some((ssr2) => checkUsePreload(ssr2));
+};
 const isStreamingSSR = (userConfig) => {
   const isStreaming = (ssr) => ssr && typeof ssr === "object" && ssr.mode === "stream";
   const { server } = userConfig;

package/lib/types.d.ts

@@ -61,6 +61,11 @@ declare module '*.svg' {
   export default content;
 }
 
+declare module '*.svg?react' {
+  const ReactComponent: React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
+  export default ReactComponent;
+}
+
 declare module '*.bmp?inline' {
   const src: string;
   export default src;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.48.2",
+  "version": "2.48.4",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -69,37 +69,37 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.23.0",
-    "@rsbuild/plugin-esbuild": "0.4.15",
-    "@rsbuild/plugin-node-polyfill": "0.4.15",
-    "@rsbuild/shared": "0.4.15",
-    "@rsbuild/core": "0.4.15",
+    "@rsbuild/plugin-esbuild": "0.5.4",
+    "@rsbuild/plugin-node-polyfill": "0.5.4",
+    "@rsbuild/shared": "0.5.4",
+    "@rsbuild/core": "0.5.4",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.17.19",
     "@swc/helpers": "0.5.3",
-    "@modern-js/uni-builder": "2.48.2",
-    "@modern-js/node-bundle-require": "2.48.2",
-    "@modern-js/plugin-data-loader": "2.48.2",
-    "@modern-js/plugin-i18n": "2.48.2",
-    "@modern-js/plugin": "2.48.2",
-    "@modern-js/plugin-lint": "2.48.2",
-    "@modern-js/prod-server": "2.48.2",
-    "@modern-js/server": "2.48.2",
-    "@modern-js/server-utils": "2.48.2",
-    "@modern-js/types": "2.48.2",
-    "@modern-js/utils": "2.48.2",
-    "@modern-js/server-core": "2.48.2",
-    "@modern-js/core": "2.48.2"
+    "@modern-js/uni-builder": "2.48.4",
+    "@modern-js/core": "2.48.4",
+    "@modern-js/node-bundle-require": "2.48.4",
+    "@modern-js/plugin": "2.48.4",
+    "@modern-js/plugin-data-loader": "2.48.4",
+    "@modern-js/plugin-i18n": "2.48.4",
+    "@modern-js/plugin-lint": "2.48.4",
+    "@modern-js/server": "2.48.4",
+    "@modern-js/types": "2.48.4",
+    "@modern-js/server-utils": "2.48.4",
+    "@modern-js/prod-server": "2.48.4",
+    "@modern-js/utils": "2.48.4",
+    "@modern-js/server-core": "2.48.4"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.4.15",
+    "@rsbuild/plugin-swc": "0.5.4",
     "@types/babel__traverse": "7.18.5",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "webpack": "^5.89.0",
-    "@scripts/build": "2.48.2",
-    "@scripts/jest-config": "2.48.2"
+    "webpack": "^5.91.0",
+    "@scripts/build": "2.48.4",
+    "@scripts/jest-config": "2.48.4"
   },
   "sideEffects": false,
   "publishConfig": {