@modern-js/app-tools 0.0.0-next-1104a9f18 → 0.0.0-next-c835d71

package/CHANGELOG.md

@@ -1,43 +1,46 @@
 # @modern-js/app-tools
 
-## 0.0.0-next-1104a9f18
+## 0.0.0-next-c835d71
 
 ### Minor Changes
 
-- ab1e8065c: feat: support router-plugin in rspack bundler.
+- ab1e8065cb: feat: support router-plugin in rspack bundler.
   feat: 在 rspack bundler 里支持 router-plugin
 
 ### Patch Changes
 
-- 1104a9f18: feat: support start web service only
+- 1104a9f18b: feat: support start web service only
   feat: 支持只启动 web 服务
-- 2b6b1a014: refactor: app-tools builder
+- c835d714bc: fix: nested routes in ssg
+  fix: 修复嵌套路由在 SSG 中的问题
+- 2b6b1a014c: refactor: app-tools builder
   refactor: 重构 app-tools builder
-- Updated dependencies [ea7bb41e3]
-- Updated dependencies [0cf8540ff]
-- Updated dependencies [bd369a89a]
-- Updated dependencies [bc943c9b0]
-- Updated dependencies [1104a9f18]
-- Updated dependencies [2c1151271]
-- Updated dependencies [457ee832b]
-  - @modern-js/server@0.0.0-next-1104a9f18
-  - @modern-js/plugin-data-loader@0.0.0-next-1104a9f18
-  - @modern-js/builder@0.0.0-next-1104a9f18
-  - @modern-js/builder-shared@0.0.0-next-1104a9f18
-  - @modern-js/builder-rspack-provider@0.0.0-next-1104a9f18
-  - @modern-js/prod-server@0.0.0-next-1104a9f18
-  - @modern-js/utils@0.0.0-next-1104a9f18
-  - @modern-js/builder-webpack-provider@0.0.0-next-1104a9f18
-  - @modern-js/builder-plugin-esbuild@0.0.0-next-1104a9f18
-  - @modern-js/builder-plugin-node-polyfill@0.0.0-next-1104a9f18
-  - @modern-js/core@0.0.0-next-1104a9f18
-  - @modern-js/plugin-i18n@0.0.0-next-1104a9f18
-  - @modern-js/plugin-lint@0.0.0-next-1104a9f18
-  - @modern-js/new-action@0.0.0-next-1104a9f18
-  - @modern-js/node-bundle-require@0.0.0-next-1104a9f18
-  - @modern-js/upgrade@0.0.0-next-1104a9f18
-  - @modern-js/plugin@0.0.0-next-1104a9f18
-  - @modern-js/types@0.0.0-next-1104a9f18
+- Updated dependencies [ea7bb41e30]
+- Updated dependencies [0cf8540ffe]
+- Updated dependencies [bd369a89a4]
+- Updated dependencies [bc943c9b04]
+- Updated dependencies [1104a9f18b]
+- Updated dependencies [2c1151271d]
+- Updated dependencies [c835d714bc]
+- Updated dependencies [457ee832b9]
+  - @modern-js/server@0.0.0-next-c835d71
+  - @modern-js/plugin-data-loader@0.0.0-next-c835d71
+  - @modern-js/builder@0.0.0-next-c835d71
+  - @modern-js/builder-shared@0.0.0-next-c835d71
+  - @modern-js/builder-rspack-provider@0.0.0-next-c835d71
+  - @modern-js/prod-server@0.0.0-next-c835d71
+  - @modern-js/utils@0.0.0-next-c835d71
+  - @modern-js/builder-webpack-provider@0.0.0-next-c835d71
+  - @modern-js/types@0.0.0-next-c835d71
+  - @modern-js/builder-plugin-esbuild@0.0.0-next-c835d71
+  - @modern-js/builder-plugin-node-polyfill@0.0.0-next-c835d71
+  - @modern-js/core@0.0.0-next-c835d71
+  - @modern-js/plugin-i18n@0.0.0-next-c835d71
+  - @modern-js/plugin-lint@0.0.0-next-c835d71
+  - @modern-js/new-action@0.0.0-next-c835d71
+  - @modern-js/node-bundle-require@0.0.0-next-c835d71
+  - @modern-js/upgrade@0.0.0-next-c835d71
+  - @modern-js/plugin@0.0.0-next-c835d71
 
 ## 2.7.0
 

package/dist/cjs/analyze/generateCode.js

@@ -138,6 +138,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           config2.server.ssrByEntries,
           packageName
         );
+        const useSSG = (0, import_utils.isSSGEntry)(config2, entryName, entrypoints);
         let mode;
         if (ssr) {
           mode = typeof ssr === "object" ? ssr.mode || "string" : "string";
@@ -157,13 +158,13 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           entrypoint,
           code: await templates.fileSystemRoutes({
             routes,
-            ssrMode: mode,
+            ssrMode: useSSG ? "string" : mode,
             nestedRoutesEntry: entrypoint.nestedRoutesEntry,
             entryName: entrypoint.entryName,
             internalDirectory
           })
         });
-        if (entrypoint.nestedRoutesEntry && mode) {
+        if (entrypoint.nestedRoutesEntry && (0, import_utils.isUseSSRBundle)(config2)) {
           const routesServerFile = (0, import_utils2.getServerLoadersFile)(
             internalDirectory,
             entryName

package/dist/cjs/analyze/index.js

@@ -205,7 +205,12 @@ var analyze_default = ({
                   resolvedConfig.server.ssrByEntries,
                   packageName
                 );
-                if (entrypoint.nestedRoutesEntry && ssr && name === "server") {
+                const useSSG = (0, import_utils.isSSGEntry)(
+                  resolvedConfig,
+                  entryName,
+                  entrypoints
+                );
+                if (entrypoint.nestedRoutesEntry && (ssr || useSSG) && name === "server") {
                   const serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
                   const serverLoadersFile = (0, import_utils2.getServerLoadersFile)(
                     internalDirectory,

package/dist/esm/analyze/generateCode.js

@@ -148,7 +148,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import path from "path";
-import { fs, getEntryOptions, isRouterV5, logger } from "@modern-js/utils";
+import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } from "@modern-js/utils";
 import * as templates from "./templates";
 import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
 import { FILE_SYSTEM_ROUTES_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME } from "./constants";
@@ -245,7 +245,7 @@ var generateCode = function() {
         }
         function _generateEntryCode() {
             _generateEntryCode = _asyncToGenerator(function(entrypoint) {
-                var entryName, isAutoMount, customBootstrap, fileSystemRoutes, initialRoutes, nestedRoute, routes, config2, ssr, mode, hasPageRoute, _ref, code2, _, _tmp, routesServerFile, code3, _ref1, importStatements, plugins, _ref2, renderFunction, exportStatement, code, entryFile, _ref3, asyncEntryCode, bootstrapFile;
+                var entryName, isAutoMount, customBootstrap, fileSystemRoutes, initialRoutes, nestedRoute, routes, config2, ssr, useSSG, mode, hasPageRoute, _ref, code2, _, _tmp, routesServerFile, code3, _ref1, importStatements, plugins, _ref2, renderFunction, exportStatement, code, entryFile, _ref3, asyncEntryCode, bootstrapFile;
                 return __generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
@@ -298,6 +298,7 @@ var generateCode = function() {
                             routes = _state.sent().routes;
                             config2 = api.useResolvedConfigContext();
                             ssr = getEntryOptions(entryName, config2.server.ssr, config2.server.ssrByEntries, packageName);
+                            useSSG = isSSGEntry(config2, entryName, entrypoints);
                             if (ssr) {
                                 mode = typeof ssr === "object" ? ssr.mode || "string" : "string";
                             }
@@ -318,7 +319,7 @@ var generateCode = function() {
                                 4,
                                 templates.fileSystemRoutes({
                                     routes: routes,
-                                    ssrMode: mode,
+                                    ssrMode: useSSG ? "string" : mode,
                                     nestedRoutesEntry: entrypoint.nestedRoutesEntry,
                                     entryName: entrypoint.entryName,
                                     internalDirectory: internalDirectory
@@ -333,7 +334,7 @@ var generateCode = function() {
                             ];
                         case 5:
                             _ref = _state.sent(), code2 = _ref.code;
-                            if (!(entrypoint.nestedRoutesEntry && mode)) return [
+                            if (!(entrypoint.nestedRoutesEntry && isUseSSRBundle(config2))) return [
                                 3,
                                 8
                             ];

package/dist/esm/analyze/index.js

@@ -221,7 +221,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import * as path from "path";
-import { createDebugger, findExists, fs, getEntryOptions, isApiOnly, minimist, getCommand, isDevCommand } from "@modern-js/utils";
+import { createDebugger, findExists, fs, getEntryOptions, isApiOnly, minimist, getCommand, isDevCommand, isSSGEntry } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { createVirtualModule } from "@modern-js/builder-shared";
 import { printInstructions } from "../utils/printInstructions";
@@ -554,7 +554,8 @@ var analyze_default = function(param) {
                                 entrypoints.forEach(function(entrypoint) {
                                     var entryName = entrypoint.entryName;
                                     var ssr = getEntryOptions(entryName, resolvedConfig.server.ssr, resolvedConfig.server.ssrByEntries, packageName);
-                                    if (entrypoint.nestedRoutesEntry && ssr && name === "server") {
+                                    var useSSG = isSSGEntry(resolvedConfig, entryName, entrypoints);
+                                    if (entrypoint.nestedRoutesEntry && (ssr || useSSG) && name === "server") {
                                         var serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
                                         var serverLoadersFile = getServerLoadersFile(internalDirectory, entryName);
                                         var combinedModule = createVirtualModule('export * from "'.concat(serverLoaderRuntime, '"; export * from "').concat(serverLoadersFile, '"'));

package/dist/esm-node/analyze/generateCode.js

@@ -1,5 +1,12 @@
 import path from "path";
-import { fs, getEntryOptions, isRouterV5, logger } from "@modern-js/utils";
+import {
+  fs,
+  getEntryOptions,
+  isRouterV5,
+  isSSGEntry,
+  isUseSSRBundle,
+  logger
+} from "@modern-js/utils";
 import * as templates from "./templates";
 import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
 import {
@@ -109,6 +116,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           config2.server.ssrByEntries,
           packageName
         );
+        const useSSG = isSSGEntry(config2, entryName, entrypoints);
         let mode;
         if (ssr) {
           mode = typeof ssr === "object" ? ssr.mode || "string" : "string";
@@ -128,13 +136,13 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           entrypoint,
           code: await templates.fileSystemRoutes({
             routes,
-            ssrMode: mode,
+            ssrMode: useSSG ? "string" : mode,
             nestedRoutesEntry: entrypoint.nestedRoutesEntry,
             entryName: entrypoint.entryName,
             internalDirectory
           })
         });
-        if (entrypoint.nestedRoutesEntry && mode) {
+        if (entrypoint.nestedRoutesEntry && isUseSSRBundle(config2)) {
           const routesServerFile = getServerLoadersFile(
             internalDirectory,
             entryName

package/dist/esm-node/analyze/index.js

@@ -7,7 +7,8 @@ import {
   isApiOnly,
   minimist,
   getCommand,
-  isDevCommand
+  isDevCommand,
+  isSSGEntry
 } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { createVirtualModule } from "@modern-js/builder-shared";
@@ -191,7 +192,12 @@ var analyze_default = ({
                   resolvedConfig.server.ssrByEntries,
                   packageName
                 );
-                if (entrypoint.nestedRoutesEntry && ssr && name === "server") {
+                const useSSG = isSSGEntry(
+                  resolvedConfig,
+                  entryName,
+                  entrypoints
+                );
+                if (entrypoint.nestedRoutesEntry && (ssr || useSSG) && name === "server") {
                   const serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
                   const serverLoadersFile = getServerLoadersFile(
                     internalDirectory,

package/dist/types/types/config/output.d.ts

@@ -1,6 +1,7 @@
 import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
 import type { BuilderConfig as RsBuilderConfig } from '@modern-js/builder-rspack-provider';
 import type { SharedOutputConfig as BuilderSharedOutputConfig } from '@modern-js/builder-shared';
+import type { SSGConfig } from '@modern-js/types';
 import { UnwrapBuilderConfig } from '../utils';
 export type BuilderOutputConfig = UnwrapBuilderConfig<BuilderConfig, 'output'>;
 export type RsBuilderOutputConfig = UnwrapBuilderConfig<RsBuilderConfig, 'output'>;
@@ -10,18 +11,4 @@ export interface SharedOutputConfig extends BuilderSharedOutputConfig {
 }
 export interface OutputUserConfig extends BuilderOutputConfig, SharedOutputConfig {}
 export interface RsOutputUserConfig extends RsBuilderOutputConfig, SharedOutputConfig {}
-export type SSGRouteOptions = string | {
-  url: string;
-  output?: string;
-  params?: Record<string, any>[];
-  headers?: Record<string, any>;
-};
-export type SSGSingleEntryOptions = boolean | {
-  preventDefault?: string[];
-  headers?: Record<string, any>;
-  routes?: SSGRouteOptions[];
-};
-export type SSGMultiEntryOptions = Record<string, SSGSingleEntryOptions>;
-export type SSGConfig = boolean | SSGSingleEntryOptions | SSGMultiEntryOptions | ((entryName: string, payload: {
-  baseUrl?: string;
-}) => SSGSingleEntryOptions);
+export type { SSGRouteOptions, SSGSingleEntryOptions, SSGMultiEntryOptions, SSGConfig } from '@modern-js/types';

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-next-1104a9f18",
+  "version": "0.0.0-next-c835d71",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -64,23 +64,23 @@
     "@babel/types": "^7.18.0",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.15.7",
-    "@modern-js/builder": "0.0.0-next-1104a9f18",
-    "@modern-js/builder-plugin-esbuild": "0.0.0-next-1104a9f18",
-    "@modern-js/builder-plugin-node-polyfill": "0.0.0-next-1104a9f18",
-    "@modern-js/builder-shared": "0.0.0-next-1104a9f18",
-    "@modern-js/builder-webpack-provider": "0.0.0-next-1104a9f18",
-    "@modern-js/core": "0.0.0-next-1104a9f18",
-    "@modern-js/new-action": "0.0.0-next-1104a9f18",
-    "@modern-js/node-bundle-require": "0.0.0-next-1104a9f18",
-    "@modern-js/plugin": "0.0.0-next-1104a9f18",
-    "@modern-js/plugin-i18n": "0.0.0-next-1104a9f18",
-    "@modern-js/plugin-data-loader": "0.0.0-next-1104a9f18",
-    "@modern-js/plugin-lint": "0.0.0-next-1104a9f18",
-    "@modern-js/prod-server": "0.0.0-next-1104a9f18",
-    "@modern-js/server": "0.0.0-next-1104a9f18",
-    "@modern-js/types": "0.0.0-next-1104a9f18",
-    "@modern-js/upgrade": "0.0.0-next-1104a9f18",
-    "@modern-js/utils": "0.0.0-next-1104a9f18"
+    "@modern-js/builder": "0.0.0-next-c835d71",
+    "@modern-js/builder-plugin-esbuild": "0.0.0-next-c835d71",
+    "@modern-js/builder-plugin-node-polyfill": "0.0.0-next-c835d71",
+    "@modern-js/builder-shared": "0.0.0-next-c835d71",
+    "@modern-js/builder-webpack-provider": "0.0.0-next-c835d71",
+    "@modern-js/core": "0.0.0-next-c835d71",
+    "@modern-js/new-action": "0.0.0-next-c835d71",
+    "@modern-js/node-bundle-require": "0.0.0-next-c835d71",
+    "@modern-js/plugin": "0.0.0-next-c835d71",
+    "@modern-js/plugin-data-loader": "0.0.0-next-c835d71",
+    "@modern-js/plugin-i18n": "0.0.0-next-c835d71",
+    "@modern-js/plugin-lint": "0.0.0-next-c835d71",
+    "@modern-js/prod-server": "0.0.0-next-c835d71",
+    "@modern-js/server": "0.0.0-next-c835d71",
+    "@modern-js/types": "0.0.0-next-c835d71",
+    "@modern-js/upgrade": "0.0.0-next-c835d71",
+    "@modern-js/utils": "0.0.0-next-c835d71"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -89,14 +89,14 @@
     "jest": "^27",
     "typescript": "^4",
     "webpack": "^5.75.0",
-    "@modern-js/builder-plugin-swc": "0.0.0-next-1104a9f18",
-    "@modern-js/builder-rspack-provider": "0.0.0-next-1104a9f18",
-    "@modern-js/server-core": "0.0.0-next-1104a9f18",
-    "@scripts/jest-config": "0.0.0-next-1104a9f18",
-    "@scripts/build": "0.0.0-next-1104a9f18"
+    "@modern-js/builder-plugin-swc": "0.0.0-next-c835d71",
+    "@modern-js/builder-rspack-provider": "0.0.0-next-c835d71",
+    "@modern-js/server-core": "0.0.0-next-c835d71",
+    "@scripts/jest-config": "0.0.0-next-c835d71",
+    "@scripts/build": "0.0.0-next-c835d71"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "0.0.0-next-1104a9f18"
+    "@modern-js/builder-rspack-provider": "0.0.0-next-c835d71"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {