@modern-js/plugin-ssg 1.2.10 → 1.2.13

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @modern-js/plugin-ssg
 
+## 1.2.13
+
+### Patch Changes
+
+- 6c8ab42dd: optimize whether to do SSR bundle
+
+## 1.2.12
+
+### Patch Changes
+
+- d32f35134: chore: add modern/jest/eslint/ts config files to .npmignore
+- Updated dependencies [d32f35134]
+- Updated dependencies [6ae4a34ae]
+- Updated dependencies [b80229c79]
+- Updated dependencies [948cc4436]
+  - @modern-js/utils@1.7.3
+
+## 1.2.11
+
+### Patch Changes
+
+- 69a728375: fix: remove exports.jsnext:source after publish
+- Updated dependencies [cd7346b0d]
+- Updated dependencies [69a728375]
+  - @modern-js/utils@1.7.2
+
 ## 1.2.10
 
 ### Patch Changes

package/dist/js/modern/index.js

@@ -106,11 +106,11 @@ export default (() => ({
           } else {
             // Unless entryOptions is set to false
             // the default behavior is to add all file-based routes
-            if (entryOptions === false) {
+            if (!entryOptions) {
               return;
             }
 
-            if (!entryOptions || entryOptions === true) {
+            if (entryOptions === true) {
               entryOptions = {
                 preventDefault: [],
                 routes: [],

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

@@ -41,7 +41,7 @@ export function getUrlPrefix(route, baseUrl) {
     const filters = baseUrl.filter(url => route.urlPath.includes(url));
 
     if (filters.length > 1) {
-      const matched = filters.sort((a, b) => a.length - b.length)[0]; // this should never happend
+      const matched = filters.sort((a, b) => a.length - b.length)[0]; // this should never happened
 
       if (!matched) {
         throw new Error('');
@@ -58,7 +58,7 @@ export function getUrlPrefix(route, baseUrl) {
   const prefix = `${base}/${entryName}`;
   return prefix.endsWith('/') ? prefix.slice(0, -1) : prefix;
 } // if no output, return default path for aggred-route(relative),
-// or thorw error for control-route
+// or throw error for control-route
 
 export function getOutput(route, base, agreed) {
   const {
@@ -131,7 +131,7 @@ export const standardOptions = (ssgOptions, entrypoints) => {
 
   return false;
 };
-export const openRouteSSR = routes => routes.map(ssgRoute => _objectSpread(_objectSpread({}, ssgRoute), {}, {
-  isSSR: true,
+export const openRouteSSR = (routes, entries = []) => routes.map(ssgRoute => _objectSpread(_objectSpread({}, ssgRoute), {}, {
+  isSSR: entries.includes(ssgRoute.entryName),
   bundle: `${SERVER_BUNDLE_DIRECTORY}/${ssgRoute.entryName}.js`
 }));

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

@@ -6,7 +6,8 @@ import { CLOSE_SIGN } from "./consts";
 export const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirectory) => new Promise((resolve, reject) => {
   // this side of the shallow copy of a route for subsequent render processing, to prevent the modification of the current field
   // manually enable the server-side rendering configuration for all routes that require SSG
-  const backup = openRouteSSR(pageRoutes);
+  const entries = ssgRoutes.map(route => route.entryName);
+  const backup = openRouteSSR(pageRoutes, entries);
   const total = backup.concat(apiRoutes);
   const cp = childProcess.fork(path.join(__dirname, 'process'), {
     cwd: appDirectory,

package/dist/js/node/index.js

@@ -124,11 +124,11 @@ var _default = () => ({
           } else {
             // Unless entryOptions is set to false
             // the default behavior is to add all file-based routes
-            if (entryOptions === false) {
+            if (!entryOptions) {
               return;
             }
 
-            if (!entryOptions || entryOptions === true) {
+            if (entryOptions === true) {
               entryOptions = {
                 preventDefault: [],
                 routes: [],

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

@@ -60,7 +60,7 @@ function getUrlPrefix(route, baseUrl) {
     const filters = baseUrl.filter(url => route.urlPath.includes(url));
 
     if (filters.length > 1) {
-      const matched = filters.sort((a, b) => a.length - b.length)[0]; // this should never happend
+      const matched = filters.sort((a, b) => a.length - b.length)[0]; // this should never happened
 
       if (!matched) {
         throw new Error('');
@@ -77,7 +77,7 @@ function getUrlPrefix(route, baseUrl) {
   const prefix = `${base}/${entryName}`;
   return prefix.endsWith('/') ? prefix.slice(0, -1) : prefix;
 } // if no output, return default path for aggred-route(relative),
-// or thorw error for control-route
+// or throw error for control-route
 
 
 function getOutput(route, base, agreed) {
@@ -165,8 +165,8 @@ const standardOptions = (ssgOptions, entrypoints) => {
 
 exports.standardOptions = standardOptions;
 
-const openRouteSSR = routes => routes.map(ssgRoute => _objectSpread(_objectSpread({}, ssgRoute), {}, {
-  isSSR: true,
+const openRouteSSR = (routes, entries = []) => routes.map(ssgRoute => _objectSpread(_objectSpread({}, ssgRoute), {}, {
+  isSSR: entries.includes(ssgRoute.entryName),
   bundle: `${_utils.SERVER_BUNDLE_DIRECTORY}/${ssgRoute.entryName}.js`
 }));
 

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

@@ -20,7 +20,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const createServer = (api, ssgRoutes, pageRoutes, apiRoutes, options, appDirectory) => new Promise((resolve, reject) => {
   // this side of the shallow copy of a route for subsequent render processing, to prevent the modification of the current field
   // manually enable the server-side rendering configuration for all routes that require SSG
-  const backup = (0, _util.openRouteSSR)(pageRoutes);
+  const entries = ssgRoutes.map(route => route.entryName);
+  const backup = (0, _util.openRouteSSR)(pageRoutes, entries);
   const total = backup.concat(apiRoutes);
 
   const cp = _child_process.default.fork(_path.default.join(__dirname, 'process'), {

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

@@ -9,7 +9,7 @@ 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 openRouteSSR: (routes: ModernRoute[]) => {
+export declare const openRouteSSR: (routes: ModernRoute[], entries?: string[]) => {
   isSSR: boolean;
   bundle: string;
   entryName?: string | undefined;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.10",
+  "version": "1.2.13",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -55,23 +55,23 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/utils": "^1.6.0",
+    "@modern-js/utils": "^1.7.6",
     "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.1",
-    "@modern-js/prod-server": "1.1.2",
-    "@types/jest": "^26",
+    "@modern-js/types": "1.5.4",
+    "@modern-js/prod-server": "1.1.7",
+    "@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",
     "typescript": "^4",
-    "@modern-js/core": "1.9.0",
+    "@modern-js/core": "1.11.1",
     "@scripts/build": "0.0.0",
     "jest": "^27",
     "@scripts/jest-config": "0.0.0"
@@ -86,11 +86,34 @@
     "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": "modern build",
+    "build": "wireit",
     "dev": "modern build --watch",
-    "test": "jest --passWithNoTests"
+    "test": "wireit"
   },
   "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }

package/.eslintrc.js

@@ -1,6 +0,0 @@
-module.exports = {
-  extends: ['@modern-js'],
-  parserOptions: {
-    project: require.resolve('./tsconfig.json'),
-  },
-};

package/jest.config.js

@@ -1,7 +0,0 @@
-const sharedConfig = require('@scripts/jest-config');
-
-/** @type {import('@jest/types').Config.InitialOptions} */
-module.exports = {
-  ...sharedConfig,
-  rootDir: __dirname,
-};

package/modern.config.js

@@ -1,2 +0,0 @@
-/** @type {import('@modern-js/module-tools').UserConfig} */
-module.exports = {};

package/tsconfig.json

@@ -1,11 +0,0 @@
-{
-  "extends": "@modern-js/tsconfig/base",
-  "compilerOptions": {
-    "declaration": false,
-    "jsx": "preserve",
-    "baseUrl": "./",
-    "paths": {},
-    "esModuleInterop": true
-  },
-  "include": ["src"]
-}