diff --git a/config/web/webpack.config.js b/config/web/webpack.config.js index 65fd35d..96713a9 100644 --- a/config/web/webpack.config.js +++ b/config/web/webpack.config.js @@ -211,9 +211,9 @@ module.exports = function (webpackEnv) { 'configuration', 'compiler.js' ); - const projectConfiguration = - fs.existsSync(compilerConfigurationFile) && - require(compilerConfigurationFile).webpack; + const projectConfiguration = fs.existsSync(compilerConfigurationFile) && require(compilerConfigurationFile).webpack; + const splitChunks = projectConfiguration && projectConfiguration.splitChunks; + const externals = projectConfiguration && projectConfiguration.externals; const getOakInclude = () => { const result = [/oak-frontend-base/, /oak-general-business/]; @@ -340,12 +340,6 @@ module.exports = function (webpackEnv) { splitChunks: { chunks: 'async', cacheGroups: { - '@wangeditor/basic-modules': { - name: 'wangeditor_basic_modules', - test: /@wangeditor\/basic-modules/, - priority: 30, - reuseExistingChunk: true, - }, icon_park: { name: 'icon_park', test: /@icon-park\/react/, @@ -376,6 +370,7 @@ module.exports = function (webpackEnv) { priority: 10, reuseExistingChunk: true, }, + ...((splitChunks && splitChunks.cacheGroups) || {}) }, }, }, @@ -1018,13 +1013,12 @@ module.exports = function (webpackEnv) { performance: false, // 在非开发模式下，排除相关模块，以使用CDN加载 externals: !isEnvDevelopment ? { - echarts: 'echarts', lodash: '_', react: 'React', 'react-dom': 'ReactDOM', - '@wangeditor/editor': 'wangEditor', '@fingerprintjs/fingerprintjs': 'FingerprintJS', 'bn.js': 'BN', + ...(externals || {}) } : {}, }; }; diff --git a/lib/index.js b/lib/index.js index fa9c179..faaf9f4 100755 --- a/lib/index.js +++ b/lib/index.js @@ -31,7 +31,7 @@ function enhanceErrorMessages(methodName, log) { const currentNodeVersion = process.versions.node; const semver = currentNodeVersion.split('.'); const major = semver[0]; -const minNodeVersion = 14; +const minNodeVersion = 16; if (Number(major) < minNodeVersion) { console.error('You are running Node ' + currentNodeVersion + diff --git a/lib/server/start.js b/lib/server/start.js index cc066a7..3d6705f 100644 --- a/lib/server/start.js +++ b/lib/server/start.js @@ -41,7 +41,7 @@ async function startup(path, connector, omitWatchers, omitTimers, routine) { const httpServer = (0, http_1.createServer)(koa.callback()); const socketOption = { path: connector.getSocketPath(), - cors: process.env.NODE_ENV === 'development' + cors: ['development', 'staging'].includes(process.env.NODE_ENV) ? { origin: '*', allowedHeaders: corsHeaders.concat(connector.getCorsHeader()), @@ -96,9 +96,9 @@ async function startup(path, connector, omitWatchers, omitTimers, routine) { return; } }); - koa.use((0, koa_body_1.default)({ + koa.use((0, koa_body_1.default)(Object.assign({ multipart: true, - })); + }, serverConfiguration.koaBody))); const router = new koa_router_1.default(); // 如果是开发环境，允许options if (['development', 'staging'].includes(process.env.NODE_ENV)) { @@ -201,9 +201,9 @@ async function startup(path, connector, omitWatchers, omitTimers, routine) { endpoints.forEach(([name, method, url, fn]) => { router[method](url, async (ctx) => { const { req, request, params } = ctx; - const { body, headers } = request; + const { body, headers, files } = request; try { - const result = await fn(params, headers, req, body); + const result = await fn(params, headers, req, files ? Object.assign({}, body, files) : body); ctx.response.body = result; return; } diff --git a/package.json b/package.json index 473ad67..a707f5f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@xuchangzju/oak-cli", - "version": "4.0.14", + "version": "4.0.16", "description": "client for oak framework", "main": "lib/index.js", "scripts": { diff --git a/src/index.ts b/src/index.ts index 4774398..ee98548 100644 --- a/src/index.ts +++ b/src/index.ts @@ -30,7 +30,7 @@ function enhanceErrorMessages(methodName: string, log: Function) { const currentNodeVersion = process.versions.node; const semver = currentNodeVersion.split('.'); const major = semver[0]; -const minNodeVersion = 14; +const minNodeVersion = 16; if (Number(major) < minNodeVersion) { console.error( diff --git a/src/server/start.ts b/src/server/start.ts index da4eb26..c4577bf 100644 --- a/src/server/start.ts +++ b/src/server/start.ts @@ -59,8 +59,7 @@ export async function startup = { path: connector.getSocketPath(), - cors: - process.env.NODE_ENV === 'development' + cors: ['development', 'staging'].includes(process.env.NODE_ENV!) ? { origin: '*', allowedHeaders: corsHeaders.concat(connector.getCorsHeader()), @@ -136,9 +135,9 @@ export async function startup { router[method](url, async (ctx) => { const { req, request, params } = ctx; - const { body, headers } = request; + const { body, headers, files } = request; try { - const result = await fn(params, headers, req, body); + const result = await fn(params, headers, req, files ? Object.assign({}, body, files) : body); ctx.response.body = result; return; } catch (err) { diff --git a/template/web/public/index.html b/template/web/public/index.html index 1f698c7..583b580 100644 --- a/template/web/public/index.html +++ b/template/web/public/index.html @@ -44,13 +44,6 @@ - - - - - - - -