@modern-js/server-utils 1.2.2 → 1.2.5

package/.eslintrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+  root: true,
+  extends: ['@modern-js'],
+  parserOptions: {
+    tsconfigRootDir: __dirname,
+    project: ['./tsconfig.json'],
+  },
+};

package/CHANGELOG.md

@@ -1,5 +1,52 @@
 # @modern-js/server-utils
 
+## 1.2.5
+
+### Patch Changes
+
+- 0e0537005: fix: unlock @babel/core version
+- 69a728375: fix: remove exports.jsnext:source after publish
+- Updated dependencies [cd7346b0d]
+- Updated dependencies [0e0537005]
+- Updated dependencies [69a728375]
+  - @modern-js/utils@1.7.2
+  - @modern-js/babel-preset-lib@1.2.4
+
+## 1.2.4
+
+### Patch Changes
+
+- 592edabc: feat: prebundle url-join,mime-types,json5,fast-glob,globby,ora,inquirer
+- Updated dependencies [2d155c4c]
+- Updated dependencies [123e432d]
+- Updated dependencies [e5a9b26d]
+- Updated dependencies [0b26b93b]
+- Updated dependencies [123e432d]
+- Updated dependencies [f9f66ef9]
+- Updated dependencies [592edabc]
+- Updated dependencies [895fa0ff]
+- Updated dependencies [3578913e]
+- Updated dependencies [1c3beab3]
+  - @modern-js/utils@1.6.0
+
+## 1.2.3
+
+### Patch Changes
+
+- 6cffe99d: chore:
+  remove react eslint rules for `modern-js` rule set.
+  add .eslintrc for each package to speed up linting
+- 04ae5262: chore: bump @modern-js/utils to v1.4.1 in dependencies
+- 60f7d8bf: feat: add tests dir to npmignore
+- Updated dependencies [b8599d09]
+- Updated dependencies [6cffe99d]
+- Updated dependencies [04ae5262]
+- Updated dependencies [60f7d8bf]
+- Updated dependencies [3bf4f8b0]
+  - @modern-js/utils@1.5.0
+  - @modern-js/babel-preset-lib@1.2.3
+  - @modern-js/plugin@1.3.3
+
 ## 1.2.2
 
 ### Patch Changes

package/dist/js/modern/babel.js

@@ -5,8 +5,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 { getBabelChain } from '@modern-js/babel-preset-lib';
-import { applyOptionsChain, fs, getAlias } from '@modern-js/utils';
-import json5 from 'json5';
+import { fs, json5, getAlias, applyOptionsChain } from '@modern-js/utils';
 export * from '@babel/core';
 export const readTsConfig = (tsconfigPath, noExistReturn = null) => {
   // 如果不存在，则返回 noExistReturn

package/dist/js/node/babel.js

@@ -15,8 +15,6 @@ var _babelPresetLib = require("@modern-js/babel-preset-lib");
 
 var _utils = require("@modern-js/utils");
 
-var _json = _interopRequireDefault(require("json5"));
-
 var _core = require("@babel/core");
 
 Object.keys(_core).forEach(function (key) {
@@ -31,8 +29,6 @@ Object.keys(_core).forEach(function (key) {
   });
 });
 
-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); 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 = 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; }
@@ -47,7 +43,7 @@ const readTsConfig = (tsconfigPath, noExistReturn = null) => {
 
   const content = _utils.fs.readFileSync(tsconfigPath, 'utf-8');
 
-  return _json.default.parse(content);
+  return _utils.json5.parse(content);
 };
 
 exports.readTsConfig = readTsConfig;

package/dist/js/treeshaking/babel.js

@@ -5,8 +5,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 { getBabelChain } from '@modern-js/babel-preset-lib';
-import { applyOptionsChain, fs, getAlias } from '@modern-js/utils';
-import json5 from 'json5';
+import { fs, json5, getAlias, applyOptionsChain } from '@modern-js/utils';
 export * from '@babel/core';
 export var readTsConfig = function readTsConfig(tsconfigPath) {
   var noExistReturn = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.2",
+  "version": "1.2.5",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -29,21 +29,20 @@
   },
   "dependencies": {
     "@babel/compat-data": "^7.15.0",
-    "@babel/core": "7.16.7",
+    "@babel/core": "^7.17.0",
     "@babel/plugin-proposal-class-properties": "^7.14.5",
     "@babel/plugin-proposal-decorators": "^7.15.4",
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-typescript": "^7.15.0",
     "@babel/runtime": "^7",
-    "@modern-js/babel-preset-lib": "^1.2.1",
-    "@modern-js/plugin": "^1.2.1",
-    "@modern-js/utils": "^1.3.7",
+    "@modern-js/babel-preset-lib": "^1.2.4",
+    "@modern-js/plugin": "^1.3.3",
+    "@modern-js/utils": "^1.7.2",
     "babel-plugin-module-resolver": "^4.1.0",
-    "babel-plugin-transform-typescript-metadata": "^0.3.2",
-    "json5": "^2.2.0"
+    "babel-plugin-transform-typescript-metadata": "^0.3.2"
   },
   "devDependencies": {
-    "@modern-js/core": "1.6.1",
+    "@modern-js/core": "1.10.1",
     "@types/babel__core": "^7.1.15",
     "@types/jest": "^26",
     "@types/node": "^14",

package/tests/.eslintrc.js

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

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

@@ -1,174 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`babel resolveBabelConfig 1`] = `
-Object {
-  "plugins": Array [
-    Array [
-      "/babel-plugin-macros/dist/index.js",
-      Object {
-        "twin": Object {
-          "preset": "styled-components",
-        },
-      },
-    ],
-    Array [
-      "/babel-plugin-import/lib/index.js",
-      Object {
-        "libraryDirectory": "es",
-        "libraryName": "antd",
-        "style": true,
-      },
-      "import-antd",
-    ],
-    Array [
-      "/babel-plugin-lodash/lib/index.js",
-      Object {
-        "id": Array [
-          "lodash",
-          "ramda",
-        ],
-      },
-    ],
-    Array [
-      "/@babel/plugin-proposal-decorators/lib/index.js",
-      Object {
-        "legacy": true,
-      },
-    ],
-    Array [
-      "/@babel/plugin-proposal-class-properties/lib/index.js",
-      Object {
-        "loose": true,
-      },
-    ],
-    Array [
-      "/@babel/plugin-proposal-private-methods/lib/index.js",
-      Object {
-        "loose": true,
-      },
-    ],
-    Array [
-      "/@babel/plugin-proposal-private-property-in-object/lib/index.js",
-      Object {
-        "loose": true,
-      },
-    ],
-    Array [
-      "/@babel/plugin-proposal-object-rest-spread/lib/index.js",
-      Object {
-        "useBuiltIns": true,
-      },
-    ],
-    Array [
-      "/@babel/plugin-transform-runtime/lib/index.js",
-      Object {
-        "corejs": false,
-        "helpers": false,
-        "regenerator": true,
-        "useESModules": false,
-        "version": "7.16.7",
-      },
-    ],
-    Array [
-      "/babel-plugin-transform-react-remove-prop-types/lib/index.js",
-      Object {
-        "removeImport": true,
-      },
-    ],
-    Array [
-      "/@babel/plugin-proposal-function-bind/lib/index.js",
-    ],
-    Array [
-      "/@babel/plugin-proposal-export-default-from/lib/index.js",
-    ],
-    Array [
-      "/@babel/plugin-proposal-export-namespace-from/lib/index.js",
-    ],
-    Array [
-      "/@babel/plugin-proposal-optional-chaining/lib/index.js",
-    ],
-    Array [
-      "/@babel/plugin-proposal-numeric-separator/lib/index.js",
-    ],
-    Array [
-      "/@babel/plugin-proposal-pipeline-operator/lib/index.js",
-      Object {
-        "proposal": "minimal",
-      },
-    ],
-    Array [
-      "/@babel/plugin-proposal-partial-application/lib/index.js",
-    ],
-    Array [
-      "/@babel/plugin-proposal-nullish-coalescing-operator/lib/index.js",
-    ],
-    Array [
-      "/babel-plugin-styled-components/lib/index.js",
-      Object {},
-      "styled-components",
-    ],
-    Array [
-      "/babel-plugin-transform-inline-environment-variables/lib/index.js",
-      Object {
-        "include": Array [],
-      },
-    ],
-    Array [
-      "/babel-plugin-module-resolver/lib/index.js",
-      Object {
-        "alias": Object {
-          "@/*": Array [
-            "./src/*",
-          ],
-        },
-        "extensions": Array [
-          ".ts",
-          ".tsx",
-          ".js",
-          ".jsx",
-          ".es",
-          ".es6",
-          ".mjs",
-        ],
-        "resolvePath": [Function],
-        "root": "/packages/server/utils/tests/fixtures/",
-      },
-    ],
-    Array [
-      "/babel-plugin-transform-typescript-metadata/lib/plugin.js",
-    ],
-  ],
-  "presets": Array [
-    Array [
-      "/@babel/preset-env/lib/index.js",
-      Object {
-        "bugfixes": true,
-        "modules": "commonjs",
-        "shippedProposals": false,
-        "targets": Array [
-          "chrome > 61",
-          "edge > 16",
-          "firefox > 60",
-          "safari > 11",
-          "ios_saf > 11",
-        ],
-      },
-    ],
-    Array [
-      "/@babel/preset-react/lib/index.js",
-      Object {
-        "runtime": "automatic",
-      },
-    ],
-    Array [
-      "/@babel/preset-typescript/lib/index.js",
-      Object {
-        "allExtensions": true,
-        "allowDeclareFields": true,
-        "allowNamespaces": true,
-        "isTSX": true,
-      },
-    ],
-  ],
-}
-`;

package/tests/babel.test.ts

@@ -1,40 +0,0 @@
-import path from 'path';
-import { resolveBabelConfig } from '../src';
-import { defaults } from './helpers';
-
-describe('babel', () => {
-  it('resolveBabelConfig', () => {
-    const pwd = path.resolve(__dirname, './fixtures');
-    const tsconfigPath = path.resolve(
-      __dirname,
-      './fixtures/api/tsconfig.json',
-    );
-    const config = resolveBabelConfig(pwd, defaults as any, {
-      type: 'commonjs',
-      syntax: 'es6+',
-      tsconfigPath,
-    });
-
-    const root = path.resolve(__dirname, '../../../../');
-
-    expect.addSnapshotSerializer({
-      test: val =>
-        typeof val === 'string' &&
-        (val.includes('modern.js') ||
-          val.includes('node_modules') ||
-          val.includes(root)),
-      print: val =>
-        // eslint-disable-next-line no-nested-ternary
-        typeof val === 'string'
-          ? // eslint-disable-next-line no-nested-ternary
-            val.includes('node_modules')
-            ? `"${val.replace(/.+node_modules/, '').replace(/\\/g, '/')}"`
-            : val.includes('modern.js')
-            ? `"${val.replace(/.+modern\.js/, '').replace(/\\/g, '/')}"`
-            : `"${val.replace(root, '').replace(/\\/g, '/')}"`
-          : (val as string),
-    });
-
-    expect(config).toMatchSnapshot();
-  });
-});

package/tests/fixtures/api/_app.ts

@@ -1,5 +0,0 @@
-import { hook } from '../../../src';
-
-export default hook(({ addMiddleware }) => {
-  addMiddleware('@koa/api');
-});

package/tests/fixtures/api/tsconfig.json

@@ -1,14 +0,0 @@
-{
-  "compilerOptions": {
-    "declaration": false,
-    "jsx": "preserve",
-    "baseUrl": "./",
-    "isolatedModules": true,
-    "experimentalDecorators": true,
-    "esModuleInterop": true,
-    "paths": {
-      "@/*": ["./src/*"]
-    }
-  },
-  "include": ["src", "api", "server", "electron"]
-}

package/tests/fixtures/server/index.ts

@@ -1,5 +0,0 @@
-import { hook } from '../../../src';
-
-export default hook(({ addMiddleware }) => {
-  addMiddleware('@koa/web');
-});

package/tests/helpers.ts

@@ -1,100 +0,0 @@
-const sourceDefaults = {
-  entries: undefined,
-  disableDefaultEntries: false,
-  entriesDir: './src',
-  configDir: './config',
-  apiDir: './api',
-  envVars: [],
-  globalVars: undefined,
-  alias: undefined,
-  moduleScopes: undefined,
-  include: [],
-};
-
-const outputDefaults = {
-  assetPrefix: '/',
-  htmlPath: 'html',
-  jsPath: 'static/js',
-  cssPath: 'static/css',
-  mediaPath: 'static/media',
-  path: 'dist',
-  title: '',
-  titleByEntries: undefined,
-  meta: {
-    charset: { charset: 'utf-8' },
-    viewport:
-      'width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no',
-    'http-equiv': { 'http-equiv': 'x-ua-compatible', content: 'ie=edge' },
-    renderer: 'webkit',
-    layoutmode: 'standard',
-    imagemode: 'force',
-    'wap-font-scale': 'no',
-    'format-detection': 'telephone=no',
-  },
-  metaByEntries: undefined,
-  inject: 'head',
-  injectByEntries: undefined,
-  mountId: 'root',
-  favicon: '',
-  faviconByEntries: undefined,
-  copy: undefined,
-  scriptExt: undefined,
-  disableHtmlFolder: false,
-  disableCssModuleExtension: false,
-  disableCssExtract: false,
-  enableCssModuleTSDeclaration: false,
-  disableMinimize: false,
-  enableInlineStyles: false,
-  enableInlineScripts: false,
-  disableSourceMap: false,
-  disableInlineRuntimeChunk: false,
-  disableAssetsCache: false,
-  enableLatestDecorators: false,
-  polyfill: 'entry',
-  dataUriLimit: 10000,
-  templateParameters: {},
-  templateParametersByEntries: undefined,
-  cssModuleLocalIdentName: '[name]__[local]--[hash:base64:5]',
-  enableModernMode: false,
-  federation: undefined,
-  disableNodePolyfill: false,
-  enableTsLoader: false,
-};
-
-const serverDefaults = {
-  routes: undefined,
-  publicRoutes: undefined,
-  ssr: undefined,
-  ssrByEntries: undefined,
-  baseUrl: '/',
-  port: 8080,
-};
-
-const devDefaults = { assetPrefix: false };
-
-const deployDefaults = {
-  microFrontend: false,
-  domain: '',
-  domainByEntries: undefined,
-};
-
-const toolsDefaults = {
-  webpack: undefined,
-  babel: undefined,
-  postcss: undefined,
-  autoprefixer: undefined,
-  lodash: undefined,
-  devServer: undefined,
-  tsLoader: undefined,
-  terser: undefined,
-  minifyCss: undefined,
-};
-
-export const defaults = {
-  source: sourceDefaults,
-  output: outputDefaults,
-  server: serverDefaults,
-  dev: devDefaults,
-  deploy: deployDefaults,
-  tools: toolsDefaults,
-};

package/tests/tsconfig.json

@@ -1,11 +0,0 @@
-{
-  "extends": "@modern-js/tsconfig/base",
-  "compilerOptions": {
-    "declaration": false,
-    "jsx": "preserve",
-    "baseUrl": "./",
-    "isolatedModules": true,
-    "paths": {},
-    "types": ["node", "jest"]
-  }
-}