@modern-js/plugin-ssg 1.1.1 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +34 -0
- package/dist/js/modern/index.js +2 -2
- package/dist/js/modern/libs/make.js +4 -4
- package/dist/js/modern/libs/replace.js +2 -2
- package/dist/js/modern/server/index.js +2 -2
- package/dist/js/modern/server/prerender.js +2 -2
- package/dist/js/modern/server/process.js +4 -0
- package/dist/js/modern/types.js +0 -1
- package/dist/js/node/index.js +2 -2
- package/dist/js/node/libs/make.js +4 -4
- package/dist/js/node/libs/replace.js +2 -2
- package/dist/js/node/server/index.js +2 -2
- package/dist/js/node/server/prerender.js +2 -2
- package/dist/js/node/server/process.js +4 -0
- package/dist/types/libs/make.d.ts +1 -1
- package/dist/types/libs/replace.d.ts +1 -1
- package/dist/types/libs/util.d.ts +1 -1
- package/dist/types/server/index.d.ts +1 -1
- package/dist/types/types.d.ts +1 -1
- package/jest.config.js +8 -0
- package/package.json +16 -10
- package/src/index.ts +8 -4
- package/src/libs/make.ts +3 -3
- package/src/libs/output.ts +1 -1
- package/src/libs/replace.ts +1 -1
- package/src/libs/util.ts +2 -2
- package/src/server/index.ts +2 -2
- package/src/server/process.ts +9 -4
- package/src/types.ts +1 -1
- package/tests/index.test.ts +7 -0
- package/tests/lib.test.ts +3 -3
- package/tests/tsconfig.json +1 -3
- package/tests/util.test.ts +1 -1
- package/tsconfig.json +1 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,39 @@
|
|
|
1
1
|
# @modern-js/plugin-ssg
|
|
2
2
|
|
|
3
|
+
## 1.2.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- cfe11628: Make Modern.js self bootstraping
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- Updated dependencies [2da09c69]
|
|
12
|
+
- Updated dependencies [fc71e36f]
|
|
13
|
+
- Updated dependencies [c3d46ee4]
|
|
14
|
+
- Updated dependencies [cfe11628]
|
|
15
|
+
- @modern-js/utils@1.2.0
|
|
16
|
+
- @modern-js/core@1.3.0
|
|
17
|
+
|
|
18
|
+
## 1.1.2
|
|
19
|
+
|
|
20
|
+
### Patch Changes
|
|
21
|
+
|
|
22
|
+
- d73ff455: support multi process product
|
|
23
|
+
- d73ff455: support multi process product
|
|
24
|
+
- d73ff455: support multi process product
|
|
25
|
+
- d73ff455: support multi process product
|
|
26
|
+
- d73ff455: support multi process product
|
|
27
|
+
- Updated dependencies [d927bc83]
|
|
28
|
+
- Updated dependencies [d73ff455]
|
|
29
|
+
- Updated dependencies [9c1ab865]
|
|
30
|
+
- Updated dependencies [d73ff455]
|
|
31
|
+
- Updated dependencies [d73ff455]
|
|
32
|
+
- Updated dependencies [d73ff455]
|
|
33
|
+
- Updated dependencies [d73ff455]
|
|
34
|
+
- @modern-js/utils@1.1.4
|
|
35
|
+
- @modern-js/core@1.1.4
|
|
36
|
+
|
|
3
37
|
## 1.1.1
|
|
4
38
|
|
|
5
39
|
### Patch Changes
|
package/dist/js/modern/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
1
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
2
2
|
|
|
3
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
|
|
5
5
|
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; }
|
|
6
6
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
1
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
2
2
|
|
|
3
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
|
|
5
5
|
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; }
|
|
6
6
|
|
|
@@ -23,13 +23,13 @@ export function makeRoute(baseRoute, route, headers = {}) {
|
|
|
23
23
|
|
|
24
24
|
if (typeof route === 'string') {
|
|
25
25
|
return _objectSpread(_objectSpread({}, baseRoute), {}, {
|
|
26
|
-
urlPath: normalize(`${urlPath}${route}`),
|
|
26
|
+
urlPath: normalize(`${urlPath}${route}`) || '/',
|
|
27
27
|
headers,
|
|
28
28
|
output: path.join(entryPath, `..${route}`)
|
|
29
29
|
});
|
|
30
30
|
} else {
|
|
31
31
|
return _objectSpread(_objectSpread({}, baseRoute), {}, {
|
|
32
|
-
urlPath: normalize(`${urlPath}${route.url}`),
|
|
32
|
+
urlPath: normalize(`${urlPath}${route.url}`) || '/',
|
|
33
33
|
headers: _objectSpread(_objectSpread({}, headers), route.headers),
|
|
34
34
|
output: route.output ? path.normalize(route.output) : path.join(entryPath, `..${route.url}`)
|
|
35
35
|
});
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
const _excluded = ["output", "headers"];
|
|
2
2
|
|
|
3
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
3
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
4
4
|
|
|
5
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
5
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
6
6
|
|
|
7
7
|
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; }
|
|
8
8
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
1
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
2
2
|
|
|
3
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
|
|
5
5
|
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; }
|
|
6
6
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
1
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
2
2
|
|
|
3
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
|
|
5
5
|
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; }
|
|
6
6
|
|
package/dist/js/modern/types.js
CHANGED
package/dist/js/node/index.js
CHANGED
|
@@ -25,9 +25,9 @@ var _make = require("./libs/make");
|
|
|
25
25
|
|
|
26
26
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
27
27
|
|
|
28
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
28
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
29
29
|
|
|
30
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
30
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
31
31
|
|
|
32
32
|
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; }
|
|
33
33
|
|
|
@@ -12,9 +12,9 @@ var _normalizePath = _interopRequireDefault(require("normalize-path"));
|
|
|
12
12
|
|
|
13
13
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
14
14
|
|
|
15
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
15
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
16
16
|
|
|
17
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
17
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
18
18
|
|
|
19
19
|
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; }
|
|
20
20
|
|
|
@@ -36,13 +36,13 @@ function makeRoute(baseRoute, route, headers = {}) {
|
|
|
36
36
|
|
|
37
37
|
if (typeof route === 'string') {
|
|
38
38
|
return _objectSpread(_objectSpread({}, baseRoute), {}, {
|
|
39
|
-
urlPath: (0, _normalizePath.default)(`${urlPath}${route}`),
|
|
39
|
+
urlPath: (0, _normalizePath.default)(`${urlPath}${route}`) || '/',
|
|
40
40
|
headers,
|
|
41
41
|
output: _path.default.join(entryPath, `..${route}`)
|
|
42
42
|
});
|
|
43
43
|
} else {
|
|
44
44
|
return _objectSpread(_objectSpread({}, baseRoute), {}, {
|
|
45
|
-
urlPath: (0, _normalizePath.default)(`${urlPath}${route.url}`),
|
|
45
|
+
urlPath: (0, _normalizePath.default)(`${urlPath}${route.url}`) || '/',
|
|
46
46
|
headers: _objectSpread(_objectSpread({}, headers), route.headers),
|
|
47
47
|
output: route.output ? _path.default.normalize(route.output) : _path.default.join(entryPath, `..${route.url}`)
|
|
48
48
|
});
|
|
@@ -12,9 +12,9 @@ const _excluded = ["output", "headers"];
|
|
|
12
12
|
|
|
13
13
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
14
14
|
|
|
15
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
15
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
16
16
|
|
|
17
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
17
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
18
18
|
|
|
19
19
|
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; }
|
|
20
20
|
|
|
@@ -17,9 +17,9 @@ var _consts = require("./consts");
|
|
|
17
17
|
|
|
18
18
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
19
19
|
|
|
20
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
20
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
21
21
|
|
|
22
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
22
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
23
23
|
|
|
24
24
|
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; }
|
|
25
25
|
|
|
@@ -13,9 +13,9 @@ var _nodeMocksHttp = _interopRequireDefault(require("node-mocks-http"));
|
|
|
13
13
|
|
|
14
14
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
15
15
|
|
|
16
|
-
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object);
|
|
16
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
17
17
|
|
|
18
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]
|
|
18
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
19
19
|
|
|
20
20
|
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; }
|
|
21
21
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ModernRoute } from '@modern-js/
|
|
1
|
+
import { ServerRoute as ModernRoute } from '@modern-js/types';
|
|
2
2
|
import { compile } from '../server/prerender';
|
|
3
3
|
import { RouteOptions, SsgRoute } from '../types';
|
|
4
4
|
export declare function makeRender(ssgRoutes: SsgRoute[], render: ReturnType<typeof compile>, port: number): Promise<string>[];
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ModernRoute } from '@modern-js/
|
|
1
|
+
import { ServerRoute as ModernRoute } from '@modern-js/types';
|
|
2
2
|
import { SsgRoute } from '../types';
|
|
3
3
|
export declare function exist(route: ModernRoute, pageRoutes: ModernRoute[]): number;
|
|
4
4
|
export declare function replaceRoute(ssgRoutes: SsgRoute[], pageRoutes: ModernRoute[]): ModernRoute[];
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ModernRoute } from '@modern-js/
|
|
1
|
+
import { ServerRoute as ModernRoute } from '@modern-js/types';
|
|
2
2
|
import { EntryPoint, MultiEntryOptions, SSG, SsgRoute } from '../types';
|
|
3
3
|
export declare function formatOutput(filename: string): string;
|
|
4
4
|
export declare function formatPath(str: string): string;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { NormalizedConfig } from '@modern-js/core';
|
|
2
|
-
import { ModernRoute } from '@modern-js/
|
|
2
|
+
import { ServerRoute as ModernRoute } from '@modern-js/types';
|
|
3
3
|
import { SsgRoute } from '../types';
|
|
4
4
|
export declare const createServer: (ssgRoutes: SsgRoute[], apiRoutes: ModernRoute[], options: NormalizedConfig, appDirectory: string) => Promise<string[]>;
|
package/dist/types/types.d.ts
CHANGED
package/jest.config.js
ADDED
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"modern",
|
|
12
12
|
"modern.js"
|
|
13
13
|
],
|
|
14
|
-
"version": "1.
|
|
14
|
+
"version": "1.2.0",
|
|
15
15
|
"jsnext:source": "./src/index.ts",
|
|
16
16
|
"types": "./dist/types/index.d.ts",
|
|
17
17
|
"main": "./dist/js/node/index.js",
|
|
@@ -20,12 +20,14 @@
|
|
|
20
20
|
"exports": {
|
|
21
21
|
".": {
|
|
22
22
|
"node": {
|
|
23
|
+
"jsnext:source": "./src/index.ts",
|
|
23
24
|
"import": "./dist/js/modern/index.js",
|
|
24
25
|
"require": "./dist/js/node/index.js"
|
|
25
26
|
},
|
|
26
27
|
"default": "./dist/js/treeshaking/index.js"
|
|
27
28
|
},
|
|
28
29
|
"./cli": {
|
|
30
|
+
"jsnext:source": "./src/index.ts",
|
|
29
31
|
"node": {
|
|
30
32
|
"import": "./dist/js/modern/index.js",
|
|
31
33
|
"require": "./dist/js/node/index.js"
|
|
@@ -35,14 +37,15 @@
|
|
|
35
37
|
},
|
|
36
38
|
"dependencies": {
|
|
37
39
|
"@babel/runtime": "^7",
|
|
38
|
-
"@modern-js/utils": "^1.
|
|
40
|
+
"@modern-js/utils": "^1.2.0",
|
|
39
41
|
"node-mocks-http": "^1.10.1",
|
|
40
42
|
"normalize-path": "^3.0.0",
|
|
41
43
|
"portfinder": "^1.0.28",
|
|
42
44
|
"react-router-dom": "^5.2.1"
|
|
43
45
|
},
|
|
44
46
|
"devDependencies": {
|
|
45
|
-
"@modern-js/server": "^1.
|
|
47
|
+
"@modern-js/server": "^1.3.0",
|
|
48
|
+
"@modern-js/types": "^1.2.0",
|
|
46
49
|
"@types/jest": "^26",
|
|
47
50
|
"@types/node": "^14",
|
|
48
51
|
"@types/react": "^17",
|
|
@@ -50,12 +53,13 @@
|
|
|
50
53
|
"@types/react-router": "^5.1.16",
|
|
51
54
|
"@types/react-router-dom": "^5.1.8",
|
|
52
55
|
"typescript": "^4",
|
|
53
|
-
"@modern-js/core": "^1.
|
|
54
|
-
"@
|
|
55
|
-
"
|
|
56
|
+
"@modern-js/core": "^1.3.0",
|
|
57
|
+
"@scripts/build": "0.0.0",
|
|
58
|
+
"jest": "^27",
|
|
59
|
+
"@scripts/jest-config": "0.0.0"
|
|
56
60
|
},
|
|
57
61
|
"peerDependencies": {
|
|
58
|
-
"@modern-js/core": "^1.
|
|
62
|
+
"@modern-js/core": "^1.3.0"
|
|
59
63
|
},
|
|
60
64
|
"sideEffects": false,
|
|
61
65
|
"modernConfig": {
|
|
@@ -65,12 +69,14 @@
|
|
|
65
69
|
},
|
|
66
70
|
"publishConfig": {
|
|
67
71
|
"registry": "https://registry.npmjs.org/",
|
|
68
|
-
"access": "public"
|
|
72
|
+
"access": "public",
|
|
73
|
+
"types": "./dist/types/index.d.ts"
|
|
69
74
|
},
|
|
70
75
|
"scripts": {
|
|
71
76
|
"new": "modern new",
|
|
72
77
|
"build": "modern build",
|
|
73
78
|
"dev": "modern build --watch",
|
|
74
|
-
"test": "
|
|
75
|
-
}
|
|
79
|
+
"test": "jest --passWithNoTests"
|
|
80
|
+
},
|
|
81
|
+
"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"
|
|
76
82
|
}
|
package/src/index.ts
CHANGED
|
@@ -86,8 +86,8 @@ export default createPlugin(
|
|
|
86
86
|
// each route will try to match the configuration
|
|
87
87
|
pageRoutes.forEach(pageRoute => {
|
|
88
88
|
const { entryName, entryPath } = pageRoute;
|
|
89
|
-
const agreedRoutes = agreedRouteMap[entryName];
|
|
90
|
-
let entryOptions = intermediateOptions[entryName];
|
|
89
|
+
const agreedRoutes = agreedRouteMap[entryName as string];
|
|
90
|
+
let entryOptions = intermediateOptions[entryName as string];
|
|
91
91
|
|
|
92
92
|
if (!agreedRoutes) {
|
|
93
93
|
// default behavior for non-agreed route
|
|
@@ -169,12 +169,16 @@ export default createPlugin(
|
|
|
169
169
|
|
|
170
170
|
if (isOriginRoute) {
|
|
171
171
|
throw new Error(
|
|
172
|
-
`ssg can not using with ssr,url - ${
|
|
172
|
+
`ssg can not using with ssr,url - ${
|
|
173
|
+
ssgRoute.urlPath
|
|
174
|
+
}, entry - ${ssgRoute.entryName!} `,
|
|
173
175
|
);
|
|
174
176
|
}
|
|
175
177
|
|
|
176
178
|
logger.warn(
|
|
177
|
-
`new ssg route ${
|
|
179
|
+
`new ssg route ${
|
|
180
|
+
ssgRoute.urlPath
|
|
181
|
+
} is using ssr now,maybe from parent route ${ssgRoute.entryName!},close ssr`,
|
|
178
182
|
);
|
|
179
183
|
}
|
|
180
184
|
ssgRoute.isSSR = false;
|
package/src/libs/make.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
|
-
import { ModernRoute } from '@modern-js/
|
|
2
|
+
import { ServerRoute as ModernRoute } from '@modern-js/types';
|
|
3
3
|
import normalize from 'normalize-path';
|
|
4
4
|
import { compile } from '../server/prerender';
|
|
5
5
|
import { RouteOptions, SsgRoute } from '../types';
|
|
@@ -28,14 +28,14 @@ export function makeRoute(
|
|
|
28
28
|
if (typeof route === 'string') {
|
|
29
29
|
return {
|
|
30
30
|
...baseRoute,
|
|
31
|
-
urlPath: normalize(`${urlPath}${route}`),
|
|
31
|
+
urlPath: normalize(`${urlPath}${route}`) || '/',
|
|
32
32
|
headers,
|
|
33
33
|
output: path.join(entryPath, `..${route}`),
|
|
34
34
|
};
|
|
35
35
|
} else {
|
|
36
36
|
return {
|
|
37
37
|
...baseRoute,
|
|
38
|
-
urlPath: normalize(`${urlPath}${route.url}`),
|
|
38
|
+
urlPath: normalize(`${urlPath}${route.url}`) || '/',
|
|
39
39
|
headers: { ...headers, ...route.headers },
|
|
40
40
|
output: route.output
|
|
41
41
|
? path.normalize(route.output)
|
package/src/libs/output.ts
CHANGED
|
@@ -9,7 +9,7 @@ export function writeHtmlFile(
|
|
|
9
9
|
) {
|
|
10
10
|
htmlAry.forEach((html: any, index: number) => {
|
|
11
11
|
const ssgRoute = ssgRoutes[index];
|
|
12
|
-
const filepath = path.join(baseDir, ssgRoute.output
|
|
12
|
+
const filepath = path.join(baseDir, ssgRoute.output);
|
|
13
13
|
if (!fs.existsSync(path.dirname(filepath))) {
|
|
14
14
|
fs.ensureDirSync(path.dirname(filepath));
|
|
15
15
|
}
|
package/src/libs/replace.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import normalize from 'normalize-path';
|
|
2
|
-
import { ModernRoute } from '@modern-js/
|
|
2
|
+
import { ServerRoute as ModernRoute } from '@modern-js/types';
|
|
3
3
|
import { SsgRoute } from '../types';
|
|
4
4
|
|
|
5
5
|
export function exist(route: ModernRoute, pageRoutes: ModernRoute[]): number {
|
package/src/libs/util.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
2
|
import { ROUTE_SPEC_FILE, fs, isSingleEntry } from '@modern-js/utils';
|
|
3
|
-
import { ModernRoute } from '@modern-js/
|
|
3
|
+
import { ServerRoute as ModernRoute } from '@modern-js/types';
|
|
4
4
|
import { EntryPoint, MultiEntryOptions, SSG, SsgRoute } from '../types';
|
|
5
5
|
|
|
6
6
|
export function formatOutput(filename: string) {
|
|
@@ -51,7 +51,7 @@ export function getUrlPrefix(route: SsgRoute, baseUrl: string | string[]) {
|
|
|
51
51
|
|
|
52
52
|
base = base === '/' ? '' : base;
|
|
53
53
|
const entryName = route.entryName === 'main' ? '' : route.entryName;
|
|
54
|
-
const prefix = `${base}/${entryName}`;
|
|
54
|
+
const prefix = `${base}/${entryName as string}`;
|
|
55
55
|
return prefix.endsWith('/') ? prefix.slice(0, -1) : prefix;
|
|
56
56
|
}
|
|
57
57
|
|
package/src/server/index.ts
CHANGED
|
@@ -2,7 +2,7 @@ import childProcess from 'child_process';
|
|
|
2
2
|
import path from 'path';
|
|
3
3
|
import { logger, SERVER_BUNDLE_DIRECTORY } from '@modern-js/utils';
|
|
4
4
|
import { NormalizedConfig, useAppContext } from '@modern-js/core';
|
|
5
|
-
import { ModernRoute } from '@modern-js/
|
|
5
|
+
import { ServerRoute as ModernRoute } from '@modern-js/types';
|
|
6
6
|
import { SsgRoute } from '../types';
|
|
7
7
|
import { CLOSE_SIGN } from './consts';
|
|
8
8
|
|
|
@@ -18,7 +18,7 @@ export const createServer = (
|
|
|
18
18
|
const backup: ModernRoute[] = ssgRoutes.map(ssgRoute => ({
|
|
19
19
|
...ssgRoute,
|
|
20
20
|
isSSR: true,
|
|
21
|
-
bundle: `${SERVER_BUNDLE_DIRECTORY}/${ssgRoute.entryName}.js`,
|
|
21
|
+
bundle: `${SERVER_BUNDLE_DIRECTORY}/${ssgRoute.entryName as string}.js`,
|
|
22
22
|
}));
|
|
23
23
|
|
|
24
24
|
const total = backup.concat(apiRoutes);
|
package/src/server/process.ts
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import Server
|
|
1
|
+
import Server from '@modern-js/server';
|
|
2
|
+
import { ServerRoute as ModernRoute } from '@modern-js/types';
|
|
2
3
|
import portfinder from 'portfinder';
|
|
3
4
|
import { NormalizedConfig } from '@modern-js/core';
|
|
4
5
|
import { compatRequire } from '@modern-js/utils';
|
|
5
6
|
import { makeRender } from '../libs/make';
|
|
7
|
+
import { SsgRoute } from '../types';
|
|
6
8
|
import { compile as createRender } from './prerender';
|
|
7
9
|
import { CLOSE_SIGN } from './consts';
|
|
8
|
-
import { SsgRoute } from '@/types';
|
|
9
10
|
|
|
10
11
|
type Then<T> = T extends PromiseLike<infer U> ? U : T;
|
|
11
12
|
|
|
@@ -65,8 +66,12 @@ process.on('message', async (chunk: string) => {
|
|
|
65
66
|
throw err;
|
|
66
67
|
}
|
|
67
68
|
|
|
69
|
+
if (!modernServer) {
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
|
|
68
73
|
// get server handler, render to ssr
|
|
69
|
-
const render = createRender(modernServer
|
|
74
|
+
const render = createRender(modernServer.getRequestHandler());
|
|
70
75
|
const renderPromiseAry = makeRender(
|
|
71
76
|
routes.filter(route => !route.isApi) as SsgRoute[],
|
|
72
77
|
render,
|
|
@@ -80,7 +85,7 @@ process.on('message', async (chunk: string) => {
|
|
|
80
85
|
process.send!(null);
|
|
81
86
|
});
|
|
82
87
|
|
|
83
|
-
modernServer
|
|
88
|
+
modernServer.close();
|
|
84
89
|
});
|
|
85
90
|
} catch (e) {
|
|
86
91
|
modernServer?.close();
|
package/src/types.ts
CHANGED
package/tests/lib.test.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import fs from 'fs';
|
|
2
2
|
import path from 'path';
|
|
3
|
-
import { ModernRoute } from '@modern-js/
|
|
4
|
-
import { exist, replaceRoute } from '
|
|
5
|
-
import { makeRoute } from '
|
|
3
|
+
import { ServerRoute as ModernRoute } from '@modern-js/types';
|
|
4
|
+
import { exist, replaceRoute } from '../src/libs/replace';
|
|
5
|
+
import { makeRoute } from '../src/libs/make';
|
|
6
6
|
|
|
7
7
|
describe('test functional function', () => {
|
|
8
8
|
it('should check route exist correctly', () => {
|
package/tests/tsconfig.json
CHANGED
package/tests/util.test.ts
CHANGED