diff --git a/client/build/webpack.dev.conf.js b/client/build/webpack.dev.conf.js index 1ae81ce3..070ae221 100755 --- a/client/build/webpack.dev.conf.js +++ b/client/build/webpack.dev.conf.js @@ -60,7 +60,7 @@ const devWebpackConfig = merge(baseWebpackConfig, { // copy custom static assets new CopyWebpackPlugin([ { - from: path.resolve(__dirname, '../vstatic'), + from: path.resolve(__dirname, '../static'), to: config.dev.assetsSubDirectory, ignore: ['.*'] } diff --git a/client/build/webpack.prod.conf.js b/client/build/webpack.prod.conf.js index e06ff012..d9f99f65 100644 --- a/client/build/webpack.prod.conf.js +++ b/client/build/webpack.prod.conf.js @@ -46,7 +46,7 @@ const webpackConfig = merge(baseWebpackConfig, { filename: utils.assetsPath('css/[name].[contenthash].css'), // Setting the following option to `false` will not extract CSS from codesplit chunks. // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack. - // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`, + // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`, // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110 allChunks: true, }), @@ -111,7 +111,7 @@ const webpackConfig = merge(baseWebpackConfig, { // copy custom static assets new CopyWebpackPlugin([ { - from: path.resolve(__dirname, '../vstatic'), + from: path.resolve(__dirname, '../static'), to: config.build.assetsSubDirectory, ignore: ['.*'] } diff --git a/client/config/index.js b/client/config/index.js index 8ffab587..31e11b72 100644 --- a/client/config/index.js +++ b/client/config/index.js @@ -8,7 +8,7 @@ module.exports = { dev: { // Paths - assetsSubDirectory: 'vstatic', + assetsSubDirectory: 'static', assetsPublicPath: '/', proxyTable: {}, @@ -48,7 +48,7 @@ module.exports = { index: path.resolve(__dirname, '../dist/index.html'), assetsRoot: path.resolve(__dirname, '../dist'), - assetsSubDirectory: 'vstatic', + assetsSubDirectory: 'static', assetsPublicPath: '/', /** diff --git a/client/index.html b/client/index.html index 75a7f649..f0f2f8fa 100644 --- a/client/index.html +++ b/client/index.html @@ -8,8 +8,6 @@ - -
diff --git a/client/vstatic/.gitkeep b/client/static/.gitkeep similarity index 100% rename from client/vstatic/.gitkeep rename to client/static/.gitkeep diff --git a/client/vstatic/favicon-16x16.png b/client/vstatic/favicon-16x16.png deleted file mode 100644 index 87e5a7e8..00000000 Binary files a/client/vstatic/favicon-16x16.png and /dev/null differ diff --git a/client/vstatic/favicon-32x32.png b/client/vstatic/favicon-32x32.png deleted file mode 100644 index 502958aa..00000000 Binary files a/client/vstatic/favicon-32x32.png and /dev/null differ diff --git a/client/vstatic/favicon.ico b/client/vstatic/favicon.ico deleted file mode 100644 index d7779663..00000000 Binary files a/client/vstatic/favicon.ico and /dev/null differ