Merge branch 'dev' of git.singsingenglish.com:new-sing/admin into dev

build/build-pre.js

+'use strict'
+require('./check-versions')()
+
+process.env.NODE_ENV = 'pre'
+
+const ora = require('ora')
+const rm = require('rimraf')
+const path = require('path')
+const chalk = require('chalk')
+const webpack = require('webpack')
+const config = require('../config')
+const webpackConfig = require('./webpack.prod.conf')
+
+const spinner = ora('building for testing...')
+spinner.start()
+
+// rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
+//   if (err) throw err
+  webpack(webpackConfig, (err, stats) => {
+    spinner.stop()
+    if (err) throw err
+    process.stdout.write(stats.toString({
+      colors: true,
+      modules: false,
+      children: false, // If you are using ts-loader, setting this to true will make TypeScript errors show up during build.
+      chunks: false,
+      chunkModules: false
+    }) + '\n\n')
+
+    if (stats.hasErrors()) {
+      console.log(chalk.red('  Build failed with errors.\n'))
+      process.exit(1)
+    }
+
+    console.log(chalk.cyan('  Build complete.\n'))
+    console.log(chalk.yellow(
+      '  Tip: built files are meant to be served over an HTTP server.\n' +
+      '  Opening index.html over file:// won\'t work.\n'
+    ))
+  })
+// })

build/webpack.prod.conf.js

@@ -11,9 +11,17 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin')
 const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
-const env = process.env.NODE_ENV === 'testing'
-  ? require('../config/test.env')
-  : require('../config/prod.env')
+var env = null
+if(process.env.NODE_ENV === 'testing'){
+  env = require('../config/dev.env')
+}else if(process.env.NODE_ENV === 'pre'){
+  env = require('../config/test.env')
+}else{
+  env = require('../config/prod.env')
+}
+// const env = process.env.NODE_ENV === 'testing'
+//   ? require('../config/test.env')
+//   : require('../config/prod.env')
 
 const webpackConfig = merge(baseWebpackConfig, {
   module: {

config/index.js

@@ -26,7 +26,7 @@ module.exports = {
     proxyTable: {
       '/api': {
           // target: 'http://10.1.23.103', // 接口的域名
-        target: 'https://wechat-pre.changchangenglish.com/',
+        target: 'https://wechat-test.changchangenglish.com/',
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
       }
     },
@@ -51,9 +51,9 @@ module.exports = {
   },
   build: {
     // Template for index.html
-    index:  process.env.NODE_ENV === 'production' ? path.resolve(__dirname, '../dist/index.html') :  path.resolve(__dirname, '../pre/index.html'),
+    index: path.resolve(__dirname, '../dist/index.html'),
     // Paths
-    assetsRoot: process.env.NODE_ENV === 'production' ? path.resolve(__dirname, '../dist') : path.resolve(__dirname, '../pre'),
+    assetsRoot:path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
 

config/pre.env.js

+'use strict';
+module.exports = {
+  NODE_ENV: '"pre"',
+  IMAGE_URL_HEAD:'"https://cdn.singsingenglish.com/"',
+  API_URL: '"/"',
+  MAX_FILESIZE:'1024*1024*10',
+  SHOP_URL:'"https://w.url.cn/s/AX5b5QN"',
+  PERIODS_URL:'"https://w.url.cn/s/ARs9XI5"',
+  INVITE_URL:'"https://wechat-pre.changchangenglish.com/"',
+}

config/test.env.js

 'use strict';
-module.exports = {
+const merge = require('webpack-merge');
+const prodEnv = require('./prod.env');
+
+module.exports = merge(prodEnv, {
   NODE_ENV: '"testing"',
-  IMAGE_URL_HEAD:'"https://cdn.singsingenglish.com/"',
   API_URL: '"/"',
   MAX_FILESIZE:'1024*1024*10',
   SHOP_URL:'"https://w.url.cn/s/AX5b5QN"',
   PERIODS_URL:'"https://w.url.cn/s/ARs9XI5"',
-  INVITE_URL:'"https://wechat-pre.changchangenglish.com/"',
-}
+  IMAGE_URL_HEAD:'"https://cdn.singsingenglish.com/"',
+  INVITE_URL:'"https://wechat-test.changchangenglish.com/"',
+});

package.json

@@ -8,7 +8,8 @@
     "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
     "start": "npm run dev",
     "build": "node build/build.js",
-    "build-test": "node build/build-test.js"
+    "build-test": "node build/build-test.js",
+    "build-pre": "node build/build-pre.js"
   },
   "dependencies": {
     "@tinymce/tinymce-vue": "^1.0.8",