@modern-js/server-utils 1.18.0 → 1.18.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @modern-js/server-utils
 
+## 1.18.1
+
+### Patch Changes
+
+- fb02c81: fix: alias should take precedence over package name
+  fix: 编译时，别名的优先级应该高于包名
+- Updated dependencies [c1a4d9b]
+- Updated dependencies [9fcfbd4]
+- Updated dependencies [6c2c745]
+  - @modern-js/plugin@1.18.1
+  - @modern-js/utils@1.18.1
+  - @modern-js/babel-preset-lib@1.18.1
+  - @modern-js/babel-compiler@1.18.1
+
 ## 1.18.0
 
 ### Patch Changes

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

@@ -148,20 +148,7 @@ function getNotAliasedPath(sf, matcher, text) {
   }
 
   if (!path.isAbsolute(result)) {
-    try {
-      // Installed packages (node modules) should take precedence over root files with the same name.
-      // Ref: https://github.com/nestjs/nest-cli/issues/838
-      const packagePath = require.resolve(text, {
-        paths: [process.cwd(), ...module.paths]
-      });
-
-      if (packagePath) {
-        // eslint-disable-next-line consistent-return
-        return text;
-      }
-    } catch (_unused2) {} // handle alias to alias
-
-
+    // handle alias to alias
     if (!result.startsWith('.') && !result.startsWith('..')) {
       try {
         // Installed packages (node modules) should take precedence over root files with the same name.
@@ -174,8 +161,21 @@ function getNotAliasedPath(sf, matcher, text) {
           // eslint-disable-next-line consistent-return
           return result;
         }
-      } catch (_unused3) {}
+      } catch (_unused2) {}
     }
+
+    try {
+      // Installed packages (node modules) should take precedence over root files with the same name.
+      // Ref: https://github.com/nestjs/nest-cli/issues/838
+      const packagePath = require.resolve(text, {
+        paths: [process.cwd(), ...module.paths]
+      });
+
+      if (packagePath) {
+        // eslint-disable-next-line consistent-return
+        return text;
+      }
+    } catch (_unused3) {}
   }
 
   const resolvedPath = posix.relative(dirname(sf.fileName), result) || './'; // eslint-disable-next-line consistent-return

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

@@ -163,20 +163,7 @@ function getNotAliasedPath(sf, matcher, text) {
   }
 
   if (!_path.default.isAbsolute(result)) {
-    try {
-      // Installed packages (node modules) should take precedence over root files with the same name.
-      // Ref: https://github.com/nestjs/nest-cli/issues/838
-      const packagePath = require.resolve(text, {
-        paths: [process.cwd(), ...module.paths]
-      });
-
-      if (packagePath) {
-        // eslint-disable-next-line consistent-return
-        return text;
-      }
-    } catch (_unused2) {} // handle alias to alias
-
-
+    // handle alias to alias
     if (!result.startsWith('.') && !result.startsWith('..')) {
       try {
         // Installed packages (node modules) should take precedence over root files with the same name.
@@ -189,8 +176,21 @@ function getNotAliasedPath(sf, matcher, text) {
           // eslint-disable-next-line consistent-return
           return result;
         }
-      } catch (_unused3) {}
+      } catch (_unused2) {}
     }
+
+    try {
+      // Installed packages (node modules) should take precedence over root files with the same name.
+      // Ref: https://github.com/nestjs/nest-cli/issues/838
+      const packagePath = require.resolve(text, {
+        paths: [process.cwd(), ...module.paths]
+      });
+
+      if (packagePath) {
+        // eslint-disable-next-line consistent-return
+        return text;
+      }
+    } catch (_unused3) {}
   }
 
   const resolvedPath = _path.posix.relative((0, _path.dirname)(sf.fileName), result) || './'; // eslint-disable-next-line consistent-return

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

@@ -166,34 +166,34 @@ function getNotAliasedPath(sf, matcher, text) {
   }
 
   if (!path.isAbsolute(result)) {
-    try {
-      // Installed packages (node modules) should take precedence over root files with the same name.
-      // Ref: https://github.com/nestjs/nest-cli/issues/838
-      var packagePath = require.resolve(text, {
-        paths: [process.cwd()].concat(_toConsumableArray(module.paths))
-      });
-
-      if (packagePath) {
-        // eslint-disable-next-line consistent-return
-        return text;
-      }
-    } catch (_unused2) {} // handle alias to alias
-
-
+    // handle alias to alias
     if (!result.startsWith('.') && !result.startsWith('..')) {
       try {
         // Installed packages (node modules) should take precedence over root files with the same name.
         // Ref: https://github.com/nestjs/nest-cli/issues/838
-        var _packagePath = require.resolve(result, {
+        var packagePath = require.resolve(result, {
           paths: [process.cwd()].concat(_toConsumableArray(module.paths))
         });
 
-        if (_packagePath) {
+        if (packagePath) {
           // eslint-disable-next-line consistent-return
           return result;
         }
-      } catch (_unused3) {}
+      } catch (_unused2) {}
     }
+
+    try {
+      // Installed packages (node modules) should take precedence over root files with the same name.
+      // Ref: https://github.com/nestjs/nest-cli/issues/838
+      var _packagePath = require.resolve(text, {
+        paths: [process.cwd()].concat(_toConsumableArray(module.paths))
+      });
+
+      if (_packagePath) {
+        // eslint-disable-next-line consistent-return
+        return text;
+      }
+    } catch (_unused3) {}
   }
 
   var resolvedPath = posix.relative(dirname(sf.fileName), result) || './'; // eslint-disable-next-line consistent-return

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.18.0",
+  "version": "1.18.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -35,18 +35,18 @@
     "@babel/preset-env": "^7.18.0",
     "@babel/preset-typescript": "^7.17.12",
     "@babel/runtime": "^7.18.0",
-    "@modern-js/babel-compiler": "^1.18.0",
-    "@modern-js/babel-preset-lib": "1.18.0",
-    "@modern-js/plugin": "1.18.0",
-    "@modern-js/utils": "1.18.0",
+    "@modern-js/babel-compiler": "^1.18.1",
+    "@modern-js/babel-preset-lib": "1.18.1",
+    "@modern-js/plugin": "1.18.1",
+    "@modern-js/utils": "1.18.1",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
     "tsconfig-paths": "3.14.1"
   },
   "devDependencies": {
-    "@modern-js/core": "1.18.0",
-    "@scripts/build": "1.18.0",
-    "@scripts/jest-config": "1.18.0",
+    "@modern-js/core": "1.18.1",
+    "@scripts/build": "1.18.1",
+    "@scripts/jest-config": "1.18.1",
     "@types/babel__core": "^7.1.15",
     "@types/jest": "^27",
     "@types/node": "^14",