Commit efc04547 authored by chenyishuai@singsingenglish.com's avatar chenyishuai@singsingenglish.com

614

parents b13df484 c347d5b3
{ {
"compact": false,
"presets": [ "presets": [
["env", { ["env", {
"modules": false, "modules": false,
......
...@@ -10,11 +10,9 @@ const HtmlWebpackPlugin = require('html-webpack-plugin'); ...@@ -10,11 +10,9 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
const ExtractTextPlugin = require('extract-text-webpack-plugin'); const ExtractTextPlugin = require('extract-text-webpack-plugin');
const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin'); const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin');
const UglifyJsPlugin = require('uglifyjs-webpack-plugin'); const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
const env = process.env.NODE_ENV === 'testing' const env = process.env.NODE_ENV === 'testing'
? require('../config/test.env') ? require('../config/test.env')
: require('../config/prod.env') : require('../config/prod.env')
const webpackConfig = merge(baseWebpackConfig, { const webpackConfig = merge(baseWebpackConfig, {
module: { module: {
rules: utils.styleLoaders({ rules: utils.styleLoaders({
...@@ -26,6 +24,8 @@ const webpackConfig = merge(baseWebpackConfig, { ...@@ -26,6 +24,8 @@ const webpackConfig = merge(baseWebpackConfig, {
devtool: config.build.productionSourceMap ? config.build.devtool : false, devtool: config.build.productionSourceMap ? config.build.devtool : false,
output: { output: {
path: config.build.assetsRoot, path: config.build.assetsRoot,
// filename: utils.assetsPath(env.versionTime+'/js/[name].[chunkhash].js'),
// chunkFilename: utils.assetsPath(env.versionTime+'/js/[id].[chunkhash].js'),
filename: utils.assetsPath('js/[name].[chunkhash].js'), filename: utils.assetsPath('js/[name].[chunkhash].js'),
chunkFilename: utils.assetsPath('js/[id].[chunkhash].js') chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
}, },
...@@ -38,7 +38,7 @@ const webpackConfig = merge(baseWebpackConfig, { ...@@ -38,7 +38,7 @@ const webpackConfig = merge(baseWebpackConfig, {
uglifyOptions: { uglifyOptions: {
compress: { compress: {
warnings: false, warnings: false,
drop_console:true drop_console:process.env.NODE_ENV === 'production'?true:false
} }
}, },
sourceMap: config.build.productionSourceMap, sourceMap: config.build.productionSourceMap,
...@@ -46,6 +46,7 @@ const webpackConfig = merge(baseWebpackConfig, { ...@@ -46,6 +46,7 @@ const webpackConfig = merge(baseWebpackConfig, {
}), }),
// extract css into its own file // extract css into its own file
new ExtractTextPlugin({ new ExtractTextPlugin({
// filename: utils.assetsPath(env.versionTime+'/css/[name].[contenthash].css'),
filename: utils.assetsPath('css/[name].[contenthash].css'), filename: utils.assetsPath('css/[name].[contenthash].css'),
// Setting the following option to `false` will not extract CSS from codesplit chunks. // 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. // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack.
......
...@@ -3,6 +3,11 @@ ...@@ -3,6 +3,11 @@
// see http://vuejs-templates.github.io/webpack for documentation. // see http://vuejs-templates.github.io/webpack for documentation.
const path = require('path'); const path = require('path');
const env = process.env.NODE_ENV === 'testing'
? require('../config/test.env')
: require('../config/prod.env')
// let Paths = 'static/'+env.versionTime
let Paths = 'static'
module.exports = { module.exports = {
dev: { dev: {
// Paths // Paths
...@@ -23,7 +28,6 @@ module.exports = { ...@@ -23,7 +28,6 @@ module.exports = {
errorOverlay: true, errorOverlay: true,
notifyOnErrors: true, notifyOnErrors: true,
poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
/** /**
* Source Maps * Source Maps
*/ */
...@@ -43,7 +47,8 @@ module.exports = { ...@@ -43,7 +47,8 @@ module.exports = {
index: process.env.NODE_ENV === 'production' ? path.resolve(__dirname, '../dist/index.html') : path.resolve(__dirname, '../dev/index.html'), index: process.env.NODE_ENV === 'production' ? path.resolve(__dirname, '../dist/index.html') : path.resolve(__dirname, '../dev/index.html'),
// Paths // Paths
assetsRoot: process.env.NODE_ENV === 'production' ? path.resolve(__dirname, '../dist') : path.resolve(__dirname, '../dev'), assetsRoot: process.env.NODE_ENV === 'production' ? path.resolve(__dirname, '../dist') : path.resolve(__dirname, '../dev'),
assetsSubDirectory:process.env.NODE_ENV === 'production' ? 'static201906101550':'static', // assetsSubDirectory:process.env.NODE_ENV === 'production' ? 'static/2019061017':'static',
assetsSubDirectory:Paths,
assetsPublicPath: process.env.NODE_ENV === 'production' ? 'https://static-cdn.changchangenglish.com/new-sing/' : '', assetsPublicPath: process.env.NODE_ENV === 'production' ? 'https://static-cdn.changchangenglish.com/new-sing/' : '',
/** /**
......
...@@ -4,6 +4,7 @@ module.exports = { ...@@ -4,6 +4,7 @@ module.exports = {
IMAGE_URL_HEAD:'"https://cdn.singsingenglish.com/"', IMAGE_URL_HEAD:'"https://cdn.singsingenglish.com/"',
API_URL: '"https://wechat.changchangenglish.com/"', API_URL: '"https://wechat.changchangenglish.com/"',
MAX_FILESIZE:'1024*1024*10', MAX_FILESIZE:'1024*1024*10',
versionTime: '2019061315',
BUY_URL:'"https://wechat.changchangenglish.com/#/buyDetail?"', BUY_URL:'"https://wechat.changchangenglish.com/#/buyDetail?"',
AUTHOR_UEL:'"https://wechat.changchangenglish.com/api/client/login?redirect_url=https://wechat.changchangenglish.com"' AUTHOR_UEL:'"https://wechat.changchangenglish.com/api/client/login?redirect_url=https://wechat.changchangenglish.com"'
}; };
...@@ -5,5 +5,6 @@ module.exports = { ...@@ -5,5 +5,6 @@ module.exports = {
API_URL: '"https://wechat-test.changchangenglish.com/"', API_URL: '"https://wechat-test.changchangenglish.com/"',
MAX_FILESIZE:'1024*1024*10', MAX_FILESIZE:'1024*1024*10',
BUY_URL:'"https://wechat-test.changchangenglish.com/#/buyDetail?"', BUY_URL:'"https://wechat-test.changchangenglish.com/#/buyDetail?"',
AUTHOR_UEL:'"https://wechat-test.changchangenglish.com/api/client/login?redirect_url=https://wechat-test.changchangenglish.com"' AUTHOR_UEL:'"https://wechat-test.changchangenglish.com/api/client/login?redirect_url=https://wechat-test.changchangenglish.com"',
versionTime: '2019061315',
}; };
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
overflow: hidden; overflow: hidden;
position: fixed; position: fixed;
background: #f4f4f4; background: #f4f4f4;
}</style><link href=static/css/app.3c0ad5f24e07150c06bc3b21fbd29d4b.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script type=text/javascript src=static/js/manifest.aa67a11fb0847f602dd1.js></script><script type=text/javascript src=static/js/vendor.1396ea78033e4259211e.js></script><script type=text/javascript src=static/js/app.39407b15d4282a93c0e2.js></script></body></html> }</style><link href=static/css/app.3c0ad5f24e07150c06bc3b21fbd29d4b.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script src=static/vconsole/vconsole.min.js></script><script></script><script type=text/javascript src=static/js/manifest.e8742ac03569444e6b90.js></script><script type=text/javascript src=static/js/vendor.1396ea78033e4259211e.js></script><script type=text/javascript src=static/js/app.1f8c30d70cea6823b3d5.js></script></body></html>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,t){for(var b,d,o,i=0,u=[];i<c.length;i++)d=c[i],f[d]&&u.push(f[d][0]),f[d]=0;for(b in r)Object.prototype.hasOwnProperty.call(r,b)&&(e[b]=r[b]);for(a&&a(c,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)o=n(n.s=t[i]);return o};var c={},f={41:0};function n(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,n){a=f[e]=[c,n]});a[2]=c;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"e0a157264831bd2b9901",1:"067eb29318c0050830ab",2:"a2b6f17abe7cb598878f",3:"df615b23f17a30912d1b",4:"81f114f6d9f17c65242c",5:"4b301c8e740a130f1af9",6:"ad1648da69d720d39bfb",7:"444d7b0abf9c5e1daf59",8:"28436d121bb2eef7b629",9:"6c3e0678c0b9a1755e94",10:"34cdf9432767e3bc8f10",11:"63527e5eb89ffdf9ff28",12:"477f60ece425a6f8c08c",13:"2569f79a79a47b4a391f",14:"faf8b426fde50aebbf71",15:"7ed79964df837616767d",16:"3b2d791b2189be05aee4",17:"fec7400f11507033191b",18:"f6d28946ec7e53987ea1",19:"3268052ca4bd9410680a",20:"8b98e80acb1e2b230a38",21:"c5b97c20eeab081ca77e",22:"971be874abb8c99a251f",23:"95dd7cde0fd5f3d5dc48",24:"d71f9865d3c4d59dd149",25:"313cea5f48b249877b34",26:"a429ab1b776443ddf32a",27:"fee3b3ba9895683c31d5",28:"3bd29884a0becc053c56",29:"88a28b13ef752068d901",30:"9bcd686cd8b422f87c3b",31:"eb6d3a67f0ea7ef6ecd3",32:"36917bae854a9d5d9250",33:"90551372eed114ae129f",34:"47030c121a8712150211",35:"068ee442ab172ea186e8",36:"c9ac77f5e6bf5d548349",37:"2163df37097ba17a8388",38:"484fb0d46b52bbc4cf54"}[e]+".js";var b=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(b);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),c},n.m=e,n.c=c,n.d=function(e,a,c){n.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},n.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(a,"a",a),a},n.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},n.p="",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style>*{ <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style>*{
-webkit-overflow-scrolling:touch; -webkit-overflow-scrolling:touch;
}</style><link href=https://static-cdn.changchangenglish.com/new-sing/static201906041550/css/app.3fc02017cc9fd42447098e3b0eef31cd.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static201906041550/js/manifest.2a00ffa864fa2de659f5.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static201906041550/js/vendor.0c05adfd96a1d8f3b647.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static201906041550/js/app.0e9148a3206014dc945b.js></script></body></html> }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.a239ee69eeb12ff8f852f34857de81b2.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/manifest.8ca59cec8b7c0675d8be.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.0c05adfd96a1d8f3b647.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.baf8eb0059f678b5090d.js></script></body></html>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment