fix: relative path cause alias uncorrect

originjs · Jul 5, 2021 · c18e94e · c18e94e
1 parent 220fed5
commit c18e94e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1 @@
+tests/
diff --git a/package.json b/package.json
@@ -59,7 +59,6 @@
   "dependencies": {
     "chalk": "^4.1.1",
     "@originjs/vue-sfc-ast-parser": "^1.0.0-beta0",
-    "chalk": "^4.1.1",
     "commander": "^7.2.0",
     "ejs": "^3.1.6",
     "jscodeshift": "^0.12.0",

diff --git a/src/transform/transformVuecli.ts b/src/transform/transformVuecli.ts
@@ -93,7 +93,8 @@ export class VueCliTransformer implements Transformer {
         ...aliasOfChainWebpack
       }
       Object.keys(alias).forEach((key) => {
-        const relativePath = path.relative(rootDir, alias[key]).replace(/\\/g, '/')
+        let relativePath = path.relative(rootDir, path.resolve(rootDir, alias[key]))
+        relativePath = relativePath.replace(/\\/g, '/')
         defaultAlias.push({
           find: key,
           replacement: new RawValue(`path.resolve(__dirname,'${relativePath}')`)

diff --git a/src/transform/transformWebpack.ts b/src/transform/transformWebpack.ts
@@ -50,12 +50,18 @@ export class WebpackTransformer implements Transformer {
 
       // convert alias
       const defaultAlias = []
-
       const alias = {
         '@': `${rootDir}/src`
       }
+      if (webpackConfig.resolve?.alias !== undefined) {
+        Object.keys(webpackConfig.resolve.alias).forEach((key) => {
+          alias[key] = webpackConfig.resolve.alias[key]
+        })
+      }
+
       Object.keys(alias).forEach((key) => {
-        const relativePath = path.relative(rootDir, alias[key]).replace(/\\/g, '/')
+        let relativePath = path.relative(rootDir, path.resolve(rootDir, alias[key]))
+        relativePath = relativePath.replace(/\\/g, '/')
         defaultAlias.push({
           find: key,
           replacement: new RawValue(`path.resolve(__dirname,'${relativePath}')`)