@modern-js/plugin-ssg 1.2.15 → 1.16.0

package/CHANGELOG.md

@@ -1,5 +1,44 @@
 # @modern-js/plugin-ssg
 
+## 1.16.0
+
+### Minor Changes
+
+- 1100dd58c: chore: support react 18
+
+  chore: 支持 React 18
+
+### Patch Changes
+
+- Updated dependencies [641592f52]
+- Updated dependencies [3904b30a5]
+- Updated dependencies [1100dd58c]
+- Updated dependencies [e04e6e76a]
+- Updated dependencies [81c66e4a4]
+- Updated dependencies [2c305b6f5]
+  - @modern-js/utils@1.16.0
+
+## 1.15.0
+
+### Patch Changes
+
+- Updated dependencies [8658a78]
+- Updated dependencies [05d4a4f]
+- Updated dependencies [ad05af9]
+- Updated dependencies [5d53d1c]
+- Updated dependencies [37cd159]
+  - @modern-js/utils@1.15.0
+
+## 1.2.16
+
+### Patch Changes
+
+- 5876e63: fix: the SSG callback is called once for each baseUrl, when a user configures multiple baseUrl.
+  fix: 当用户配置了多个 baseUrl 时，将会为每个 baseUrl 调用一次 SSG 回调函数。
+- Updated dependencies [4fc801f]
+- Updated dependencies [c8614b8]
+  - @modern-js/utils@1.8.0
+
 ## 1.2.15
 
 ### Patch Changes

package/dist/js/modern/index.js

@@ -43,7 +43,8 @@ export default (() => ({
           entrypoints
         } = appContext;
         const {
-          output
+          output,
+          server
         } = resolvedConfig;
         const {
           ssg,
@@ -65,7 +66,7 @@ export default (() => ({
           return;
         }
 
-        const intermediateOptions = standardOptions(ssgOptions, entrypoints);
+        const intermediateOptions = standardOptions(ssgOptions, entrypoints, pageRoutes, server);
 
         if (!intermediateOptions) {
           return;
@@ -79,7 +80,7 @@ export default (() => ({
             entryPath
           } = pageRoute;
           const agreedRoutes = agreedRouteMap[entryName];
-          let entryOptions = intermediateOptions[entryName];
+          let entryOptions = intermediateOptions[entryName] || intermediateOptions[pageRoute.urlPath];
 
           if (!agreedRoutes) {
             // default behavior for non-agreed route

package/dist/js/modern/libs/util.js

@@ -95,7 +95,7 @@ export const writeJSONSpec = (dir, routes) => {
   });
 };
 export const replaceWithAlias = (base, filePath, alias) => path.posix.join(alias, path.posix.relative(base, filePath));
-export const standardOptions = (ssgOptions, entrypoints) => {
+export const standardOptions = (ssgOptions, entrypoints, routes, server) => {
   if (ssgOptions === false) {
     return false;
   }
@@ -121,9 +121,21 @@ export const standardOptions = (ssgOptions, entrypoints) => {
     for (const entrypoint of entrypoints) {
       const {
         entryName
-      } = entrypoint; // Todo may be async function
-
-      intermediateOptions[entryName] = ssgOptions(entryName);
+      } = entrypoint; // TODO: may be async function
+
+      if (Array.isArray(server === null || server === void 0 ? void 0 : server.baseUrl)) {
+        for (const url of server.baseUrl) {
+          const matchUrl = entryName === 'main' ? url : `${url}/${entryName}`;
+          const route = routes.find(route => route.urlPath === matchUrl);
+          intermediateOptions[route === null || route === void 0 ? void 0 : route.urlPath] = ssgOptions(entryName, {
+            baseUrl: url
+          });
+        }
+      } else {
+        intermediateOptions[entryName] = ssgOptions(entryName, {
+          baseUrl: server === null || server === void 0 ? void 0 : server.baseUrl
+        });
+      }
     }
 
     return intermediateOptions;

package/dist/js/node/index.js

@@ -60,7 +60,8 @@ var _default = () => ({
           entrypoints
         } = appContext;
         const {
-          output
+          output,
+          server
         } = resolvedConfig;
         const {
           ssg,
@@ -83,7 +84,7 @@ var _default = () => ({
           return;
         }
 
-        const intermediateOptions = (0, _util.standardOptions)(ssgOptions, entrypoints);
+        const intermediateOptions = (0, _util.standardOptions)(ssgOptions, entrypoints, pageRoutes, server);
 
         if (!intermediateOptions) {
           return;
@@ -97,7 +98,7 @@ var _default = () => ({
             entryPath
           } = pageRoute;
           const agreedRoutes = agreedRouteMap[entryName];
-          let entryOptions = intermediateOptions[entryName];
+          let entryOptions = intermediateOptions[entryName] || intermediateOptions[pageRoute.urlPath];
 
           if (!agreedRoutes) {
             // default behavior for non-agreed route

package/dist/js/node/libs/util.js

@@ -126,7 +126,7 @@ const replaceWithAlias = (base, filePath, alias) => _path.default.posix.join(ali
 
 exports.replaceWithAlias = replaceWithAlias;
 
-const standardOptions = (ssgOptions, entrypoints) => {
+const standardOptions = (ssgOptions, entrypoints, routes, server) => {
   if (ssgOptions === false) {
     return false;
   }
@@ -152,9 +152,21 @@ const standardOptions = (ssgOptions, entrypoints) => {
     for (const entrypoint of entrypoints) {
       const {
         entryName
-      } = entrypoint; // Todo may be async function
-
-      intermediateOptions[entryName] = ssgOptions(entryName);
+      } = entrypoint; // TODO: may be async function
+
+      if (Array.isArray(server === null || server === void 0 ? void 0 : server.baseUrl)) {
+        for (const url of server.baseUrl) {
+          const matchUrl = entryName === 'main' ? url : `${url}/${entryName}`;
+          const route = routes.find(route => route.urlPath === matchUrl);
+          intermediateOptions[route === null || route === void 0 ? void 0 : route.urlPath] = ssgOptions(entryName, {
+            baseUrl: url
+          });
+        }
+      } else {
+        intermediateOptions[entryName] = ssgOptions(entryName, {
+          baseUrl: server === null || server === void 0 ? void 0 : server.baseUrl
+        });
+      }
     }
 
     return intermediateOptions;

package/dist/types/libs/util.d.ts

@@ -1,4 +1,5 @@
 import { ServerRoute as ModernRoute } from '@modern-js/types';
+import { ServerConfig } from '@modern-js/core';
 import { SsgRoute, SSGConfig, EntryPoint, SSGMultiEntryOptions } from '../types';
 export declare function formatOutput(filename: string): string;
 export declare function formatPath(str: string): string;
@@ -8,7 +9,7 @@ export declare function getOutput(route: SsgRoute, base: string, agreed?: boolea
 export declare const readJSONSpec: (dir: string) => ModernRoute[];
 export declare const writeJSONSpec: (dir: string, routes: ModernRoute[]) => void;
 export declare const replaceWithAlias: (base: string, filePath: string, alias: string) => string;
-export declare const standardOptions: (ssgOptions: SSGConfig, entrypoints: EntryPoint[]) => false | SSGMultiEntryOptions;
+export declare const standardOptions: (ssgOptions: SSGConfig, entrypoints: EntryPoint[], routes: ModernRoute[], server: ServerConfig) => false | SSGMultiEntryOptions;
 export declare const openRouteSSR: (routes: ModernRoute[], entries?: string[]) => {
   isSSR: boolean;
   bundle: string;
@@ -18,4 +19,5 @@ export declare const openRouteSSR: (routes: ModernRoute[], entries?: string[]) =
   isSPA?: boolean | undefined;
   isApi?: boolean | undefined;
   enableModernMode?: boolean | undefined;
+  responseHeaders?: Record<string, unknown> | undefined;
 }[];

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.15",
+  "version": "1.16.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -55,24 +55,22 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/utils": "^1.7.12",
+    "@modern-js/utils": "1.16.0",
     "node-mocks-http": "^1.10.1",
     "normalize-path": "^3.0.0",
     "portfinder": "^1.0.28",
     "react-router-dom": "^5.2.1"
   },
   "devDependencies": {
-    "@modern-js/types": "1.5.6",
-    "@modern-js/prod-server": "1.1.9",
+    "@modern-js/types": "1.16.0",
+    "@modern-js/prod-server": "1.16.0",
     "@types/jest": "^27",
     "@types/node": "^14",
-    "@types/react": "^17",
-    "@types/react-dom": "^17",
     "@types/react-router": "^5.1.16",
     "@types/react-router-dom": "^5.1.8",
-    "@modern-js/core": "1.12.4",
-    "@scripts/build": "0.0.0",
-    "@scripts/jest-config": "0.0.0",
+    "@modern-js/core": "1.16.0",
+    "@scripts/build": "1.15.0",
+    "@scripts/jest-config": "1.15.0",
     "react": "^17",
     "typescript": "^4",
     "jest": "^27"