@modern-js/utils 1.0.0-rc.11 → 1.0.0-rc.15

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @modern-js/utils
 
+## 1.0.0-rc.15
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 30ac27c: feat: add generator package description
+- 204c626: feat: initial
+
+## 1.0.0-rc.14
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 204c626: feat: initial
+
+## 1.0.0-rc.13
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 204c626: feat: initial
+
+## 1.0.0-rc.12
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 204c626: feat: initial
+
 ## 1.0.0-rc.11
 
 ### Patch Changes

package/README.md

@@ -3,30 +3,22 @@
   <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>
 </p>
 
-<p align="center">现代 Web 工程体系</p>
+<p align="center">
+现代 Web 工程体系
+<br/>
+<a href="https://modernjs.dev" target="blank">
+modernjs.dev
+</a>
+</p>
+
 
-## 背景
+## 参考链接
 - [迈入现代 Web 开发](https://zhuanlan.zhihu.com/p/386607009)
 - [现代 Web 开发者问卷调查报告](https://zhuanlan.zhihu.com/p/403206195)
+- [字节跳动是如何落地微前端的](https://mp.weixin.qq.com/s/L9wbfNG5fTXF5bx7dcgj4Q)
 
-## 计划
-
-Modern.js 的 1.0.0.rc 版已经发到 npm，目前在做测试改进，README 文档之后统一提供（现阶段加入测试和开发，可以发 [issue](https://github.com/modern-js-dev/modern.js/issues) 留微信联系），完整的文档站计划在10月14日上线
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+## 近期计划
 
+Modern.js 的 1.0.0.rc 版已经发到 npm，目前在做测试改进和文档建设。
 
+README、完整的文档站、介绍等，都计划在 10 月 27 日上线。

package/dist/js/modern/alias.js

@@ -1,3 +1,9 @@
+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; }
+
+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; }
+
+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; }
+
 import fs from 'fs';
 import path from 'path';
 import chalk from 'chalk';
@@ -50,7 +56,7 @@ export const getAlias = (aliasOption, option) => {
     const baseUrl = tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig$compilerOpt = tsconfig.compilerOptions) === null || _tsconfig$compilerOpt === void 0 ? void 0 : _tsconfig$compilerOpt.baseUrl;
     aliasConfig = {
       absoluteBaseUrl: baseUrl ? path.join(option.appDirectory, baseUrl) : option.appDirectory,
-      paths: applyOptionsChain(aliasOption || {}, tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig$compilerOpt2 = tsconfig.compilerOptions) === null || _tsconfig$compilerOpt2 === void 0 ? void 0 : _tsconfig$compilerOpt2.paths),
+      paths: _objectSpread(_objectSpread({}, aliasOption || {}), tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig$compilerOpt2 = tsconfig.compilerOptions) === null || _tsconfig$compilerOpt2 === void 0 ? void 0 : _tsconfig$compilerOpt2.paths),
       isTsPath: true,
       isTsProject
     };

package/dist/js/modern/constants.js

@@ -71,6 +71,9 @@ export const INTERNAL_PLUGINS = {
   '@modern-js/plugin-proxy': {
     cli: '@modern-js/plugin-proxy/cli'
   },
+  '@modern-js/plugin-ssg': {
+    cli: '@modern-js/plugin-ssg/cli'
+  },
   '@modern-js/plugin-bff': {
     cli: '@modern-js/plugin-bff/cli',
     server: '@modern-js/plugin-bff/server'
@@ -178,7 +181,7 @@ export const PLUGIN_SCHEMAS = {
     }
   }],
   '@modern-js/plugin-tailwindcss': [{
-    target: 'tools.tailwind',
+    target: 'tools.tailwindcss',
     schema: {
       typeof: ['object', 'function']
     }

package/dist/js/modern/prettyInstructions.js

@@ -1,5 +1,6 @@
 import os from 'os';
-import chalk from 'chalk'; // TODO: type
+import chalk from 'chalk';
+import { isDev } from "./is"; // TODO: type
 
 // TODO: remove hard code 'main'
 const isSPA = entrypoints => entrypoints.length === 1 && entrypoints[0].entryName === 'main';
@@ -33,13 +34,13 @@ const getAddressUrls = (protocol = 'http', port) => {
   }, []);
 };
 
-export const prettyInstructions = appContext => {
+export const prettyInstructions = (appContext, config) => {
   const {
     entrypoints,
     serverRoutes,
     port
   } = appContext;
-  const urls = getAddressUrls('http', port);
+  const urls = getAddressUrls(config.dev.https && isDev() ? 'https' : 'http', port);
   const routes = serverRoutes.filter(route => route.entryName);
   let message = 'App running at:\n\n';
 

package/dist/js/node/alias.js

@@ -17,6 +17,12 @@ var _applyOptionsChain = require("./applyOptionsChain");
 
 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; }
+
+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; }
+
+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; }
+
 const validAlias = (modernConfig, {
   tsconfigPath
 }) => {
@@ -68,7 +74,7 @@ const getAlias = (aliasOption, option) => {
     const baseUrl = tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig$compilerOpt = tsconfig.compilerOptions) === null || _tsconfig$compilerOpt === void 0 ? void 0 : _tsconfig$compilerOpt.baseUrl;
     aliasConfig = {
       absoluteBaseUrl: baseUrl ? _path.default.join(option.appDirectory, baseUrl) : option.appDirectory,
-      paths: (0, _applyOptionsChain.applyOptionsChain)(aliasOption || {}, tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig$compilerOpt2 = tsconfig.compilerOptions) === null || _tsconfig$compilerOpt2 === void 0 ? void 0 : _tsconfig$compilerOpt2.paths),
+      paths: _objectSpread(_objectSpread({}, aliasOption || {}), tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig$compilerOpt2 = tsconfig.compilerOptions) === null || _tsconfig$compilerOpt2 === void 0 ? void 0 : _tsconfig$compilerOpt2.paths),
       isTsPath: true,
       isTsProject
     };

package/dist/js/node/constants.js

@@ -87,6 +87,9 @@ const INTERNAL_PLUGINS = {
   '@modern-js/plugin-proxy': {
     cli: '@modern-js/plugin-proxy/cli'
   },
+  '@modern-js/plugin-ssg': {
+    cli: '@modern-js/plugin-ssg/cli'
+  },
   '@modern-js/plugin-bff': {
     cli: '@modern-js/plugin-bff/cli',
     server: '@modern-js/plugin-bff/server'
@@ -195,7 +198,7 @@ const PLUGIN_SCHEMAS = {
     }
   }],
   '@modern-js/plugin-tailwindcss': [{
-    target: 'tools.tailwind',
+    target: 'tools.tailwindcss',
     schema: {
       typeof: ['object', 'function']
     }

package/dist/js/node/prettyInstructions.js

@@ -9,6 +9,8 @@ var _os = _interopRequireDefault(require("os"));
 
 var _chalk = _interopRequireDefault(require("chalk"));
 
+var _is = require("./is");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // TODO: remove hard code 'main'
@@ -44,13 +46,13 @@ const getAddressUrls = (protocol = 'http', port) => {
   }, []);
 };
 
-const prettyInstructions = appContext => {
+const prettyInstructions = (appContext, config) => {
   const {
     entrypoints,
     serverRoutes,
     port
   } = appContext;
-  const urls = getAddressUrls('http', port);
+  const urls = getAddressUrls(config.dev.https && (0, _is.isDev)() ? 'https' : 'http', port);
   const routes = serverRoutes.filter(route => route.entryName);
   let message = 'App running at:\n\n';
 

package/dist/js/treeshaking/alias.js

@@ -1,3 +1,9 @@
+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; }
+
+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; }
+
+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; }
+
 import fs from 'fs';
 import path from 'path';
 import chalk from 'chalk';
@@ -45,7 +51,7 @@ export var getAlias = function getAlias(aliasOption, option) {
     var baseUrl = tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig$compilerOpt = tsconfig.compilerOptions) === null || _tsconfig$compilerOpt === void 0 ? void 0 : _tsconfig$compilerOpt.baseUrl;
     aliasConfig = {
       absoluteBaseUrl: baseUrl ? path.join(option.appDirectory, baseUrl) : option.appDirectory,
-      paths: applyOptionsChain(aliasOption || {}, tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig$compilerOpt2 = tsconfig.compilerOptions) === null || _tsconfig$compilerOpt2 === void 0 ? void 0 : _tsconfig$compilerOpt2.paths),
+      paths: _objectSpread(_objectSpread({}, aliasOption || {}), tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig$compilerOpt2 = tsconfig.compilerOptions) === null || _tsconfig$compilerOpt2 === void 0 ? void 0 : _tsconfig$compilerOpt2.paths),
       isTsPath: true,
       isTsProject: isTsProject
     };

package/dist/js/treeshaking/constants.js

@@ -73,6 +73,9 @@ export var INTERNAL_PLUGINS = {
   '@modern-js/plugin-proxy': {
     cli: '@modern-js/plugin-proxy/cli'
   },
+  '@modern-js/plugin-ssg': {
+    cli: '@modern-js/plugin-ssg/cli'
+  },
   '@modern-js/plugin-bff': {
     cli: '@modern-js/plugin-bff/cli',
     server: '@modern-js/plugin-bff/server'
@@ -178,7 +181,7 @@ export var PLUGIN_SCHEMAS = {
     }
   }],
   '@modern-js/plugin-tailwindcss': [{
-    target: 'tools.tailwind',
+    target: 'tools.tailwindcss',
     schema: {
       "typeof": ['object', 'function']
     }

package/dist/js/treeshaking/prettyInstructions.js

@@ -11,7 +11,8 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 import os from 'os';
-import chalk from 'chalk'; // TODO: type
+import chalk from 'chalk';
+import { isDev } from "./is"; // TODO: type
 
 // TODO: remove hard code 'main'
 var isSPA = function isSPA(entrypoints) {
@@ -51,12 +52,12 @@ var getAddressUrls = function getAddressUrls() {
   }, []);
 };
 
-export var prettyInstructions = function prettyInstructions(appContext) {
+export var prettyInstructions = function prettyInstructions(appContext, config) {
   var _ref = appContext,
       entrypoints = _ref.entrypoints,
       serverRoutes = _ref.serverRoutes,
       port = _ref.port;
-  var urls = getAddressUrls('http', port);
+  var urls = getAddressUrls(config.dev.https && isDev() ? 'https' : 'http', port);
   var routes = serverRoutes.filter(function (route) {
     return route.entryName;
   });

package/dist/types/prettyInstructions.d.ts

@@ -1 +1 @@
-export declare const prettyInstructions: (appContext: any) => string;
+export declare const prettyInstructions: (appContext: any, config: any) => string;

package/package.json

@@ -1,72 +1,72 @@
 {
-	"name": "@modern-js/utils",
-	"version": "1.0.0-rc.11",
-	"jsnext:source": "./src/index.ts",
-	"types": "./dist/types/index.d.ts",
-	"main": "./dist/js/node/index.js",
-	"module": "./dist/js/treeshaking/index.js",
-	"jsnext:modern": "./dist/js/modern/index.js",
-	"exports": {
-		".": {
-			"node": {
-				"import": "./dist/js/modern/index.js",
-				"require": "./dist/js/node/index.js"
-			},
-			"default": "./dist/js/treeshaking/index.js"
-		},
-		"./formatWebpackMessages": "./dist/js/treeshaking/formatWebpackMessages.js",
-		"./constants": "./dist/js/treeshaking/constants.js"
-	},
-	"typesVersions": {
-		"*": {
-			"formatWebpackMessages": [
-				"./dist/types/formatWebpackMessages.d.ts"
-			],
-			"constants": [
-				"./dist/types/constants.d.ts"
-			]
-		}
-	},
-	"dependencies": {
-		"@babel/runtime": "^7",
-		"@types/fs-extra": "^9.0.12",
-		"browserslist": "^4.16.7",
-		"chalk": "^4.1.2",
-		"chokidar": "^3.5.2",
-		"debug": "^4.3.2",
-		"filesize": "^7.0.0",
-		"fs-extra": "^10.0.0",
-		"glob": "^7.1.7",
-		"gzip-size": "^6.0.0",
-		"import-lazy": "^4.0.0",
-		"pkg-up": "^3.1.0",
-		"recursive-readdir": "^2.2.2",
-		"strip-ansi": "6.0.0",
-		"yaml": "^1.10.2"
-	},
-	"devDependencies": {
-		"@types/debug": "^4.1.7",
-		"@types/fs-extra": "^9.0.12",
-		"@types/glob": "^7.1.4",
-		"@types/jest": "^26",
-		"@types/node": "^14",
-		"@types/recursive-readdir": "^2.2.0",
-		"typescript": "^4",
-		"webpack": "^5.54.0",
-		"@modern-js/plugin-testing": "^1.0.0-rc.11",
-		"@modern-js/module-tools": "^1.0.0-rc.11"
-	},
-	"peerDependencies": {
-		"typescript": "^4.4.3"
-	},
-	"sideEffects": false,
-	"publishConfig": {
-		"registry": "https://registry.npmjs.org/",
-		"access": "public"
-	},
-	"scripts": {
-		"new": "modern new",
-		"build": "modern build",
-		"test": "modern test --passWithNoTests"
-	}
-}
+  "name": "@modern-js/utils",
+  "version": "1.0.0-rc.15",
+  "jsnext:source": "./src/index.ts",
+  "types": "./dist/types/index.d.ts",
+  "main": "./dist/js/node/index.js",
+  "module": "./dist/js/treeshaking/index.js",
+  "jsnext:modern": "./dist/js/modern/index.js",
+  "exports": {
+    ".": {
+      "node": {
+        "import": "./dist/js/modern/index.js",
+        "require": "./dist/js/node/index.js"
+      },
+      "default": "./dist/js/treeshaking/index.js"
+    },
+    "./formatWebpackMessages": "./dist/js/treeshaking/formatWebpackMessages.js",
+    "./constants": "./dist/js/treeshaking/constants.js"
+  },
+  "typesVersions": {
+    "*": {
+      "formatWebpackMessages": [
+        "./dist/types/formatWebpackMessages.d.ts"
+      ],
+      "constants": [
+        "./dist/types/constants.d.ts"
+      ]
+    }
+  },
+  "dependencies": {
+    "@babel/runtime": "^7",
+    "@types/fs-extra": "^9.0.12",
+    "browserslist": "^4.16.7",
+    "chalk": "^4.1.2",
+    "chokidar": "^3.5.2",
+    "debug": "^4.3.2",
+    "filesize": "^7.0.0",
+    "fs-extra": "^10.0.0",
+    "glob": "^7.1.7",
+    "gzip-size": "^6.0.0",
+    "import-lazy": "^4.0.0",
+    "pkg-up": "^3.1.0",
+    "recursive-readdir": "^2.2.2",
+    "strip-ansi": "6.0.0",
+    "yaml": "^1.10.2"
+  },
+  "devDependencies": {
+    "@types/debug": "^4.1.7",
+    "@types/fs-extra": "^9.0.12",
+    "@types/glob": "^7.1.4",
+    "@types/jest": "^26",
+    "@types/node": "^14",
+    "@types/recursive-readdir": "^2.2.0",
+    "typescript": "^4",
+    "webpack": "^5.54.0",
+    "@modern-js/plugin-testing": "^1.0.0-rc.15",
+    "@modern-js/module-tools": "^1.0.0-rc.15"
+  },
+  "peerDependencies": {
+    "typescript": "^4.4.3"
+  },
+  "sideEffects": false,
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/",
+    "access": "public"
+  },
+  "scripts": {
+    "new": "modern new",
+    "build": "modern build",
+    "test": "modern test --passWithNoTests"
+  }
+}

package/src/alias.ts

@@ -69,10 +69,10 @@ export const getAlias = (
       absoluteBaseUrl: baseUrl
         ? path.join(option.appDirectory, baseUrl)
         : option.appDirectory,
-      paths: applyOptionsChain(
-        aliasOption || {},
-        tsconfig?.compilerOptions?.paths,
-      ),
+      paths: {
+        ...(aliasOption || {}),
+        ...tsconfig?.compilerOptions?.paths,
+      },
       isTsPath: true,
       isTsProject,
     };

package/src/constants.ts

@@ -57,6 +57,7 @@ export const INTERNAL_PLUGINS: {
   '@modern-js/plugin-sass': { cli: '@modern-js/plugin-sass/cli' },
   '@modern-js/plugin-esbuild': { cli: '@modern-js/plugin-esbuild/cli' },
   '@modern-js/plugin-proxy': { cli: '@modern-js/plugin-proxy/cli' },
+  '@modern-js/plugin-ssg': { cli: '@modern-js/plugin-ssg/cli' },
   '@modern-js/plugin-bff': {
     cli: '@modern-js/plugin-bff/cli',
     server: '@modern-js/plugin-bff/server',
@@ -144,7 +145,7 @@ export const PLUGIN_SCHEMAS = {
   ],
   '@modern-js/plugin-tailwindcss': [
     {
-      target: 'tools.tailwind',
+      target: 'tools.tailwindcss',
       schema: { typeof: ['object', 'function'] },
     },
     {

package/src/prettyInstructions.ts

@@ -1,5 +1,6 @@
 import os from 'os';
 import chalk from 'chalk';
+import { isDev } from './is';
 
 // TODO: type
 interface EntryPoint {
@@ -45,14 +46,17 @@ const getAddressUrls = (protocol = 'http', port: number) => {
   );
 };
 
-export const prettyInstructions = (appContext: any) => {
+export const prettyInstructions = (appContext: any, config: any) => {
   const { entrypoints, serverRoutes, port } = appContext as {
     entrypoints: EntryPoint[];
     serverRoutes: ServerRoute[];
     port: number;
   };
 
-  const urls = getAddressUrls('http', port);
+  const urls = getAddressUrls(
+    config.dev.https && isDev() ? 'https' : 'http',
+    port,
+  );
 
   const routes = serverRoutes.filter(route => route.entryName);