refactor: extract asset path logic

yyx990803 · yyx990803 · commit 92473e9f210a · 2018-07-30T15:37:09.000-04:00
diff --git a/packages/@vue/cli-service/lib/config/base.js b/packages/@vue/cli-service/lib/config/base.js
@@ -5,6 +5,13 @@ module.exports = (api, options) => {
     const getAssetPath = require('../util/getAssetPath')
     const inlineLimit = 4096
 
+    const genAssetSubPath = dir => {
+      return getAssetPath(
+        options,
+        `${dir}/[name]${options.filenameHashing ? '.[hash:8]' : ''}.[ext]`
+      )
+    }
+
     webpackConfig
       .mode('development')
       .context(api.service.context)
@@ -82,10 +89,7 @@ module.exports = (api, options) => {
           .loader('url-loader')
           .options({
             limit: inlineLimit,
-            name: getAssetPath(
-              options,
-              `img/[name]${options.filenameHashing ? '.[hash:8]' : ''}.[ext]`
-            )
+            name: genAssetSubPath('img')
           })
 
     // do not base64-inline SVGs.
@@ -96,10 +100,7 @@ module.exports = (api, options) => {
         .use('file-loader')
           .loader('file-loader')
           .options({
-            name: getAssetPath(
-              options,
-              `img/[name]${options.filenameHashing ? '.[hash:8]' : ''}.[ext]`
-            )
+            name: genAssetSubPath('img')
           })
 
     webpackConfig.module
@@ -109,10 +110,7 @@ module.exports = (api, options) => {
           .loader('url-loader')
           .options({
             limit: inlineLimit,
-            name: getAssetPath(
-              options,
-              `media/[name]${options.filenameHashing ? '.[hash:8]' : ''}.[ext]`
-            )
+            name: genAssetSubPath('media')
           })
 
     webpackConfig.module
@@ -122,10 +120,7 @@ module.exports = (api, options) => {
           .loader('url-loader')
           .options({
             limit: inlineLimit,
-            name: getAssetPath(
-              options,
-              `fonts/[name]${options.filenameHashing ? '.[hash:8]' : ''}.[ext]`
-            )
+            name: genAssetSubPath('fonts')
           })
 
     // Other common pre-processors ---------------------------------------------
diff --git a/packages/@vue/cli-service/lib/options.js b/packages/@vue/cli-service/lib/options.js
@@ -3,9 +3,9 @@ const { createSchema, validate } = require('@vue/cli-shared-utils')
 const schema = createSchema(joi => joi.object({
   baseUrl: joi.string().allow(''),
   outputDir: joi.string(),
-  filenameHashing: joi.boolean(),
   assetsDir: joi.string(),
   indexPath: joi.string(),
+  filenameHashing: joi.boolean(),
   runtimeCompiler: joi.boolean(),
   transpileDependencies: joi.array(),
   productionSourceMap: joi.boolean(),
@@ -54,15 +54,15 @@ exports.defaults = () => ({
   // where to output built files
   outputDir: 'dist',
 
-  // whether filename will contain hash part
-  filenameHashing: true,
-
   // where to put static assets (js/css/img/font/...)
   assetsDir: '',
 
   // filename for index.html (relative to outputDir)
   indexPath: 'index.html',
 
+  // whether filename will contain hash part
+  filenameHashing: true,
+
   // boolean, use full build?
   runtimeCompiler: false,
 
