@modern-js/server-utils 1.2.0 → 1.2.3

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,41 @@
 # @modern-js/server-utils
 
+## 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
+
+- bebb39b6: chore: improve devDependencies and peerDependencies
+- Updated dependencies [132f7b53]
+  - @modern-js/utils@1.3.7
+
+## 1.2.1
+
+### Patch Changes
+
+- 83166714: change .npmignore
+- Updated dependencies [83166714]
+  - @modern-js/babel-preset-lib@1.2.1
+  - @modern-js/plugin@1.2.1
+  - @modern-js/utils@1.2.2
+
 ## 1.2.0
 
 ### Minor Changes

package/jest.config.js

@@ -2,7 +2,6 @@ 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.2.0",
+  "version": "1.2.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -35,15 +35,15 @@
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-typescript": "^7.15.0",
     "@babel/runtime": "^7",
-    "@modern-js/babel-preset-lib": "^1.2.0",
-    "@modern-js/plugin": "^1.2.0",
-    "@modern-js/utils": "^1.2.0",
+    "@modern-js/babel-preset-lib": "^1.2.3",
+    "@modern-js/plugin": "^1.3.3",
+    "@modern-js/utils": "^1.5.0",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
     "json5": "^2.2.0"
   },
   "devDependencies": {
-    "@modern-js/core": "^1.3.0",
+    "@modern-js/core": "1.8.0",
     "@types/babel__core": "^7.1.15",
     "@types/jest": "^26",
     "@types/node": "^14",
@@ -58,8 +58,7 @@
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/index.d.ts"
+    "access": "public"
   },
   "scripts": {
     "new": "modern new",

package/src/babel.ts

@@ -1,151 +0,0 @@
-import {
-  getBabelChain,
-  ILibPresetOption,
-  ISyntaxOption,
-} from '@modern-js/babel-preset-lib';
-import { TransformOptions } from '@babel/core';
-import { applyOptionsChain, fs, getAlias } from '@modern-js/utils';
-import type { NormalizedConfig } from '@modern-js/core';
-import json5 from 'json5';
-
-export * from '@babel/core';
-
-export interface ITsconfig {
-  compilerOptions?:
-    | {
-        rootDir?: string;
-        baseUrl?: string;
-        declaration?: boolean;
-        emitDeclarationOnly?: boolean;
-        isolatedModules?: boolean;
-        allowJs?: boolean;
-        outDir?: string;
-        paths?: Record<string, string[]>;
-      }
-    | undefined;
-  include?: string[];
-  exclude?: string[];
-}
-
-export const readTsConfig = <T extends null | ITsconfig>(
-  tsconfigPath: string,
-  noExistReturn: T = null as T,
-): ITsconfig | T => {
-  // 如果不存在，则返回 noExistReturn
-  if (!fs.existsSync(tsconfigPath)) {
-    return noExistReturn;
-  }
-  const content = fs.readFileSync(tsconfigPath, 'utf-8');
-  return json5.parse(content);
-};
-
-export const existTsConfigFile = (tsconfigAbsolutePath: string) => {
-  const tsconfig = readTsConfig(tsconfigAbsolutePath);
-  return Boolean(tsconfig);
-};
-
-export const getBabelConfig = (
-  libPresetOption: ILibPresetOption,
-  syntaxOption: ISyntaxOption,
-): TransformOptions => {
-  const chain = getBabelChain(libPresetOption, syntaxOption);
-
-  return {
-    sourceType: 'unambiguous',
-    ...chain.toJSON(),
-  };
-};
-
-export interface IPackageModeValue {
-  type: 'module' | 'commonjs';
-  syntax: 'es5' | 'es6+';
-  tsconfigPath: string;
-}
-
-export const resolveBabelConfig = (
-  appDirectory: string,
-  modernConfig: NormalizedConfig,
-  option: IPackageModeValue,
-  // FIXME: babel type can't pass type checking
-): any => {
-  const {
-    source: {
-      envVars,
-      globalVars,
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-expect-error
-      jsxTransformRuntime = 'automatic',
-    },
-    tools: { lodash: userLodashOption },
-  } = modernConfig;
-
-  // alias config
-  const aliasConfig = getAlias(modernConfig.source.alias, {
-    appDirectory,
-    ...option,
-  });
-
-  // lodash config
-  const lodashOptions = applyOptionsChain(
-    { id: ['lodash', 'ramda'] },
-    // TODO: 需要处理类型问题
-    userLodashOption as any,
-  );
-  // babel config
-  const babelChain = getBabelChain(
-    {
-      appDirectory,
-      enableReactPreset: true,
-      enableTypescriptPreset: true,
-      alias: aliasConfig,
-      envVars,
-      globalVars,
-      lodashOptions,
-      jsxTransformRuntime,
-    },
-    {
-      type: option.type,
-      syntax: option.syntax,
-    },
-  );
-
-  const envOptions = babelChain.preset('@babel/preset-env').options();
-  babelChain
-    .preset('@babel/preset-env')
-    .use(require.resolve('@babel/preset-env'), [
-      {
-        ...envOptions[0],
-        loose: true,
-      },
-    ]);
-
-  babelChain.plugin('babel-plugin-transform-typescript-metadata').use(
-    require.resolve('babel-plugin-transform-typescript-metadata'),
-
-    [],
-  );
-
-  babelChain
-    .plugin('@babel/plugin-proposal-decorators')
-    .use(require.resolve('@babel/plugin-proposal-decorators'), [
-      { legacy: true },
-    ]);
-
-  babelChain.plugin('@babel/plugin-proposal-class-properties').use(
-    require.resolve('@babel/plugin-proposal-class-properties'),
-
-    [{ loose: true }],
-  );
-
-  const internalBabelConfig = { ...babelChain.toJSON() };
-
-  const userBabelConfig = modernConfig.tools.babel;
-  applyOptionsChain(
-    internalBabelConfig,
-    // TODO: 感觉 userBabelConfig 的类型应该是TransformOptions
-    userBabelConfig as any,
-    { chain: babelChain },
-  );
-
-  return internalBabelConfig;
-};

package/src/index.ts

@@ -1 +0,0 @@
-export * from './babel';

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"]
-  }
-}