@modern-js/plugin-ssg 1.1.3-rc.0 → 1.2.0

package/CHANGELOG.md

@@ -1,12 +1,19 @@
 # @modern-js/plugin-ssg
 
-## 1.1.3-rc.0
+## 1.2.0
+
+### Minor Changes
+
+- cfe11628: Make Modern.js self bootstraping
 
 ### Patch Changes
 
-- Updated dependencies [b7fb82ec]
-  - @modern-js/utils@1.1.6-rc.0
-  - @modern-js/core@1.2.1-rc.0
+- Updated dependencies [2da09c69]
+- Updated dependencies [fc71e36f]
+- Updated dependencies [c3d46ee4]
+- Updated dependencies [cfe11628]
+  - @modern-js/utils@1.2.0
+  - @modern-js/core@1.3.0
 
 ## 1.1.2
 

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

@@ -52,6 +52,10 @@ process.on('message', async chunk => {
     modernServer.listen(port, async err => {
       if (err) {
         throw err;
+      }
+
+      if (!modernServer) {
+        return;
       } // get server handler, render to ssr
 
 

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

@@ -61,6 +61,10 @@ process.on('message', async chunk => {
     modernServer.listen(port, async err => {
       if (err) {
         throw err;
+      }
+
+      if (!modernServer) {
+        return;
       } // get server handler, render to ssr
 
 

package/jest.config.js

@@ -0,0 +1,8 @@
+const sharedConfig = require('@scripts/jest-config');
+
+/** @type {import('@jest/types').Config.InitialOptions} */
+module.exports = {
+  // eslint-disable-next-line node/no-unsupported-features/es-syntax
+  ...sharedConfig,
+  rootDir: __dirname,
+};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.3-rc.0",
+  "version": "1.2.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -20,12 +20,14 @@
   "exports": {
     ".": {
       "node": {
+        "jsnext:source": "./src/index.ts",
         "import": "./dist/js/modern/index.js",
         "require": "./dist/js/node/index.js"
       },
       "default": "./dist/js/treeshaking/index.js"
     },
     "./cli": {
+      "jsnext:source": "./src/index.ts",
       "node": {
         "import": "./dist/js/modern/index.js",
         "require": "./dist/js/node/index.js"
@@ -35,15 +37,15 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/utils": "^1.1.6-rc.0",
+    "@modern-js/utils": "^1.2.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/server": "^1.2.1-rc.0",
-    "@modern-js/types": "^1.1.5-rc.0",
+    "@modern-js/server": "^1.3.0",
+    "@modern-js/types": "^1.2.0",
     "@types/jest": "^26",
     "@types/node": "^14",
     "@types/react": "^17",
@@ -51,12 +53,13 @@
     "@types/react-router": "^5.1.16",
     "@types/react-router-dom": "^5.1.8",
     "typescript": "^4",
-    "@modern-js/core": "^1.2.1-rc.0",
-    "@modern-js/plugin-testing": "^1.2.2",
-    "@modern-js/module-tools": "^1.1.4"
+    "@modern-js/core": "^1.3.0",
+    "@scripts/build": "0.0.0",
+    "jest": "^27",
+    "@scripts/jest-config": "0.0.0"
   },
   "peerDependencies": {
-    "@modern-js/core": "^1.2.1-rc.0"
+    "@modern-js/core": "^1.3.0"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -66,13 +69,14 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/types/index.d.ts"
   },
   "scripts": {
     "new": "modern new",
     "build": "modern build",
     "dev": "modern build --watch",
-    "test": "modern test --passWithNoTests"
+    "test": "jest --passWithNoTests"
   },
   "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/src/server/process.ts

@@ -4,9 +4,9 @@ import portfinder from 'portfinder';
 import { NormalizedConfig } from '@modern-js/core';
 import { compatRequire } from '@modern-js/utils';
 import { makeRender } from '../libs/make';
+import { SsgRoute } from '../types';
 import { compile as createRender } from './prerender';
 import { CLOSE_SIGN } from './consts';
-import { SsgRoute } from '@/types';
 
 type Then<T> = T extends PromiseLike<infer U> ? U : T;
 
@@ -66,8 +66,12 @@ process.on('message', async (chunk: string) => {
         throw err;
       }
 
+      if (!modernServer) {
+        return;
+      }
+
       // get server handler, render to ssr
-      const render = createRender(modernServer!.getRequestHandler());
+      const render = createRender(modernServer.getRequestHandler());
       const renderPromiseAry = makeRender(
         routes.filter(route => !route.isApi) as SsgRoute[],
         render,
@@ -81,7 +85,7 @@ process.on('message', async (chunk: string) => {
         process.send!(null);
       });
 
-      modernServer!.close();
+      modernServer.close();
     });
   } catch (e) {
     modernServer?.close();

package/tests/index.test.ts

@@ -0,0 +1,7 @@
+import plugin from '../src';
+
+describe('plugin-ssg', () => {
+  it('default', () => {
+    expect(plugin).toBeDefined();
+  });
+});

package/tests/lib.test.ts

@@ -1,8 +1,8 @@
 import fs from 'fs';
 import path from 'path';
 import { ServerRoute as ModernRoute } from '@modern-js/types';
-import { exist, replaceRoute } from '@/libs/replace';
-import { makeRoute } from '@/libs/make';
+import { exist, replaceRoute } from '../src/libs/replace';
+import { makeRoute } from '../src/libs/make';
 
 describe('test functional function', () => {
   it('should check route exist correctly', () => {

package/tests/tsconfig.json

@@ -4,9 +4,7 @@
     "declaration": false,
     "jsx": "preserve",
     "baseUrl": "./",
-    "paths": {
-      "@/*": ["../src/*"]
-    },
+    "paths": {},
     "esModuleInterop": true
   }
 }

package/tests/util.test.ts

@@ -6,7 +6,7 @@ import {
   getOutput,
   replaceWithAlias,
   standardOptions,
-} from '@/libs/util';
+} from '../src/libs/util';
 
 describe('test ssg util function', () => {
   it('should return format path correctly', () => {

package/tsconfig.json

@@ -4,9 +4,7 @@
     "declaration": false,
     "jsx": "preserve",
     "baseUrl": "./",
-    "paths": {
-      "@/*": ["./src/*"]
-    },
+    "paths": {},
     "esModuleInterop": true
   },
   "include": ["src"]