@modern-js/plugin-ssg 1.2.7 → 1.2.8

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @modern-js/plugin-ssg
 
+## 1.2.8
+
+### Patch Changes
+
+- 046e58aa: fix: plugin-analyze and plugin-ssg should not import method from core
+- Updated dependencies [77ff9754]
+- Updated dependencies [d2d1d6b2]
+- Updated dependencies [07a4887e]
+- Updated dependencies [ea2ae711]
+- Updated dependencies [17d0cc46]
+- Updated dependencies [d2d1d6b2]
+  - @modern-js/utils@1.4.0
+
 ## 1.2.7
 
 ### Patch Changes

package/dist/js/modern/index.js

@@ -35,7 +35,6 @@ export default (() => ({
         };
       },
 
-      // eslint-disable-next-line max-statements
       async afterBuild() {
         const resolvedConfig = api.useResolvedConfigContext();
         const appContext = api.useAppContext();
@@ -169,7 +168,7 @@ export default (() => ({
           ssgRoute.isSSR = false;
           ssgRoute.output = formatOutput(ssgRoute.output);
         });
-        const htmlAry = await createServer(ssgRoutes, pageRoutes, apiRoutes, resolvedConfig, appDirectory); // write to dist file
+        const htmlAry = await createServer(api, ssgRoutes, pageRoutes, apiRoutes, resolvedConfig, appDirectory); // write to dist file
 
         writeHtmlFile(htmlAry, ssgRoutes, buildDir); // format route info, side effect
 

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

@@ -1,10 +1,9 @@
 import childProcess from 'child_process';
 import path from 'path';
 import { logger } from '@modern-js/utils';
-import { useAppContext } from '@modern-js/core';
 import { openRouteSSR } from "../libs/util";
 import { CLOSE_SIGN } from "./consts";
-export const createServer = (ssgRoutes, pageRoutes, apiRoutes, options, appDirectory) => new Promise((resolve, reject) => {
+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);
@@ -13,7 +12,7 @@ export const createServer = (ssgRoutes, pageRoutes, apiRoutes, options, appDirec
     cwd: appDirectory,
     silent: true
   });
-  const appContext = useAppContext();
+  const appContext = api.useAppContext();
   const serverPlugins = appContext.plugins.filter(p => p.server).map(p => p.server);
   const plugins = serverPlugins.map(p => p.name);
   cp.send(JSON.stringify({

package/dist/js/node/index.js

@@ -52,7 +52,6 @@ var _default = () => ({
         };
       },
 
-      // eslint-disable-next-line max-statements
       async afterBuild() {
         const resolvedConfig = api.useResolvedConfigContext();
         const appContext = api.useAppContext();
@@ -187,7 +186,7 @@ var _default = () => ({
           ssgRoute.isSSR = false;
           ssgRoute.output = (0, _util.formatOutput)(ssgRoute.output);
         });
-        const htmlAry = await (0, _server.createServer)(ssgRoutes, pageRoutes, apiRoutes, resolvedConfig, appDirectory); // write to dist file
+        const htmlAry = await (0, _server.createServer)(api, ssgRoutes, pageRoutes, apiRoutes, resolvedConfig, appDirectory); // write to dist file
 
         (0, _output.writeHtmlFile)(htmlAry, ssgRoutes, buildDir); // format route info, side effect
 

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

@@ -11,15 +11,13 @@ var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
-var _core = require("@modern-js/core");
-
 var _util = require("../libs/util");
 
 var _consts = require("./consts");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const createServer = (ssgRoutes, pageRoutes, apiRoutes, options, appDirectory) => new Promise((resolve, reject) => {
+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);
@@ -30,7 +28,7 @@ const createServer = (ssgRoutes, pageRoutes, apiRoutes, options, appDirectory) =
     silent: true
   });
 
-  const appContext = (0, _core.useAppContext)();
+  const appContext = api.useAppContext();
   const serverPlugins = appContext.plugins.filter(p => p.server).map(p => p.server);
   const plugins = serverPlugins.map(p => p.name);
   cp.send(JSON.stringify({

package/dist/types/server/index.d.ts

@@ -1,4 +1,4 @@
-import { NormalizedConfig } from '@modern-js/core';
+import type { NormalizedConfig, PluginAPI } from '@modern-js/core';
 import { ServerRoute as ModernRoute } from '@modern-js/types';
 import { SsgRoute } from '../types';
-export declare const createServer: (ssgRoutes: SsgRoute[], pageRoutes: ModernRoute[], apiRoutes: ModernRoute[], options: NormalizedConfig, appDirectory: string) => Promise<string[]>;
+export declare const createServer: (api: PluginAPI, ssgRoutes: SsgRoute[], pageRoutes: ModernRoute[], apiRoutes: ModernRoute[], options: NormalizedConfig, appDirectory: string) => Promise<string[]>;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.7",
+  "version": "1.2.8",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -55,15 +55,15 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/utils": "^1.3.7",
+    "@modern-js/utils": "^1.4.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.3.6",
-    "@modern-js/prod-server": "^1.0.6",
+    "@modern-js/types": "^1.4.0",
+    "@modern-js/prod-server": "^1.1.0",
     "@types/jest": "^26",
     "@types/node": "^14",
     "@types/react": "^17",
@@ -71,7 +71,7 @@
     "@types/react-router": "^5.1.16",
     "@types/react-router-dom": "^5.1.8",
     "typescript": "^4",
-    "@modern-js/core": "1.6.1",
+    "@modern-js/core": "1.7.0",
     "@scripts/build": "0.0.0",
     "jest": "^27",
     "@scripts/jest-config": "0.0.0"

package/tests/util.test.ts

@@ -74,7 +74,6 @@ describe('test ssg util function', () => {
     expect(replaceWithAlias('/src', '/src/app.js', '@src')).toBe('@src/app.js');
   });
 
-  // eslint-disable-next-line max-statements
   it('should starndar user config correctly', () => {
     const opt0 = standardOptions(false, []);
     expect(opt0).toBeFalsy();