@modern-js/server-utils 2.0.0-beta.1 → 2.0.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,45 @@
 # @modern-js/server-utils
 
+## 2.0.0-beta.2
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- 9b915e0c10: fix: tsconfig-paths plugin's new node use old node flag
+  fix: tsconfig-paths 插件转换的新节点使用旧节点的 flag
+- a8642da58f: fix(server-utils): incorrect babel-compiler version
+
+  fix(server-utils): 修复引用错误的 babel-compiler 版本的问题
+
+- c2bb0f1: chore(server-utils): using pre-bundled tsconfig-paths
+
+  chore(server-utils): 使用预打包的 tsconfig-paths 依赖
+
+- 14b712da84: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [f179749]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.2
+  - @modern-js/plugin@2.0.0-beta.2
+  - @modern-js/babel-preset-lib@2.0.0-beta.2
+  - @modern-js/babel-compiler@2.0.0-beta.2
+
 ## 2.0.0-beta.1
 
 ### Major Changes

package/dist/js/modern/compilers/babel/index.js

@@ -29,7 +29,7 @@ export const resolveBabelConfig = (appDirectory, config, option
 // FIXME: babel type can't pass type checking
 ) => {
   const {
-    envVars,
+    define,
     globalVars,
     alias,
     babelConfig
@@ -46,8 +46,9 @@ export const resolveBabelConfig = (appDirectory, config, option
     enableReactPreset: true,
     enableTypescriptPreset: true,
     alias: aliasConfig,
-    envVars,
-    globalVars
+    // FIXME: handle the define envVars
+    envVars: define,
+    globalVars: globalVars
   }, {
     type: option.type,
     syntax: option.syntax

package/dist/js/modern/compilers/typescript/tsconfig-paths-plugin.js

@@ -1,7 +1,7 @@
 import * as os from 'os';
 import path, { dirname, posix } from 'path';
 import * as ts from 'typescript';
-import { createMatchPath } from 'tsconfig-paths';
+import { createMatchPath } from '@modern-js/utils/tsconfig-paths';
 const isRegExpKey = str => {
   return str.startsWith('^') || str.endsWith('$');
 };

package/dist/js/node/compilers/babel/index.js

@@ -58,7 +58,7 @@ const resolveBabelConfig = (appDirectory, config, option
 // FIXME: babel type can't pass type checking
 ) => {
   const {
-    envVars,
+    define,
     globalVars,
     alias,
     babelConfig
@@ -75,8 +75,9 @@ const resolveBabelConfig = (appDirectory, config, option
     enableReactPreset: true,
     enableTypescriptPreset: true,
     alias: aliasConfig,
-    envVars,
-    globalVars
+    // FIXME: handle the define envVars
+    envVars: define,
+    globalVars: globalVars
   }, {
     type: option.type,
     syntax: option.syntax

package/dist/js/node/compilers/typescript/tsconfig-paths-plugin.js

@@ -7,7 +7,7 @@ exports.tsconfigPathsBeforeHookFactory = tsconfigPathsBeforeHookFactory;
 var os = _interopRequireWildcard(require("os"));
 var _path = _interopRequireWildcard(require("path"));
 var ts = _interopRequireWildcard(require("typescript"));
-var _tsconfigPaths = require("tsconfig-paths");
+var _tsconfigPaths = require("@modern-js/utils/tsconfig-paths");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const isRegExpKey = str => {

package/dist/js/treeshaking/compilers/babel/index.js

@@ -29,7 +29,7 @@ export var getBabelConfig = function getBabelConfig(libPresetOption, syntaxOptio
 export var resolveBabelConfig = function resolveBabelConfig(appDirectory, config, option
 // FIXME: babel type can't pass type checking
 ) {
-  var envVars = config.envVars,
+  var define = config.define,
     globalVars = config.globalVars,
     alias = config.alias,
     babelConfig = config.babelConfig;
@@ -45,7 +45,8 @@ export var resolveBabelConfig = function resolveBabelConfig(appDirectory, config
     enableReactPreset: true,
     enableTypescriptPreset: true,
     alias: aliasConfig,
-    envVars: envVars,
+    // FIXME: handle the define envVars
+    envVars: define,
     globalVars: globalVars
   }, {
     type: option.type,

package/dist/js/treeshaking/compilers/typescript/tsconfig-paths-plugin.js

@@ -4,7 +4,7 @@ import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIt
 import * as os from 'os';
 import path, { dirname, posix } from 'path';
 import * as ts from 'typescript';
-import { createMatchPath } from 'tsconfig-paths';
+import { createMatchPath } from '@modern-js/utils/tsconfig-paths';
 var isRegExpKey = function isRegExpKey(str) {
   return str.startsWith('^') || str.endsWith('$');
 };

package/dist/types/common/index.d.ts

@@ -1,14 +1,14 @@
-import type { NormalizedConfig } from '@modern-js/core';
+import type { SourceNormalizedConfig, ToolsNormalizedConfig } from '@modern-js/server-core';
 export interface Pattern {
   from: string;
   to: string;
   tsconfigPath?: string;
 }
 export interface IConfig {
-  alias?: NormalizedConfig['source']['alias'];
-  envVars?: NormalizedConfig['source']['envVars'];
-  globalVars?: NormalizedConfig['source']['globalVars'];
-  babelConfig?: NormalizedConfig['tools']['babel'];
+  alias?: SourceNormalizedConfig['alias'];
+  define?: SourceNormalizedConfig['define'];
+  globalVars?: SourceNormalizedConfig['globalVars'];
+  babelConfig?: ToolsNormalizedConfig['babel'];
   server: {
     compiler?: 'babel' | 'typescript';
   };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -37,11 +37,10 @@
     "@babel/runtime": "^7.18.0",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
-    "tsconfig-paths": "3.14.1",
-    "@modern-js/babel-compiler": "2.0.0-beta.1",
-    "@modern-js/babel-preset-lib": "2.0.0-beta.1",
-    "@modern-js/plugin": "2.0.0-beta.1",
-    "@modern-js/utils": "2.0.0-beta.1"
+    "@modern-js/babel-compiler": "2.0.0-beta.2",
+    "@modern-js/babel-preset-lib": "2.0.0-beta.2",
+    "@modern-js/plugin": "2.0.0-beta.2",
+    "@modern-js/utils": "2.0.0-beta.2"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -50,9 +49,9 @@
     "jest": "^27",
     "ts-jest": "^27.0.4",
     "typescript": "^4",
-    "@modern-js/core": "2.0.0-beta.1",
-    "@scripts/build": "2.0.0-beta.1",
-    "@scripts/jest-config": "2.0.0-beta.1"
+    "@modern-js/server-core": "2.0.0-beta.2",
+    "@scripts/build": "2.0.0-beta.2",
+    "@scripts/jest-config": "2.0.0-beta.2"
   },
   "sideEffects": false,
   "publishConfig": {
@@ -60,9 +59,9 @@
     "access": "public"
   },
   "scripts": {
-    "new": "modern new",
-    "dev": "modern build --watch",
-    "build": "modern build",
+    "new": "modern-lib new",
+    "dev": "modern-lib build --watch",
+    "build": "modern-lib build",
     "test": "jest --passWithNoTests"
   }
 }