@modern-js/plugin-ssg 1.0.0-rc.9 → 1.1.1

package/dist/js/node/index.js

@@ -7,15 +7,13 @@ exports.default = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
-var _core = require("@modern-js/core");
-
 var _utils = require("@modern-js/utils");
 
-var _manifestOp = require("./manifest-op");
+var _core = require("@modern-js/core");
 
-var _util = require("./libs/util");
+var _reactRouterDom = require("react-router-dom");
 
-var _invoker = require("./libs/invoker");
+var _util = require("./libs/util");
 
 var _server = require("./server");
 
@@ -23,34 +21,19 @@ var _output = require("./libs/output");
 
 var _replace = require("./libs/replace");
 
+var _make = require("./libs/make");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const listStaticFiles = (pwd, entriesDir, useSSG) => {
-  const absEntriesDir = _path.default.join(pwd, entriesDir);
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-  const staticRenderLevel = (0, _util.getSSGRenderLevel)(useSSG);
-  const staticFiles = new _manifestOp.LoaderManifest().get(absEntriesDir, staticRenderLevel); // 将绝对路径转换成 alias，因为获取到的约定路由也是使用别名的
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-  const staticAlias = staticFiles.map(filepath => (0, _util.replaceWithAlias)(_path.default.join(pwd, 'src'), filepath, _utils.INTERNAL_SRC_ALIAS));
-  return staticAlias;
-};
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var _default = (0, _core.createPlugin)(() => {
   const agreedRouteMap = {};
   return {
-    config() {
-      return {
-        tools: {
-          babel(config, {
-            chain
-          }) {
-            chain.plugin('./loader').use(require.resolve("./loader"));
-          }
-
-        }
-      };
-    },
-
     validateSchema() {
       return _utils.PLUGIN_SCHEMAS['@modern-js/plugin-ssg'];
     },
@@ -76,16 +59,11 @@ var _default = (0, _core.createPlugin)(() => {
 
       const appContext = (0, _core.useAppContext)();
       const {
-        appDirectory
+        appDirectory,
+        entrypoints
       } = appContext;
       const {
-        output,
-        server: {
-          baseUrl
-        },
-        source: {
-          entriesDir
-        }
+        output
       } = resolvedConfig;
       const {
         ssg,
@@ -97,15 +75,9 @@ var _default = (0, _core.createPlugin)(() => {
         return;
       }
 
-      const {
-        useSSG,
-        userHook
-      } = (0, _util.parsedSSGConfig)(ssgOptions);
-
       const buildDir = _path.default.join(appDirectory, outputPath);
 
-      const routes = (0, _util.readJSONSpec)(buildDir);
-      const staticAlias = listStaticFiles(appDirectory, entriesDir, useSSG); // filter all routes not web
+      const routes = (0, _util.readJSONSpec)(buildDir); // filter all routes not web
 
       const pageRoutes = routes.filter(route => !route.isApi);
       const apiRoutes = routes.filter(route => route.isApi); // if no web page route, skip ssg render
@@ -114,27 +86,91 @@ var _default = (0, _core.createPlugin)(() => {
         return;
       }
 
-      const ssgRoutes = []; // callback of context.createPage, to format output, collect page route
-
-      const listener = (route, agreed) => {
-        const urlPrefix = (0, _util.getUrlPrefix)(route, baseUrl);
-        const ssgOutput = (0, _util.getOutput)(route, urlPrefix, agreed);
-        route.output = (0, _util.formatOutput)(route.entryPath, ssgOutput);
-        ssgRoutes.push(route);
-      }; // check if every allowed agreed route was collected
-
+      const intermediateOptions = (0, _util.standardOptions)(ssgOptions, entrypoints);
 
-      const autoAddAgreed = context => {
-        // if not exist in allowed list, return false
-        if (!staticAlias.includes(context.component)) {
-          return false;
-        } // if allowed, return collection state
+      if (!intermediateOptions) {
+        return;
+      }
 
+      const ssgRoutes = []; // each route will try to match the configuration
+
+      pageRoutes.forEach(pageRoute => {
+        const {
+          entryName,
+          entryPath
+        } = pageRoute;
+        const agreedRoutes = agreedRouteMap[entryName];
+        let entryOptions = intermediateOptions[entryName];
+
+        if (!agreedRoutes) {
+          var _entryOptions$routes;
+
+          // default behavior for non-agreed route
+          if (!entryOptions) {
+            return;
+          } // only add entry route if entryOptions is true
+
+
+          if (entryOptions === true) {
+            ssgRoutes.push(_objectSpread(_objectSpread({}, pageRoute), {}, {
+              output: entryPath
+            }));
+          } else if (((_entryOptions$routes = entryOptions.routes) === null || _entryOptions$routes === void 0 ? void 0 : _entryOptions$routes.length) > 0) {
+            // if entryOptions is object and has routes options
+            // add every route in options
+            const {
+              routes: enrtyRoutes,
+              headers
+            } = entryOptions;
+            enrtyRoutes.forEach(route => {
+              ssgRoutes.push((0, _make.makeRoute)(pageRoute, route, headers));
+            });
+          }
+        } else {
+          // Unless entryOptions is set to false
+          // the default behavior is to add all file-based routes
+          if (entryOptions === false) {
+            return;
+          }
 
-        return !ssgRoutes.some(ssgRoute => ssgRoute.urlPath === context.route.path);
-      };
+          if (!entryOptions || entryOptions === true) {
+            entryOptions = {
+              preventDefault: [],
+              routes: [],
+              headers: {}
+            };
+          }
 
-      await (0, _invoker.invoker)(pageRoutes, agreedRouteMap, userHook, autoAddAgreed, listener);
+          const {
+            preventDefault = [],
+            routes: userRoutes = [],
+            headers
+          } = entryOptions; // if the user sets the routes, then only add them
+
+          if (userRoutes.length > 0) {
+            userRoutes.forEach(route => {
+              if (typeof route === 'string') {
+                ssgRoutes.push((0, _make.makeRoute)(pageRoute, route, headers));
+              } else if (Array.isArray(route.params)) {
+                route.params.forEach(param => {
+                  ssgRoutes.push((0, _make.makeRoute)(pageRoute, _objectSpread(_objectSpread({}, route), {}, {
+                    url: (0, _reactRouterDom.generatePath)(route.url, param)
+                  }), headers));
+                });
+              } else {
+                ssgRoutes.push((0, _make.makeRoute)(pageRoute, route, headers));
+              }
+            });
+          } else {
+            // otherwith add all except dynamic routes
+            agreedRoutes.filter(route => !preventDefault.includes(route.path)).forEach(route => {
+              if (!(0, _util.isDynamicUrl)(route.path)) {
+                ssgRoutes.push((0, _make.makeRoute)(pageRoute, route.path, headers));
+              }
+            });
+          }
+        }
+      });
 
       if (ssgRoutes.length === 0) {
         return;
@@ -153,6 +189,7 @@ var _default = (0, _core.createPlugin)(() => {
         }
 
         ssgRoute.isSSR = false;
+        ssgRoute.output = (0, _util.formatOutput)(ssgRoute.output);
       });
       const htmlAry = await (0, _server.createServer)(ssgRoutes, apiRoutes, resolvedConfig, appDirectory); // write to dist file
 

package/dist/js/node/libs/{render.js → make.js}

@@ -4,6 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.makeRender = makeRender;
+exports.makeRoute = makeRoute;
+
+var _path = _interopRequireDefault(require("path"));
+
+var _normalizePath = _interopRequireDefault(require("normalize-path"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
@@ -19,4 +26,25 @@ function makeRender(ssgRoutes, render, port) {
     }, ssgRoute.headers),
     connection: {}
   }));
+}
+
+function makeRoute(baseRoute, route, headers = {}) {
+  const {
+    urlPath,
+    entryPath
+  } = baseRoute;
+
+  if (typeof route === 'string') {
+    return _objectSpread(_objectSpread({}, baseRoute), {}, {
+      urlPath: (0, _normalizePath.default)(`${urlPath}${route}`),
+      headers,
+      output: _path.default.join(entryPath, `..${route}`)
+    });
+  } else {
+    return _objectSpread(_objectSpread({}, baseRoute), {}, {
+      urlPath: (0, _normalizePath.default)(`${urlPath}${route.url}`),
+      headers: _objectSpread(_objectSpread({}, headers), route.headers),
+      output: route.output ? _path.default.normalize(route.output) : _path.default.join(entryPath, `..${route.url}`)
+    });
+  }
 }

package/dist/js/node/libs/replace.js

@@ -8,7 +8,7 @@ exports.replaceRoute = replaceRoute;
 
 var _normalizePath = _interopRequireDefault(require("normalize-path"));
 
-const _excluded = ["output"];
+const _excluded = ["output", "headers"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -39,7 +39,8 @@ function replaceRoute(ssgRoutes, pageRoutes) {
   // remove redundant fields and replace rendered entryPath
   const cleanSsgRoutes = ssgRoutes.map(ssgRoute => {
     const {
-      output
+      output,
+      headers
     } = ssgRoute,
           cleanSsgRoute = _objectWithoutProperties(ssgRoute, _excluded);
 

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

@@ -6,25 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.formatOutput = formatOutput;
 exports.formatPath = formatPath;
 exports.getOutput = getOutput;
-exports.getSSGRenderLevel = void 0;
 exports.getUrlPrefix = getUrlPrefix;
 exports.isDynamicUrl = isDynamicUrl;
-exports.writeJSONSpec = exports.replaceWithAlias = exports.readJSONSpec = exports.parsedSSGConfig = void 0;
+exports.writeJSONSpec = exports.standardOptions = exports.replaceWithAlias = exports.readJSONSpec = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
-var _manifestOp = require("../manifest-op");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function formatOutput(base, filename) {
-  const file = _path.default.extname(filename) ? filename : `${filename}/index.html`;
-
-  const dirname = _path.default.dirname(base);
-
-  return _path.default.join(dirname, file);
+function formatOutput(filename) {
+  const outputPath = _path.default.extname(filename) ? filename : `${filename}/index.html`;
+  return outputPath;
 }
 
 function formatPath(str) {
@@ -122,30 +116,45 @@ const writeJSONSpec = (dir, routes) => {
 
 exports.writeJSONSpec = writeJSONSpec;
 
-const getSSGRenderLevel = key => {
-  const level = typeof key === 'boolean' ? _manifestOp.MODE.LOOSE : _manifestOp.MODE[key.toUpperCase()]; // currently only MODE.STRICT and MODE.LOOSE are supported
+const replaceWithAlias = (base, filePath, alias) => _path.default.posix.join(alias, _path.default.posix.relative(base, filePath));
 
-  if (!level || level > 2 || level < 1) {
-    throw new Error(`[SSG Render Fail] SSG 不支持当前 Mode，useSSG: ${key.toString()}, Level: ${level}`);
-  }
+exports.replaceWithAlias = replaceWithAlias;
 
-  return level;
-};
+const standardOptions = (ssgOptions, entrypoints) => {
+  if (ssgOptions === false) {
+    return false;
+  }
 
-exports.getSSGRenderLevel = getSSGRenderLevel;
+  if (ssgOptions === true) {
+    return entrypoints.reduce((opt, entry) => {
+      opt[entry.entryName] = ssgOptions;
+      return opt;
+    }, {});
+  } else if (typeof ssgOptions === 'object') {
+    const isSingle = (0, _utils.isSingleEntry)(entrypoints);
+
+    if (isSingle && typeof ssgOptions.main === 'undefined') {
+      return {
+        main: ssgOptions
+      };
+    } else {
+      return ssgOptions;
+    }
+  } else if (typeof ssgOptions === 'function') {
+    const intermediateOptions = {};
 
-const parsedSSGConfig = ssg => {
-  const useSSG = typeof ssg === 'string' ? ssg : true; // eslint-disable-next-line @typescript-eslint/no-empty-function
+    for (const entrypoint of entrypoints) {
+      const {
+        entryName
+      } = entrypoint; // Todo may be async function
 
-  const userHook = typeof ssg === 'function' ? ssg : () => {};
-  return {
-    useSSG,
-    userHook
-  };
-};
+      intermediateOptions[entryName] = ssgOptions(entryName);
+    }
 
-exports.parsedSSGConfig = parsedSSGConfig;
+    return intermediateOptions;
+  }
 
-const replaceWithAlias = (base, filePath, alias) => _path.default.join(alias, _path.default.relative(base, filePath));
+  return false;
+};
 
-exports.replaceWithAlias = replaceWithAlias;
+exports.standardOptions = standardOptions;

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

@@ -9,10 +9,10 @@ var _child_process = _interopRequireDefault(require("child_process"));
 
 var _path = _interopRequireDefault(require("path"));
 
-var _core = require("@modern-js/core");
-
 var _utils = require("@modern-js/utils");
 
+var _core = require("@modern-js/core");
+
 var _consts = require("./consts");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

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

@@ -6,7 +6,7 @@ var _portfinder = _interopRequireDefault(require("portfinder"));
 
 var _utils = require("@modern-js/utils");
 
-var _render = require("../libs/render");
+var _make = require("../libs/make");
 
 var _prerender = require("./prerender");
 
@@ -65,7 +65,8 @@ process.on('message', async chunk => {
 
 
       const render = (0, _prerender.compile)(modernServer.getRequestHandler());
-      const renderPromiseAry = (0, _render.makeRender)(routes.filter(route => !route.isApi), render, port);
+      const renderPromiseAry = (0, _make.makeRender)(routes.filter(route => !route.isApi), render, port); // eslint-disable-next-line promise/no-promise-in-callback
+
       const htmlAry = await Promise.all(renderPromiseAry);
       htmlAry.forEach(html => {
         process.send(html);

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

@@ -0,0 +1,5 @@
+import { ModernRoute } from '@modern-js/server';
+import { compile } from '../server/prerender';
+import { RouteOptions, SsgRoute } from '../types';
+export declare function makeRender(ssgRoutes: SsgRoute[], render: ReturnType<typeof compile>, port: number): Promise<string>[];
+export declare function makeRoute(baseRoute: ModernRoute, route: string | RouteOptions, headers?: Record<string, any>): SsgRoute;

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

@@ -1,4 +1,4 @@
 import { ModernRoute } from '@modern-js/server';
 import { SsgRoute } from '../types';
-export declare function exist(route: SsgRoute, pageRoutes: ModernRoute[]): number;
+export declare function exist(route: ModernRoute, pageRoutes: ModernRoute[]): number;
 export declare function replaceRoute(ssgRoutes: SsgRoute[], pageRoutes: ModernRoute[]): ModernRoute[];

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

@@ -1,15 +1,11 @@
 import { ModernRoute } from '@modern-js/server';
-import { SSGConfig, SsgRoute } from '../types';
-export declare function formatOutput(base: string, filename: string): string;
+import { EntryPoint, MultiEntryOptions, SSG, SsgRoute } from '../types';
+export declare function formatOutput(filename: string): string;
 export declare function formatPath(str: string): string;
 export declare function isDynamicUrl(url: string): boolean;
 export declare function getUrlPrefix(route: SsgRoute, baseUrl: string | string[]): string;
 export declare function getOutput(route: SsgRoute, base: string, agreed?: boolean): string;
 export declare const readJSONSpec: (dir: string) => ModernRoute[];
 export declare const writeJSONSpec: (dir: string, routes: ModernRoute[]) => void;
-export declare const getSSGRenderLevel: (key: boolean | string) => number;
-export declare const parsedSSGConfig: (ssg: SSGConfig) => {
-  useSSG: string | boolean;
-  userHook: (context: any) => void;
-};
-export declare const replaceWithAlias: (base: string, filePath: string, alias: string) => string;
+export declare const replaceWithAlias: (base: string, filePath: string, alias: string) => string;
+export declare const standardOptions: (ssgOptions: SSG, entrypoints: EntryPoint[]) => false | MultiEntryOptions;

package/dist/types/types.d.ts

@@ -12,27 +12,23 @@ export declare type EntryPoint = {
 export declare type AgreedRouteMap = {
   [propNames: string]: AgreedRoute[];
 };
-export declare type FreshPageConfig = {
-  url?: string;
-  output?: string;
-  params?: Record<string, string | number>;
+export declare type SsgRoute = ModernRoute & {
+  output: string;
   headers?: Record<string, string>;
 };
-export declare type UserInterfaceRoute = ModernRoute & {
-  path: string;
-  agreed?: boolean;
-};
-export declare type CreatePageParam = FreshPageConfig | FreshPageConfig[];
-export declare type CreatePageListener = (route: SsgRoute, agreed?: boolean) => void;
-export declare type SsgRoute = ModernRoute & {
+export declare type RouteOptions = string | {
+  url: string;
   output?: string;
-  headers?: Record<string, string>;
+  params?: Record<string, any>[];
+  headers?: Record<string, any>;
 };
-export declare type HookContext = {
-  createPage: (config?: CreatePageParam) => any;
-  route: UserInterfaceRoute;
+export declare type SingleEntryOptions = boolean | {
+  preventDefault?: string[];
+  headers?: Record<string, any>;
+  routes: RouteOptions[];
 };
-export declare type SSGConfig = string | ((context: any) => void);
+export declare type MultiEntryOptions = Record<string, SingleEntryOptions>;
+export declare type SSG = boolean | SingleEntryOptions | MultiEntryOptions | ((entryName: string) => SingleEntryOptions);
 export declare type ExtendOutputConfig = {
-  ssg: SSGConfig;
+  ssg: SSG;
 };

package/package.json

@@ -1,6 +1,17 @@
 {
   "name": "@modern-js/plugin-ssg",
-  "version": "1.0.0-rc.9",
+  "description": "The meta-framework suite designed from scratch for frontend-focused modern web development.",
+  "homepage": "https://modernjs.dev",
+  "bugs": "https://github.com/modern-js-dev/modern.js/issues",
+  "repository": "modern-js-dev/modern.js",
+  "license": "MIT",
+  "keywords": [
+    "react",
+    "framework",
+    "modern",
+    "modern.js"
+  ],
+  "version": "1.1.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -24,17 +35,14 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/babel-chain": "^1.0.0-rc.9",
-    "@modern-js/core": "^1.0.0-rc.9",
-    "@modern-js/utils": "^1.0.0-rc.9",
+    "@modern-js/utils": "^1.1.2",
     "node-mocks-http": "^1.10.1",
     "normalize-path": "^3.0.0",
     "portfinder": "^1.0.28",
-    "react-router-dom": "^5.2.1",
-    "webpack-chain": "^6.5.1"
+    "react-router-dom": "^5.2.1"
   },
   "devDependencies": {
-    "@modern-js/server": "^1.0.0-rc.9",
+    "@modern-js/server": "^1.1.2",
     "@types/jest": "^26",
     "@types/node": "^14",
     "@types/react": "^17",
@@ -42,8 +50,12 @@
     "@types/react-router": "^5.1.16",
     "@types/react-router-dom": "^5.1.8",
     "typescript": "^4",
-    "@modern-js/plugin-testing": "^1.0.0-rc.9",
-    "@modern-js/module-tools": "^1.0.0-rc.9"
+    "@modern-js/core": "^1.1.2",
+    "@modern-js/plugin-testing": "^1.1.0",
+    "@modern-js/module-tools": "^1.1.0"
+  },
+  "peerDependencies": {
+    "@modern-js/core": "^1.1.2"
   },
   "sideEffects": false,
   "modernConfig": {