@modern-js/utils 1.1.7-alpha.0 → 1.2.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @modern-js/utils
 
+## 1.2.0
+
+### Minor Changes
+
+- cfe11628: Make Modern.js self bootstraping
+
+### Patch Changes
+
+- 2da09c69: Add "typescript" to the dependency list
+- c3d46ee4: fix: test config invalid
+
 ## 1.1.6
 
 ### Patch Changes

package/dist/js/modern/constants.js

@@ -297,7 +297,7 @@ export const PLUGIN_SCHEMAS = {
   }, {
     target: 'tools.jest',
     schema: {
-      typeof: ['object']
+      typeof: ['object', 'function']
     }
   }],
   '@modern-js/plugin-micro-frontend': [{

package/dist/js/modern/getBrowserslist.js

@@ -1,4 +1,4 @@
-import { loadConfig } from 'browserslist/node';
+import { loadConfig } from 'browserslist';
 export const defaults = ['> 0.01%', 'not dead', 'not op_mini all'];
 export const getBrowserslist = appDirectory => loadConfig({
   path: appDirectory

package/dist/js/modern/prettyInstructions.js

@@ -21,7 +21,7 @@ const getAddressUrls = (protocol = 'http', port) => {
     let type = 'Network:  ';
     let url = `${protocol}://${detail.address}:${port}`;
 
-    if (detail.address.includes(`127.0.0.1`)) {
+    if (detail.address.includes(`localhost`)) {
       type = 'Local:  ';
       url = `${protocol}://localhost:${port}`;
     }

package/dist/js/node/constants.js

@@ -319,7 +319,7 @@ const PLUGIN_SCHEMAS = {
   }, {
     target: 'tools.jest',
     schema: {
-      typeof: ['object']
+      typeof: ['object', 'function']
     }
   }],
   '@modern-js/plugin-micro-frontend': [{

package/dist/js/node/getBrowserslist.js

@@ -5,12 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getBrowserslist = exports.defaults = void 0;
 
-var _node = require("browserslist/node");
+var _browserslist = require("browserslist");
 
 const defaults = ['> 0.01%', 'not dead', 'not op_mini all'];
 exports.defaults = defaults;
 
-const getBrowserslist = appDirectory => (0, _node.loadConfig)({
+const getBrowserslist = appDirectory => (0, _browserslist.loadConfig)({
   path: appDirectory
 }) || defaults;
 

package/dist/js/node/prettyInstructions.js

@@ -35,7 +35,7 @@ const getAddressUrls = (protocol = 'http', port) => {
     let type = 'Network:  ';
     let url = `${protocol}://${detail.address}:${port}`;
 
-    if (detail.address.includes(`127.0.0.1`)) {
+    if (detail.address.includes(`localhost`)) {
       type = 'Local:  ';
       url = `${protocol}://localhost:${port}`;
     }

package/dist/js/treeshaking/constants.js

@@ -297,7 +297,7 @@ export var PLUGIN_SCHEMAS = {
   }, {
     target: 'tools.jest',
     schema: {
-      "typeof": ['object']
+      "typeof": ['object', 'function']
     }
   }],
   '@modern-js/plugin-micro-frontend': [{

package/dist/js/treeshaking/getBrowserslist.js

@@ -1,4 +1,4 @@
-import { loadConfig } from 'browserslist/node';
+import { loadConfig } from 'browserslist';
 export var defaults = ['> 0.01%', 'not dead', 'not op_mini all'];
 export var getBrowserslist = function getBrowserslist(appDirectory) {
   return loadConfig({

package/dist/js/treeshaking/prettyInstructions.js

@@ -39,7 +39,7 @@ var getAddressUrls = function getAddressUrls() {
     var type = 'Network:  ';
     var url = "".concat(protocol, "://").concat(detail.address, ":").concat(port);
 
-    if (detail.address.includes("127.0.0.1")) {
+    if (detail.address.includes("localhost")) {
       type = 'Local:  ';
       url = "".concat(protocol, "://localhost:").concat(port);
     }

package/dist/types/getBrowserslist.d.ts

@@ -1,2 +1,2 @@
 export declare const defaults: string[];
-export declare const getBrowserslist: (appDirectory: string) => any;
+export declare const getBrowserslist: (appDirectory: string) => string[];

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.7-alpha.0",
+  "version": "1.2.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -20,13 +20,20 @@
   "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"
     },
-    "./formatWebpackMessages": "./dist/js/treeshaking/formatWebpackMessages.js",
-    "./constants": "./dist/js/treeshaking/constants.js"
+    "./formatWebpackMessages": {
+      "jsnext:source": "./src/formatWebpackMessages.ts",
+      "default": "./dist/js/treeshaking/formatWebpackMessages.js"
+    },
+    "./constants": {
+      "jsnext:source": "./src/constants.ts",
+      "default": "./dist/js/treeshaking/constants.js"
+    }
   },
   "typesVersions": {
     "*": {
@@ -40,7 +47,6 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "typescript": "^4.4.3",
     "@types/fs-extra": "^9.0.12",
     "browserslist": "^4.16.7",
     "chalk": "^4.1.2",
@@ -56,7 +62,8 @@
     "strip-ansi": "6.0.0",
     "upath": "^2.0.1",
     "yaml": "^1.10.2",
-    "execa": "5"
+    "execa": "5",
+    "typescript": "^4"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
@@ -65,19 +72,21 @@
     "@types/jest": "^26",
     "@types/node": "^14",
     "@types/recursive-readdir": "^2.2.0",
-    "typescript": "^4",
     "webpack": "^5.54.0",
-    "@modern-js/plugin-testing": "^1.2.0",
-    "@modern-js/module-tools": "^1.1.5"
+    "@scripts/build": "0.0.0",
+    "jest": "^27",
+    "@scripts/jest-config": "0.0.0"
   },
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/types/index.d.ts"
   },
   "scripts": {
     "new": "modern new",
     "build": "modern build",
-    "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/constants.ts

@@ -245,7 +245,7 @@ export const PLUGIN_SCHEMAS = {
     },
     {
       target: 'tools.jest',
-      schema: { typeof: ['object'] },
+      schema: { typeof: ['object', 'function'] },
     },
   ],
   '@modern-js/plugin-micro-frontend': [

package/src/getBrowserslist.ts

@@ -1,4 +1,4 @@
-import { loadConfig } from 'browserslist/node';
+import { loadConfig } from 'browserslist';
 
 export const defaults = ['> 0.01%', 'not dead', 'not op_mini all'];
 

package/src/prettyInstructions.ts

@@ -34,7 +34,7 @@ const getAddressUrls = (protocol = 'http', port: number) => {
     (memo: { type: string; url: string }[], detail) => {
       let type = 'Network:  ';
       let url = `${protocol}://${detail.address}:${port}`;
-      if (detail.address.includes(`127.0.0.1`)) {
+      if (detail.address.includes(`localhost`)) {
         type = 'Local:  ';
         url = `${protocol}://localhost:${port}`;
       }

package/tests/applyOptionsChain.test.ts

@@ -1,4 +1,4 @@
-import { applyOptionsChain } from '@/applyOptionsChain';
+import { applyOptionsChain } from '../src/applyOptionsChain';
 
 describe('apply options chain', () => {
   test(`should return default options`, () => {

package/tests/compatRequire.test.ts

@@ -1,5 +1,5 @@
 import path from 'path';
-import { compatRequire } from '@/compatRequire';
+import { compatRequire } from '../src/compatRequire';
 
 describe('compat require', () => {
   const fixturePath = path.resolve(__dirname, './fixtures/compat-require');

package/tests/debug.test.ts

@@ -1,5 +1,6 @@
 import debug from 'debug';
-import { createDebugger } from '@/debug';
+import stripAnsi from 'strip-ansi';
+import { createDebugger } from '../src/debug';
 
 describe('debug utility', () => {
   test('should return file path', () => {
@@ -10,7 +11,8 @@ describe('debug utility', () => {
     debug.enable('modern-js:test2');
 
     debug.log = (...args) => {
-      expect(args[0]).toContain('modern-js:test2 22222');
+      // XXX: args[0] 的内容有时候是 '  \x1B[38;5;167;1mmodern-js:test2 \x1B[0m22222' 这种格式
+      expect(stripAnsi(args[0])).toContain('modern-js:test2 22222');
     };
 
     debug1('11111');

package/tests/ensureAbsolutePath.test.ts

@@ -1,5 +1,5 @@
 import path from 'path';
-import { ensureAbsolutePath } from '@/ensureAbsolutePath';
+import { ensureAbsolutePath } from '../src/ensureAbsolutePath';
 
 describe('ensure absolute file path', () => {
   test('should return filePath directly', () => {

package/tests/findExists.test.ts

@@ -1,5 +1,5 @@
 import path from 'path';
-import { findExists } from '@/findExists';
+import { findExists } from '../src/findExists';
 
 describe('find first exists file', () => {
   const fixturePath = path.resolve(__dirname, './fixtures/file-exists');

package/tests/getBrowserslist.test.ts

@@ -1,5 +1,5 @@
 import path from 'path';
-import { getBrowserslist, defaults } from '@/getBrowserslist';
+import { getBrowserslist, defaults } from '../src/getBrowserslist';
 
 describe('get browserslist', () => {
   const fixture = path.resolve(__dirname, './fixtures/browserlist');

package/tests/getCacheIdentifier.test.ts

@@ -1,4 +1,4 @@
-import { getCacheIdentifier } from '@/getCacheIdentifier';
+import { getCacheIdentifier } from '../src/getCacheIdentifier';
 
 describe('get cache identifier', () => {
   test('should use package name and version', () => {

package/tests/getEntryOptions.test.ts

@@ -1,4 +1,4 @@
-import { getEntryOptions } from '@/getEntryOptions';
+import { getEntryOptions } from '../src/getEntryOptions';
 
 describe('get entry options', () => {
   test('should return default options', () => {

package/tests/index.test.ts

@@ -1,4 +1,4 @@
-import { canUseNpm, canUsePnpm, canUseYarn } from '@/index';
+import { canUseNpm, canUsePnpm, canUseYarn } from '../src';
 
 describe('test generator utils', () => {
   test('test canUseNpm', async () => {

package/tests/logger.test.ts

@@ -1,4 +1,4 @@
-import { logger } from '@/logger';
+import { logger } from '../src/logger';
 
 describe('logger', () => {
   test('should log', () => {

package/tests/removeSlash.test.ts

@@ -2,7 +2,7 @@ import {
   removeLeadingSlash,
   removeSlash,
   removeTailSlash,
-} from '@/removeSlash';
+} from '../src/removeSlash';
 
 describe('remove slash', () => {
   test(`should remove leading slash`, () => {

package/tests/tsconfig.json

@@ -5,9 +5,7 @@
     "jsx": "preserve",
     "baseUrl": "./",
     "isolatedModules": true,
-    "paths": {
-      "@/*": ["../src/*"]
-    },
+    "paths": {},
     "types": ["node", "jest"]
   }
 }

package/tsconfig.json

@@ -6,9 +6,7 @@
     "jsx": "preserve",
     "baseUrl": "./",
     "isolatedModules": true,
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    "paths": {}
   },
   "include": ["src"]
 }