Authored by htoooth

merge

@@ -82,7 +82,7 @@ exports.postcssPlugin = (et) => { @@ -82,7 +82,7 @@ exports.postcssPlugin = (et) => {
82 Object.assign(sprites, { 82 Object.assign(sprites, {
83 basePath: path.join(__dirname, '../img/'), 83 basePath: path.join(__dirname, '../img/'),
84 stylesheetPath: path.join(__dirname, './bundle'), 84 stylesheetPath: path.join(__dirname, './bundle'),
85 - spritePath: path.join(__dirname, './bundle'), 85 + spritePath: path.join(__dirname, './bundle')
86 }); 86 });
87 } 87 }
88 88
@@ -114,7 +114,7 @@ module.exports = (env) => { @@ -114,7 +114,7 @@ module.exports = (env) => {
114 css: cssLoader(env, 'vue') 114 css: cssLoader(env, 'vue')
115 } 115 }
116 } 116 }
117 - }], 117 + }]
118 }, { 118 }, {
119 test: /\.css$/, 119 test: /\.css$/,
120 use: cssLoader(env, 'css') 120 use: cssLoader(env, 'css')
@@ -26,7 +26,7 @@ _.mergeWith(baseConfig, { @@ -26,7 +26,7 @@ _.mergeWith(baseConfig, {
26 colors: true, 26 colors: true,
27 children: false, 27 children: false,
28 chunks: false, 28 chunks: false,
29 - assetsSort: 'size', 29 + assetsSort: 'size'
30 }, 30 },
31 headers: { 31 headers: {
32 'Access-Control-Allow-Origin': '*' 32 'Access-Control-Allow-Origin': '*'