@modern-js/plugin-ssg 1.21.3 → 2.0.0-beta.0

package/CHANGELOG.md

@@ -1,10 +1,28 @@
 # @modern-js/plugin-ssg
 
-## 1.21.3
+## 2.0.0-beta.0
+
+### Major Changes
+
+- dda38c9: chore: v2
 
 ### Patch Changes
 
-- @modern-js/utils@1.21.3
+- cc971eabf: refactor: move server plugin load logic in `@modern-js/core`
+  refactor：移除在 `@modern-js/core` 中的 server 插件加载逻辑
+- 8b8e1bb57: feat: support nested routes
+  feat: 支持嵌套路由
+- Updated dependencies [edd1cfb1a]
+- Updated dependencies [cc971eabf]
+- Updated dependencies [5b9049f]
+- Updated dependencies [b8bbe036c]
+- Updated dependencies [d5a31df78]
+- Updated dependencies [dda38c9]
+- Updated dependencies [3bbea92b2]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be95]
+- Updated dependencies [14b712d]
+  - @modern-js/utils@2.0.0-beta.0
 
 ## 1.21.2
 

package/dist/js/modern/index.js

@@ -7,13 +7,14 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import path from 'path';
 import { logger, PLUGIN_SCHEMAS } from '@modern-js/utils';
 import { generatePath } from 'react-router-dom';
-import { formatOutput, isDynamicUrl, readJSONSpec, standardOptions, writeJSONSpec } from "./libs/util";
+import { flattenRoutes, formatOutput, isDynamicUrl, readJSONSpec, standardOptions, writeJSONSpec } from "./libs/util";
 import { createServer } from "./server";
 import { writeHtmlFile } from "./libs/output";
 import { replaceRoute } from "./libs/replace";
 import { makeRoute } from "./libs/make";
 export default (() => ({
   name: '@modern-js/plugin-ssg',
+  pre: ['@modern-js/plugin-server', '@modern-js/plugin-bff'],
   setup: api => {
     const agreedRouteMap = {};
     return {
@@ -28,7 +29,8 @@ export default (() => ({
         const {
           entryName
         } = entrypoint;
-        agreedRouteMap[entryName] = routes;
+        const flattedRoutes = flattenRoutes(routes);
+        agreedRouteMap[entryName] = flattedRoutes;
         return {
           entrypoint,
           routes

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

@@ -146,4 +146,33 @@ export const standardOptions = (ssgOptions, entrypoints, routes, server) => {
 export const openRouteSSR = (routes, entries = []) => routes.map(ssgRoute => _objectSpread(_objectSpread({}, ssgRoute), {}, {
   isSSR: entries.includes(ssgRoute.entryName),
   bundle: `${SERVER_BUNDLE_DIRECTORY}/${ssgRoute.entryName}.js`
-}));
+})); // TODO: 过滤带有 server loader 的路由
+
+export const flattenRoutes = routes => {
+  const parents = [];
+  const newRoutes = [];
+
+  const traverseRoute = route => {
+    const parent = parents[parents.length - 1];
+    let path = parent ? `${parent.path}/${route.path || ''}`.replace(/\/+/g, '/') : route.path || ''; // If the route is an index route, the route has no path property
+
+    path = path.replace(/\/$/, ''); // If the route path is / and is not the root route, it should not be used as an ssg route
+
+    if (route._component && (path !== '/' || path === '/' && !parent)) {
+      newRoutes.push(_objectSpread(_objectSpread({}, route), {}, {
+        path
+      }));
+    }
+
+    if (route.children) {
+      parents.push(_objectSpread(_objectSpread({}, route), {}, {
+        path
+      }));
+      route.children.forEach(traverseRoute);
+      parents.pop();
+    }
+  };
+
+  routes.forEach(traverseRoute);
+  return newRoutes;
+};

package/dist/js/modern/server/index.js

@@ -14,7 +14,7 @@ export const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, app
     silent: true
   });
   const appContext = api.useAppContext();
-  const plugins = appContext.plugins.filter(p => p.server).map(p => p.server);
+  const plugins = appContext.serverInternalPlugins;
   cp.send(JSON.stringify({
     options,
     renderRoutes: ssgRoutes,

package/dist/js/modern/server/process.js

@@ -1,22 +1,8 @@
 import server from '@modern-js/prod-server';
 import portfinder from 'portfinder';
-import { compatRequire } from '@modern-js/utils';
 import { makeRender } from "../libs/make";
 import { compile as createRender } from "./prerender";
 import { CLOSE_SIGN } from "./consts";
-
-const safetyRequire = (filename, base) => {
-  try {
-    return compatRequire(require.resolve(`${filename}/server`, {
-      paths: [base]
-    }));
-  } catch (e) {
-    return compatRequire(require.resolve(filename, {
-      paths: [base]
-    }));
-  }
-};
-
 process.on('message', async chunk => {
   if (chunk === CLOSE_SIGN) {
     // eslint-disable-next-line no-process-exit
@@ -31,10 +17,6 @@ process.on('message', async chunk => {
     appDirectory,
     plugins
   } = context;
-  const instances = plugins.map(plugin => {
-    const mod = safetyRequire(plugin, appDirectory);
-    return mod();
-  });
   let modernServer = null;
 
   try {
@@ -50,7 +32,7 @@ process.on('message', async chunk => {
       config: options,
       routes,
       staticGenerate: true,
-      plugins: instances
+      internalPlugins: plugins
     }); // listen just for bff request in ssr page
 
     modernServer.listen(port, async err => {

package/dist/js/node/index.js

@@ -31,6 +31,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 var _default = () => ({
   name: '@modern-js/plugin-ssg',
+  pre: ['@modern-js/plugin-server', '@modern-js/plugin-bff'],
   setup: api => {
     const agreedRouteMap = {};
     return {
@@ -45,7 +46,8 @@ var _default = () => ({
         const {
           entryName
         } = entrypoint;
-        agreedRouteMap[entryName] = routes;
+        const flattedRoutes = (0, _util.flattenRoutes)(routes);
+        agreedRouteMap[entryName] = flattedRoutes;
         return {
           entrypoint,
           routes

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

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.flattenRoutes = void 0;
 exports.formatOutput = formatOutput;
 exports.formatPath = formatPath;
 exports.getOutput = getOutput;
@@ -180,6 +181,38 @@ exports.standardOptions = standardOptions;
 const openRouteSSR = (routes, entries = []) => routes.map(ssgRoute => _objectSpread(_objectSpread({}, ssgRoute), {}, {
   isSSR: entries.includes(ssgRoute.entryName),
   bundle: `${_utils.SERVER_BUNDLE_DIRECTORY}/${ssgRoute.entryName}.js`
-}));
+})); // TODO: 过滤带有 server loader 的路由
 
-exports.openRouteSSR = openRouteSSR;
+
+exports.openRouteSSR = openRouteSSR;
+
+const flattenRoutes = routes => {
+  const parents = [];
+  const newRoutes = [];
+
+  const traverseRoute = route => {
+    const parent = parents[parents.length - 1];
+    let path = parent ? `${parent.path}/${route.path || ''}`.replace(/\/+/g, '/') : route.path || ''; // If the route is an index route, the route has no path property
+
+    path = path.replace(/\/$/, ''); // If the route path is / and is not the root route, it should not be used as an ssg route
+
+    if (route._component && (path !== '/' || path === '/' && !parent)) {
+      newRoutes.push(_objectSpread(_objectSpread({}, route), {}, {
+        path
+      }));
+    }
+
+    if (route.children) {
+      parents.push(_objectSpread(_objectSpread({}, route), {}, {
+        path
+      }));
+      route.children.forEach(traverseRoute);
+      parents.pop();
+    }
+  };
+
+  routes.forEach(traverseRoute);
+  return newRoutes;
+};
+
+exports.flattenRoutes = flattenRoutes;

package/dist/js/node/server/index.js

@@ -30,7 +30,7 @@ const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirecto
   });
 
   const appContext = api.useAppContext();
-  const plugins = appContext.plugins.filter(p => p.server).map(p => p.server);
+  const plugins = appContext.serverInternalPlugins;
   cp.send(JSON.stringify({
     options,
     renderRoutes: ssgRoutes,

package/dist/js/node/server/process.js

@@ -4,8 +4,6 @@ var _prodServer = _interopRequireDefault(require("@modern-js/prod-server"));
 
 var _portfinder = _interopRequireDefault(require("portfinder"));
 
-var _utils = require("@modern-js/utils");
-
 var _make = require("../libs/make");
 
 var _prerender = require("./prerender");
@@ -14,18 +12,6 @@ var _consts = require("./consts");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const safetyRequire = (filename, base) => {
-  try {
-    return (0, _utils.compatRequire)(require.resolve(`${filename}/server`, {
-      paths: [base]
-    }));
-  } catch (e) {
-    return (0, _utils.compatRequire)(require.resolve(filename, {
-      paths: [base]
-    }));
-  }
-};
-
 process.on('message', async chunk => {
   if (chunk === _consts.CLOSE_SIGN) {
     // eslint-disable-next-line no-process-exit
@@ -40,10 +26,6 @@ process.on('message', async chunk => {
     appDirectory,
     plugins
   } = context;
-  const instances = plugins.map(plugin => {
-    const mod = safetyRequire(plugin, appDirectory);
-    return mod();
-  });
   let modernServer = null;
 
   try {
@@ -59,7 +41,7 @@ process.on('message', async chunk => {
       config: options,
       routes,
       staticGenerate: true,
-      plugins: instances
+      internalPlugins: plugins
     }); // listen just for bff request in ssr page
 
     modernServer.listen(port, async err => {

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

@@ -1,6 +1,6 @@
 import { ServerRoute as ModernRoute } from '@modern-js/types';
 import { ServerConfig } from '@modern-js/core';
-import { SsgRoute, SSGConfig, EntryPoint, SSGMultiEntryOptions } from '../types';
+import { SsgRoute, SSGConfig, EntryPoint, SSGMultiEntryOptions, AgreedRoute } from '../types';
 export declare function formatOutput(filename: string): string;
 export declare function formatPath(str: string): string;
 export declare function isDynamicUrl(url: string): boolean;
@@ -20,4 +20,5 @@ export declare const openRouteSSR: (routes: ModernRoute[], entries?: string[]) =
   isApi?: boolean | undefined;
   enableModernMode?: boolean | undefined;
   responseHeaders?: Record<string, unknown> | undefined;
-}[];
+}[];
+export declare const flattenRoutes: (routes: AgreedRoute[]) => AgreedRoute[];

package/dist/types/types.d.ts

@@ -2,10 +2,11 @@ import type { ServerRoute as ModernRoute } from '@modern-js/types';
 import type { SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions } from '@modern-js/core';
 export type { SSGConfig, SSGRouteOptions, SSGMultiEntryOptions, SSGSingleEntryOptions };
 export declare type AgreedRoute = {
-  path: string;
-  component: string;
-  _component: string;
-  exact: boolean;
+  path?: string;
+  component?: string;
+  _component?: string;
+  children?: AgreedRoute[];
+  exact?: boolean;
 };
 export declare type EntryPoint = {
   entryName: string;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.3",
+  "version": "2.0.0-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -55,23 +55,29 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/utils": "1.21.3",
+    "@modern-js/utils": "2.0.0-beta.0",
     "node-mocks-http": "^1.10.1",
     "normalize-path": "^3.0.0",
-    "portfinder": "^1.0.28",
-    "react-router-dom": "^5.2.1"
+    "portfinder": "^1.0.28"
+  },
+  "peerDependencies": {
+    "react-router-dom": ">=5.1.2"
+  },
+  "peerDependenciesMeta": {
+    "react-router-dom": {
+      "optional": true
+    }
   },
   "devDependencies": {
-    "@modern-js/types": "1.21.3",
-    "@modern-js/prod-server": "1.21.3",
+    "@modern-js/types": "2.0.0-beta.0",
+    "@modern-js/prod-server": "2.0.0-beta.0",
     "@types/jest": "^27",
     "@types/node": "^14",
-    "@types/react-router": "^5.1.16",
-    "@types/react-router-dom": "^5.1.8",
-    "@modern-js/core": "1.21.3",
-    "@scripts/build": "1.21.3",
-    "@scripts/jest-config": "1.21.3",
-    "react": "^17",
+    "@modern-js/core": "2.0.0-beta.0",
+    "@scripts/build": "2.0.0-beta.0",
+    "@scripts/jest-config": "2.0.0-beta.0",
+    "react-router-dom": "^6.4.2",
+    "react": "^18",
     "typescript": "^4",
     "jest": "^27"
   },
@@ -85,33 +91,10 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "wireit": {
-    "build": {
-      "command": "modern build",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json"
-      ],
-      "output": [
-        "dist/**/*"
-      ]
-    },
-    "test": {
-      "command": "jest --passWithNoTests",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "tests/**/*"
-      ],
-      "output": []
-    }
-  },
   "scripts": {
     "new": "modern new",
-    "build": "wireit",
+    "build": "modern build",
     "dev": "modern build --watch",
-    "test": "wireit"
+    "test": "jest --passWithNoTests"
   }
 }