Merge branch 'version_forge' of http://gitea.trustie.net/jasder/forgeplus-react into version_forge

This commit is contained in:
caishi 2020-04-29 15:27:59 +08:00
commit 5cdebe0220
2 changed files with 16 additions and 15 deletions

View File

@ -21,12 +21,13 @@ const getClientEnvironment = require('./env');
// For these, "homepage" can be set to "." to enable relative asset paths.
let publicPath = '/react/build/';
let nodeEnv = process.env.NODE_ENV
if (nodeEnv === 'testBuild') {
publicPath = 'https://testali-cdn.educoder.net/react/build/';
}
if (nodeEnv === 'production') {
publicPath = 'https://ali-cdn.educoder.net/react/build/';
}
// if (nodeEnv === 'testBuild') {
// publicPath = 'https://testforgeplus.trustie.net/react/build/';
// }
// if (nodeEnv === 'production') {
// publicPath = 'https://forgeplus.trustie.net/react/build/';
// }
// publicPath = 'https://forgeplus.trustie.net/react/build/';
const publicUrl = publicPath.slice(0, -1);
const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
const env = getClientEnvironment(publicPath);
@ -51,12 +52,12 @@ module.exports = {
priority: -20,
reuseExistingChunk: true,
},
vendors: {
name: 'vendors',
test: /[\\/]node_modules[\\/]/,
priority: -10,
chunks: "all"
}
// vendors: {
// name: 'vendors',
// test: /[\\/]node_modules[\\/]/,
// priority: -10,
// chunks: "all"
// }
}
},
runtimeChunk: true

View File

@ -115,13 +115,13 @@ export function initAxiosInterceptors(props) {
// https://github.com/axios/axios/issues/1497
// TODO 读取到package.json中的配置
var proxy = "http://localhost:3000"
var proxy = "http://localhost:3004"
// proxy = "http://testbdweb.trustie.net"
// proxy = "http://testbdweb.educoder.net"
// proxy = "https://testeduplus2.educoder.net"
//proxy="http://47.96.87.25:48080"
proxy = "https://pre-newweb.educoder.net"
proxy = "https://testforgeplus.trustie.net/"
// proxy = "https://pre-newweb.educoder.net"
// proxy = "https://testforgeplus.trustie.net/"
// proxy="https://test-jupyterweb.educoder.net"
// proxy="https://test-newweb.educoder.net"
// proxy="https://test-jupyterweb.educoder.net"