feat: forbid set asset config

Author: gaowhen

bin/config.js

@@ -6,27 +6,6 @@ function getPath(folder) {
 }
 
 const defaultConfig = {
-  asset: {
-    path: 'static/',
-    src: {
-      path: 'src/',
-      js: 'src/static/js',
-      img: 'src/static/img',
-      view: 'src/template',
-    },
-    build: {
-      path: 'static/build',
-      img: 'static/build/img',
-      view: 'view/build/',
-    },
-    dist: {
-      path: 'static/dist',
-      js: 'static/dist/js',
-      css: 'static/dist/css',
-      img: 'static/dist/img',
-      view: 'view/dist/',
-    },
-  },
   dev: {
     domain: 'piaofang.wepiao.com',
     f2e: '127.0.0.1:8000',
@@ -48,37 +27,48 @@ const defaultConfig = {
       '/data/sk/101010100.html': 'www.weather.com.cn:80',
       '2pmh9.free.natapp.cc': '/ping',
     },
+    // webpack externals
+    externals: {
+      react: 'React',
+      'react-dom': 'ReactDOM',
+    },
   },
 }
 
 /* eslint-disable */
 const customConfig = require(`${path.resolve(process.cwd(), 'config.js')}`)
-const extended = Object.assign({}, defaultConfig, customConfig)
+const extended = Object.assign({}, defaultConfig, customConfig || {})
 const config = {
   asset: {
-    path: getPath(extended.asset.path),
-    origin: extended.asset.path,
+    path: 'static/',
+    src: {
+      path: 'src/',
+      js: 'src/static/js',
+      img: 'src/static/img',
+      view: 'src/template',
+    },
+    build: {
+      path: 'static/build',
+      img: 'static/build/img',
+      view: 'view/build/',
+    },
+    dist: {
+      path: 'static/dist',
+      js: 'static/dist/js',
+      css: 'static/dist/css',
+      img: 'static/dist/img',
+      view: 'view/dist/',
+    },
   },
-  dev: extended.dev
+  dev: extended.dev,
 }
 
-Object.keys(extended.asset).map((key) => {
-  if (key !== 'path' || key !== 'origin') {
-    Object.keys(extended.asset[key]).map((subKey) => {
-      if (!config.asset[key]) {
-        config.asset[key] = {}
-      }
-
-      config.asset[key][subKey] = getPath(extended.asset[key][subKey])
-
-      // webpack needs this original path
-      if (key === 'build' && subKey === 'path') {
-        config.asset[key].origin = extended.asset[key][subKey]
-      }
+Object.keys(config.asset).map((key) => {
+  Object.keys(config.asset[key]).map((subKey) => {
+    config.asset[key][subKey] = getPath(config.asset[key][subKey])
 
-      return subKey
-    })
-  }
+    return subKey
+  })
 
   return key
 })

bin/webpack.dev.js

@@ -6,7 +6,6 @@ const config = require('./webpack.common')
 const gonConfig = require('./config')
 
 const domain = gonConfig.dev.domain
-const buildPath = `${gonConfig.asset.origin}${gonConfig.asset.build.origin}`
 
 const PATH = config.PATH
 const CWD = process.cwd()
@@ -94,7 +93,7 @@ module.exports = {
             replacements: [
               {
                 pattern: /\{\{\{(\S*?)\}\}\}/g,
-                replacement: (match, p1) => `http://${domain}/${buildPath}/${p1}`,
+                replacement: (match, p1) => `http://${domain}/static/build/${p1}`,
               },
             ],
           }),
@@ -115,8 +114,5 @@ module.exports = {
       },
     }),
   ],
-  externals: {
-    react: 'React',
-    'react-dom': 'ReactDOM',
-  },
+  externals: gonConfig.dev.externals,
 }

bin/webpack.pro.js

@@ -5,6 +5,7 @@ const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPl
 const ExtractTextPlugin = require('extract-text-webpack-plugin')
 
 const config = require('./webpack.common')
+const gonConfig = require('./config')
 
 const PATH = config.PATH
 const CWD = process.cwd()
@@ -70,8 +71,5 @@ module.exports = {
       analyzerMode: 'static',
     }),
   ],
-  externals: {
-    react: 'React',
-    'react-dom': 'ReactDOM',
-  },
+  externals: gonConfig.dev.externals,
 }