feat: configure alias in aver config file (#113)

* refactor(config): added alias config param to renderer * refactor(renderer): use alias config to add aliases to webpack * test(config): updated test for snapshot so paths are correct on every environment
exreplay · Nov 2, 2019 · 03dbade · 03dbade
1 parent 077056f
commit 03dbade
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/packages/config/__tests__/__snapshots__/index.spec.js.snap b/packages/config/__tests__/__snapshots__/index.spec.js.snap
@@ -13,6 +13,15 @@ Object {
   "progressbar": true,
   "store": Object {},
   "webpack": Object {
+    "alias": Object {
+      "@": "/aver",
+      "@@": "/",
+      "@components": "/aver/components",
+      "@mixins": "/aver/mixins",
+      "@pages": "/aver/pages",
+      "@resources": "/aver/resources",
+      "@vuex": "/aver/vuex",
+    },
     "base": false,
     "client": false,
     "css": Object {

diff --git a/packages/config/__tests__/index.spec.js b/packages/config/__tests__/index.spec.js
@@ -12,7 +12,7 @@ test('should change progressbar option to false', () => {
 });
 
 test('should match default snapshot config when no config file is present', () => {
-  process.env.PROJECT_PATH = '';
+  process.env.PROJECT_PATH = '/aver';
   const config = getAverjsConfig();
   expect(config).toMatchSnapshot();
 });
diff --git a/packages/config/lib/configs/renderer.js b/packages/config/lib/configs/renderer.js
@@ -1,3 +1,5 @@
+import path from 'path';
+
 export default () => ({
   css: {
     extract: false,
@@ -6,6 +8,15 @@ export default () => ({
       options: {}
     }
   },
+  alias: {
+    '@': path.join(process.env.PROJECT_PATH),
+    '@@': path.resolve(process.env.PROJECT_PATH, '../'),
+    '@components': path.resolve(process.env.PROJECT_PATH, './components'),
+    '@resources': path.resolve(process.env.PROJECT_PATH, './resources'),
+    '@mixins': path.resolve(process.env.PROJECT_PATH, './mixins'),
+    '@pages': path.resolve(process.env.PROJECT_PATH, './pages'),
+    '@vuex': path.resolve(process.env.PROJECT_PATH, './vuex')
+  },
   purgeCss: false,
   base: false,
   client: false,

diff --git a/packages/renderer/lib/config/base.js b/packages/renderer/lib/config/base.js
@@ -78,15 +78,9 @@ export default class WebpackBaseConfiguration {
   }
 
   alias() {
-    this.chainConfig.resolve
-      .alias
-        .set('@', path.join(process.env.PROJECT_PATH))
-        .set('@@', path.resolve(process.env.PROJECT_PATH, '../'))
-        .set('@components', path.resolve(process.env.PROJECT_PATH, './components'))
-        .set('@resources', path.resolve(process.env.PROJECT_PATH, './resources'))
-        .set('@mixins', path.resolve(process.env.PROJECT_PATH, './mixins'))
-        .set('@pages', path.resolve(process.env.PROJECT_PATH, './pages'))
-        .set('@vuex', path.resolve(process.env.PROJECT_PATH, './vuex'));
+    for (const alias of Object.keys(this.globalConfig.alias)) {
+      this.chainConfig.resolve.alias.set(alias, this.globalConfig.alias[alias]);
+    }
   }
 
   rules() {