@modern-js/utils 1.4.1 → 1.7.0

package/dist/watch.js

@@ -18,15 +18,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.watch = exports.WatchChangeType = void 0;
 const path = __importStar(require("path"));
@@ -42,20 +33,20 @@ const watch = (watchDir, runTask, ignored = []) => {
         ignored,
     });
     watcher.on('ready', () => (ready = true));
-    watcher.on('change', (filePath) => __awaiter(void 0, void 0, void 0, function* () {
+    watcher.on('change', async (filePath) => {
         const changedFilePath = path.resolve(filePath);
-        yield runTask({ changedFilePath, changeType: exports.WatchChangeType.CHANGE });
-    }));
-    watcher.on('add', (filePath) => __awaiter(void 0, void 0, void 0, function* () {
+        await runTask({ changedFilePath, changeType: exports.WatchChangeType.CHANGE });
+    });
+    watcher.on('add', async (filePath) => {
         const changedFilePath = path.resolve(filePath);
         if (ready) {
-            yield runTask({ changedFilePath, changeType: exports.WatchChangeType.ADD });
+            await runTask({ changedFilePath, changeType: exports.WatchChangeType.ADD });
         }
-    }));
-    watcher.on('unlink', (filePath) => __awaiter(void 0, void 0, void 0, function* () {
+    });
+    watcher.on('unlink', async (filePath) => {
         const changedFilePath = path.resolve(filePath);
-        yield runTask({ changedFilePath, changeType: exports.WatchChangeType.UNLINK });
-    }));
+        await runTask({ changedFilePath, changeType: exports.WatchChangeType.UNLINK });
+    });
     watcher.on('error', err => {
         throw err;
     });

package/package.json

@@ -11,12 +11,13 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.1",
+  "version": "1.7.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "jsnext:modern": "./dist/index.js",
+  "_comment": "Provide ESM and CJS exports, ESM is used by runtime package, for treeshaking",
   "exports": {
     ".": {
       "jsnext:source": "./src/index.ts",
@@ -30,14 +31,19 @@
       "jsnext:source": "./src/constants.ts",
       "default": "./dist/constants.js"
     },
-    "./lodash": {
-      "jsnext:source": "./compiled/lodash/index.js",
-      "default": "./compiled/lodash/index.js"
+    "./ssr": {
+      "jsnext:source": "./src/ssr.ts",
+      "default": "./dist/ssr.js"
     },
-    "./strip-ansi": {
-      "jsnext:source": "./compiled/strip-ansi/index.js",
-      "default": "./compiled/strip-ansi/index.js"
-    }
+    "./chalk": "./compiled/chalk/index.js",
+    "./json5": "./compiled/json5/index.js",
+    "./semver": "./compiled/semver/index.js",
+    "./lodash": "./compiled/lodash/index.js",
+    "./globby": "./compiled/globby/index.js",
+    "./fast-glob": "./compiled/fast-glob/index.js",
+    "./gzip-size": "./compiled/gzip-size/index.js",
+    "./mime-types": "./compiled/mime-types/index.js",
+    "./strip-ansi": "./compiled/strip-ansi/index.js"
   },
   "typesVersions": {
     "*": {
@@ -47,50 +53,50 @@
       "constants": [
         "./dist/constants.d.ts"
       ],
+      "ssr": [
+        "./dist/ssr.d.ts"
+      ],
+      "chalk": [
+        "./compiled/chalk/index.d.ts"
+      ],
+      "json5": [
+        "./compiled/json5/index.d.ts"
+      ],
+      "semver": [
+        "./compiled/semver/index.d.ts"
+      ],
       "lodash": [
         "./compiled/lodash/index.d.ts"
       ],
+      "globby": [
+        "./compiled/globby/index.d.ts"
+      ],
+      "fast-glob": [
+        "./compiled/fast-glob/index.d.ts"
+      ],
+      "gzip-size": [
+        "./compiled/gzip-size/index.d.ts"
+      ],
+      "mime-types": [
+        "./compiled/mime-types/index.d.ts"
+      ],
       "strip-ansi": [
         "./compiled/strip-ansi/index.d.ts"
       ]
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7",
+    "caniuse-lite": "^1.0.30001332",
+    "lodash": "^4.17.21",
     "typescript": "^4"
   },
   "devDependencies": {
-    "@modern-js/types": "^1.4.0",
+    "@modern-js/types": "1.5.2",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
-    "@types/debug": "4.1.7",
-    "@types/fs-extra": "9.0.13",
-    "@types/glob": "^7.1.4",
     "@types/jest": "^26",
-    "@types/js-yaml": "4.0.5",
-    "@types/lodash": "4.14.181",
     "@types/node": "^14",
-    "@types/recursive-readdir": "2.2.0",
-    "@types/signale": "1.4.4",
-    "browserslist": "4.20.2",
-    "chalk": "4.1.2",
-    "chokidar": "3.5.3",
-    "commander": "8.3.0",
-    "debug": "4.3.4",
-    "execa": "5.1.1",
-    "filesize": "8.0.7",
-    "fs-extra": "10.0.1",
-    "glob": "7.2.0",
-    "gzip-size": "6.0.0",
-    "import-lazy": "4.0.0",
     "jest": "^27",
-    "js-yaml": "4.1.0",
-    "lodash": "4.17.21",
-    "pkg-up": "3.1.0",
-    "recursive-readdir": "2.2.2",
-    "signale": "1.4.0",
-    "strip-ansi": "6.0.1",
-    "upath": "2.0.1",
     "webpack": "^5.71.0"
   },
   "sideEffects": false,

package/tsconfig.json

@@ -1,6 +1,7 @@
 {
   "extends": "@modern-js/tsconfig/base",
   "compilerOptions": {
+    "target": "ES2019",
     "declaration": true,
     "outDir": "./dist",
     "baseUrl": "./",

package/dist/getCacheIdentifier.d.ts

@@ -1,7 +0,0 @@
-/**
- * Generate cache identifier from some packages and config files.
- */
-export declare function getCacheIdentifier(packages: {
-    name: string;
-    version: string;
-}[], _files?: string[]): string;

package/dist/getCacheIdentifier.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCacheIdentifier = void 0;
-const is_1 = require("./is");
-/**
- * Generate cache identifier from some packages and config files.
- */
-function getCacheIdentifier(packages, _files) {
-    /* eslint-disable no-nested-ternary */
-    let cacheIdentifier = (0, is_1.isProd)()
-        ? 'production'
-        : (0, is_1.isDev)()
-            ? 'development'
-            : (0, is_1.isTest)()
-                ? 'test'
-                : '';
-    /* eslint-enable no-nested-ternary */
-    for (const { name, version } of packages) {
-        cacheIdentifier += `:${name}@${version}`;
-    }
-    // TODO: config file hash
-    return cacheIdentifier;
-}
-exports.getCacheIdentifier = getCacheIdentifier;

package/modern.config.js

@@ -1,6 +0,0 @@
-/** @type {import('@modern-js/module-tools').UserConfig} */
-module.exports = {
-  output: {
-    disableSourceMap: true,
-  },
-};

package/tests/.eslintrc.js

@@ -1,6 +0,0 @@
-module.exports = {
-  extends: ['@modern-js'],
-  parserOptions: {
-    project: require.resolve('./tsconfig.json'),
-  },
-};

package/tests/__snapshots__/prettyInstructions.test.ts.snap

@@ -1,19 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`prettyInstructions The src directory does not exist 1`] = `
-"App running at:
-
-  > Network:  http://127.0.0.1:8080/api
-  > Network:  http://11.11.111.11:8080/api
-  > Network:  http://10.100.100.100:8080/api
-"
-`;
-
-exports[`prettyInstructions basic usage 1`] = `
-"App running at:
-
-  > Network:  http://127.0.0.1:8080/
-  > Network:  http://11.11.111.11:8080/
-  > Network:  http://10.100.100.100:8080/
-"
-`;

package/tests/applyOptionsChain.test.ts

@@ -1,100 +0,0 @@
-import { applyOptionsChain } from '../src/applyOptionsChain';
-
-describe('apply options chain', () => {
-  test(`should return default options`, () => {
-    expect(applyOptionsChain({ default: 'a' })).toEqual({ default: 'a' });
-  });
-
-  test(`should merge default options`, () => {
-    expect(
-      applyOptionsChain(
-        { name: 'a' },
-        {
-          name: 'b',
-          custom: 'c',
-        },
-      ),
-    ).toEqual({
-      name: 'b',
-      custom: 'c',
-    });
-  });
-
-  test(`should support custom merge function`, () => {
-    const merge = (target: any, source: any) => {
-      for (const key in source) {
-        if (target.hasOwnProperty(key)) {
-          target[key] += source[key];
-        } else {
-          target[key] = source[key];
-        }
-      }
-      return target;
-    };
-
-    expect(
-      applyOptionsChain(
-        {
-          a: 1,
-          b: 'b',
-        },
-        {
-          a: 2,
-          b: 'b',
-          c: 'c',
-        },
-        {},
-        merge,
-      ),
-    ).toEqual({
-      a: 3,
-      b: 'bb',
-      c: 'c',
-    });
-  });
-
-  test(`should support funciton or object array`, () => {
-    const defaults = { a: 'a' };
-
-    const options = [
-      { b: 'b' },
-      (o: any, { add }: { add: any }) => {
-        o.c = add(1, 2);
-      },
-      (o: any) => ({
-        ...o,
-        d: 'd',
-      }),
-      { e: 'e' },
-    ];
-    expect(
-      applyOptionsChain(defaults, options as any, {
-        add: (a: any, b: any) => a + b,
-      }),
-    ).toEqual({
-      a: 'a',
-      b: 'b',
-      c: 3,
-      d: 'd',
-      e: 'e',
-    });
-  });
-
-  test(`should throw error`, () => {
-    expect(() => {
-      applyOptionsChain(1, 2);
-    }).toThrow(/^applyOptionsChain error:/);
-  });
-
-  test(`should log warning about function result`, () => {
-    let outputs = '';
-    /* eslint-disable no-console */
-    console.log = jest.fn(input => (outputs += input));
-    /* eslint-enable no-console */
-    applyOptionsChain({ name: 'a' } as any, [() => 111]);
-
-    expect(outputs).toContain(
-      'Function should mutate the config and return nothing, Or return a cloned or merged version of config object.',
-    );
-  });
-});

package/tests/compatRequire.test.ts

@@ -1,32 +0,0 @@
-import path from 'path';
-import { compatRequire, cleanRequireCache } from '../src/compatRequire';
-
-describe('compat require', () => {
-  const fixturePath = path.resolve(__dirname, './fixtures/compat-require');
-
-  test(`should support default property`, () => {
-    expect(compatRequire(path.join(fixturePath, 'esm.js'))).toEqual({
-      name: 'esm',
-    });
-  });
-
-  test(`should support commonjs module`, () => {
-    expect(compatRequire(path.join(fixturePath, 'cjs.js'))).toEqual({
-      name: 'cjs',
-    });
-  });
-
-  test(`should return null`, () => {
-    expect(compatRequire(path.join(fixturePath, 'empty.js'))).toEqual(null);
-  });
-
-  test('should clearn cache after fn', () => {
-    const foo = module.require('./fixtures/compat-require/foo');
-    const requirePath = require.resolve('./fixtures/compat-require/foo.js');
-    expect(foo.name).toBe('foo');
-    expect(require.cache[requirePath]).toBeDefined();
-    cleanRequireCache([requirePath]);
-    jest.resetModules();
-    expect(require.cache[requirePath]).toBeUndefined();
-  });
-});

package/tests/debug.test.ts

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

package/tests/ensureAbsolutePath.test.ts

@@ -1,16 +0,0 @@
-import path from 'path';
-import { ensureAbsolutePath } from '../src/ensureAbsolutePath';
-
-describe('ensure absolute file path', () => {
-  test('should return filePath directly', () => {
-    expect(
-      path.isAbsolute(ensureAbsolutePath('/a/b', '/a/b/c/d/e.jsx')),
-    ).toBeTruthy();
-  });
-
-  test(`should resolve absolute path`, () => {
-    expect(
-      path.isAbsolute(ensureAbsolutePath('/a/b', 'c/d/e.jsx')),
-    ).toBeTruthy();
-  });
-});

package/tests/findExists.test.ts

@@ -1,22 +0,0 @@
-import path from 'path';
-import { findExists } from '../src/findExists';
-
-describe('find first exists file', () => {
-  const fixturePath = path.resolve(__dirname, './fixtures/file-exists');
-
-  test('should return file path', () => {
-    expect(
-      findExists(
-        ['.js', '.ts', '.ejs', '.mjs'].map(ext =>
-          path.join(fixturePath, `a${ext}`),
-        ),
-      ),
-    ).toEqual(path.join(fixturePath, 'a.ts'));
-  });
-
-  test('should return false when no file exists', () => {
-    expect(
-      findExists(['.jsx'].map(ext => path.join(fixturePath, `a${ext}`))),
-    ).toBe(false);
-  });
-});

package/tests/fixtures/browserlist/develop/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "test-browserlist-develop",
-  "browserslist": {
-    "development": [
-      "last 1 chrome version"
-    ],
-    "production": [
-      "IOS 7"
-    ]
-  }
-}

package/tests/fixtures/browserlist/dotfile/.browserslistrc

@@ -1,3 +0,0 @@
-defaults
-not IE 11
-maintained node versions

package/tests/fixtures/browserlist/pkg/package.json

@@ -1,7 +0,0 @@
-{
-  "name": "test-browserlist-pkg",
-  "browserslist": [
-    "not IE 11",
-    "maintained node versions"
-  ]
-}

package/tests/fixtures/compat-require/cjs.js

@@ -1 +0,0 @@
-module.exports = { name: 'cjs' };

package/tests/fixtures/compat-require/empty.js

@@ -1 +0,0 @@
-module.exports = null;

package/tests/fixtures/compat-require/esm.js

@@ -1,5 +0,0 @@
-Object.defineProperty(exports, '__esModule', { value: true });
-
-const _default = { name: 'esm' };
-
-exports.default = _default;

package/tests/fixtures/compat-require/foo.js

@@ -1,3 +0,0 @@
-module.exports = {
-  name: 'foo',
-};

package/tests/format.test.ts

@@ -1,60 +0,0 @@
-import { formatProxyOptions } from '../src/format';
-
-describe('test format', () => {
-  it('should format correctly use simply options', async () => {
-    const proxy = {
-      '/simple': `http://localhost`,
-    };
-
-    const options = formatProxyOptions(proxy);
-    expect(options).toEqual([
-      {
-        context: '/simple',
-        changeOrigin: true,
-        logLevel: 'warn',
-        target: 'http://localhost',
-      },
-    ]);
-  });
-
-  it('should format correctly use simply options', async () => {
-    const proxy = {
-      '/simple-obj': {
-        target: `http://localhost`,
-      },
-    };
-    const options = formatProxyOptions(proxy);
-    expect(options).toEqual([
-      {
-        context: '/simple-obj',
-        changeOrigin: true,
-        logLevel: 'warn',
-        target: 'http://localhost',
-      },
-    ]);
-  });
-
-  it('should format correctly use simply options', async () => {
-    const proxy = {
-      context: '/context',
-      target: `http://localhost`,
-    };
-    const options = formatProxyOptions(proxy);
-    expect(options).toEqual([
-      { context: '/context', target: 'http://localhost' },
-    ]);
-  });
-
-  it('should format correctly use simply options', async () => {
-    const proxy = [
-      {
-        context: '/array',
-        target: `http://localhost`,
-      },
-    ];
-    const options = formatProxyOptions(proxy);
-    expect(options).toEqual([
-      { context: '/array', target: 'http://localhost' },
-    ]);
-  });
-});

package/tests/generateMetaTags.test.ts

@@ -1,19 +0,0 @@
-import { generateMetaTags } from '../src/generateMetaTags';
-
-describe('generateMetaTags', () => {
-  it('should return empty string when params is empty', () => {
-    expect(generateMetaTags()).toEqual('');
-  });
-
-  it('should generate meta tag correctly', () => {
-    const options = {
-      foo: {
-        name: 'viewport',
-        content: 'width=500, initial-scale=1',
-      },
-    };
-    expect(generateMetaTags(options).trim()).toEqual(
-      '<meta name="viewport" content="width=500, initial-scale=1">',
-    );
-  });
-});

package/tests/getBrowserslist.test.ts

@@ -1,32 +0,0 @@
-import path from 'path';
-import { getBrowserslist, defaults } from '../src/getBrowserslist';
-
-describe('get browserslist', () => {
-  const fixture = path.resolve(__dirname, './fixtures/browserlist');
-
-  test(`should load browserslist from package.json`, () => {
-    expect(getBrowserslist(path.join(fixture, 'pkg'))).toEqual([
-      'not IE 11',
-      'maintained node versions',
-    ]);
-  });
-
-  test(`should load browerslist from  .browserslistrc`, () => {
-    expect(getBrowserslist(path.join(fixture, 'dotfile'))).toEqual([
-      'defaults',
-      'not IE 11',
-      'maintained node versions',
-    ]);
-  });
-
-  test(`should load browserslist base on environment`, () => {
-    process.env.NODE_ENV = 'development';
-    expect(getBrowserslist(path.join(fixture, 'develop'))).toEqual([
-      'last 1 chrome version',
-    ]);
-  });
-
-  test(`should return default browserslist config`, () => {
-    expect(getBrowserslist(path.join(fixture))).toEqual(defaults);
-  });
-});

package/tests/getCacheIdentifier.test.ts

@@ -1,37 +0,0 @@
-import { getCacheIdentifier } from '../src/getCacheIdentifier';
-
-describe('get cache identifier', () => {
-  test('should use package name and version', () => {
-    expect(
-      getCacheIdentifier([
-        {
-          name: 'package-a',
-          version: '0.1.0',
-        },
-        {
-          name: 'package-b',
-          version: '1.0.1',
-        },
-      ]),
-    ).toEqual(`test:package-a@0.1.0:package-b@1.0.1`);
-  });
-
-  test(`should return identifier with node environment`, () => {
-    const packages = [
-      {
-        name: 'a',
-        version: '0.1.0',
-      },
-    ];
-
-    process.env.NODE_ENV = 'development';
-    expect(getCacheIdentifier(packages)).toEqual('development:a@0.1.0');
-
-    process.env.NODE_ENV = 'production';
-    expect(getCacheIdentifier(packages)).toEqual('production:a@0.1.0');
-
-    process.env.NODE_ENV = '';
-
-    expect(getCacheIdentifier(packages)).toEqual(`:a@0.1.0`);
-  });
-});