@modern-js/server-utils 2.13.4 → 2.15.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @modern-js/server-utils
 
+## 2.15.0
+
+### Patch Changes
+
+- @modern-js/babel-preset-lib@2.15.0
+- @modern-js/babel-compiler@2.15.0
+- @modern-js/utils@2.15.0
+
+## 2.14.0
+
+### Patch Changes
+
+- 8a3c693: chore(server): no longer replace globalVars when compiler is babel
+
+  chore(server): 进行 babel compile 时不再替换 globalVars
+
+- Updated dependencies [4779152]
+- Updated dependencies [9321bef]
+- Updated dependencies [9b45c58]
+- Updated dependencies [52d0cb1]
+- Updated dependencies [60a81d0]
+- Updated dependencies [dacef96]
+- Updated dependencies [16399fd]
+  - @modern-js/utils@2.14.0
+  - @modern-js/babel-preset-lib@2.14.0
+  - @modern-js/babel-compiler@2.14.0
+
 ## 2.13.4
 
 ### Patch Changes

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

@@ -60,11 +60,7 @@ const getBabelConfig = (libPresetOption, syntaxOption) => {
   };
 };
 const resolveBabelConfig = (appDirectory, config, option) => {
-  const { globalVars, alias, babelConfig, define } = config;
-  const globalDefineVars = define && Object.entries(define).reduce((object, [key, value]) => {
-    object[key] = JSON.stringify(value);
-    return object;
-  }, {});
+  const { alias, babelConfig } = config;
   const aliasConfig = (0, import_utils.getAliasConfig)(alias, {
     appDirectory,
     ...option
@@ -75,11 +71,7 @@ const resolveBabelConfig = (appDirectory, config, option) => {
       enableReactPreset: true,
       enableTypescriptPreset: true,
       alias: aliasConfig,
-      envVars: [],
-      globalVars: {
-        ...globalVars,
-        ...globalDefineVars
-      }
+      envVars: []
     },
     {
       type: option.type,

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

@@ -1,11 +1,3 @@
-function _arrayLikeToArray(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
-    return arr2;
-}
-function _arrayWithHoles(arr) {
-    if (Array.isArray(arr)) return arr;
-}
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
         var info = gen[key](arg);
@@ -48,33 +40,6 @@ function _defineProperty(obj, key, value) {
     }
     return obj;
 }
-function _iterableToArrayLimit(arr, i) {
-    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
-    if (_i == null) return;
-    var _arr = [];
-    var _n = true;
-    var _d = false;
-    var _s, _e;
-    try {
-        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
-            _arr.push(_s.value);
-            if (i && _arr.length === i) break;
-        }
-    } catch (err) {
-        _d = true;
-        _e = err;
-    } finally{
-        try {
-            if (!_n && _i["return"] != null) _i["return"]();
-        } finally{
-            if (_d) throw _e;
-        }
-    }
-    return _arr;
-}
-function _nonIterableRest() {
-    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
 function _objectSpread(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
@@ -114,17 +79,6 @@ function _objectSpreadProps(target, source) {
     }
     return target;
 }
-function _slicedToArray(arr, i) {
-    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
-}
-function _unsupportedIterableToArray(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-}
 var __generator = this && this.__generator || function(thisArg, body) {
     var f, y, t, g, _ = {
         label: 0,
@@ -245,12 +199,7 @@ var getBabelConfig = function(libPresetOption, syntaxOption) {
     }, chain.toJSON());
 };
 var resolveBabelConfig = function(appDirectory, config, option) {
-    var globalVars = config.globalVars, alias = config.alias, babelConfig = config.babelConfig, define = config.define;
-    var globalDefineVars = define && Object.entries(define).reduce(function(object, param) {
-        var _param = _slicedToArray(param, 2), key = _param[0], value = _param[1];
-        object[key] = JSON.stringify(value);
-        return object;
-    }, {});
+    var alias = config.alias, babelConfig = config.babelConfig;
     var aliasConfig = getAliasConfig(alias, _objectSpread({
         appDirectory: appDirectory
     }, option));
@@ -259,8 +208,7 @@ var resolveBabelConfig = function(appDirectory, config, option) {
         enableReactPreset: true,
         enableTypescriptPreset: true,
         alias: aliasConfig,
-        envVars: [],
-        globalVars: _objectSpread({}, globalVars, globalDefineVars)
+        envVars: []
     }, {
         type: option.type,
         syntax: option.syntax

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

@@ -26,11 +26,7 @@ const getBabelConfig = (libPresetOption, syntaxOption) => {
   };
 };
 const resolveBabelConfig = (appDirectory, config, option) => {
-  const { globalVars, alias, babelConfig, define } = config;
-  const globalDefineVars = define && Object.entries(define).reduce((object, [key, value]) => {
-    object[key] = JSON.stringify(value);
-    return object;
-  }, {});
+  const { alias, babelConfig } = config;
   const aliasConfig = getAliasConfig(alias, {
     appDirectory,
     ...option
@@ -41,11 +37,7 @@ const resolveBabelConfig = (appDirectory, config, option) => {
       enableReactPreset: true,
       enableTypescriptPreset: true,
       alias: aliasConfig,
-      envVars: [],
-      globalVars: {
-        ...globalVars,
-        ...globalDefineVars
-      }
+      envVars: []
     },
     {
       type: option.type,

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

@@ -6,8 +6,6 @@ export interface Pattern {
 }
 export interface IConfig {
   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.13.4",
+  "version": "2.15.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -35,9 +35,9 @@
     "@babel/runtime": "^7.18.0",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
-    "@modern-js/babel-compiler": "2.13.4",
-    "@modern-js/babel-preset-lib": "2.13.4",
-    "@modern-js/utils": "2.13.4"
+    "@modern-js/babel-compiler": "2.15.0",
+    "@modern-js/babel-preset-lib": "2.15.0",
+    "@modern-js/utils": "2.15.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -46,9 +46,9 @@
     "jest": "^29",
     "ts-jest": "^29.0.5",
     "typescript": "^4",
-    "@modern-js/server-core": "2.13.4",
-    "@scripts/build": "2.13.4",
-    "@scripts/jest-config": "2.13.4"
+    "@modern-js/server-core": "2.15.0",
+    "@scripts/build": "2.15.0",
+    "@scripts/jest-config": "2.15.0"
   },
   "sideEffects": false,
   "publishConfig": {