From 567abc4aac537f5aaa41dbbb9e7b0b9c2219f9de Mon Sep 17 00:00:00 2001 From: Xc Date: Tue, 19 Nov 2024 09:10:53 +0800 Subject: [PATCH 1/7] 4.0.14-pub --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 473ad67..9096b51 100644 --- a/package.json +++ b/package.json @@ -99,9 +99,9 @@ "lodash": "^4.17.21", "mini-css-extract-plugin": "^2.5.3", "node-watch": "^0.7.4", - "oak-backend-base": "file:../oak-backend-base", - "oak-domain": "file:../oak-domain", - "oak-frontend-base": "file:../oak-frontend-base", + "oak-backend-base": "^4.1.9", + "oak-domain": "^5.1.9", + "oak-frontend-base": "^5.3.18", "parse-asn1": "5.1.6", "postcss": "^8.4.4", "postcss-flexbugs-fixes": "^5.0.2", From 4ef3693ceca4d6406ab8c31527c65817786bddea Mon Sep 17 00:00:00 2001 From: Xc Date: Tue, 19 Nov 2024 09:12:29 +0800 Subject: [PATCH 2/7] 4.0.15-dev --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 9096b51..17e035a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@xuchangzju/oak-cli", - "version": "4.0.14", + "version": "4.0.15", "description": "client for oak framework", "main": "lib/index.js", "scripts": { @@ -99,9 +99,9 @@ "lodash": "^4.17.21", "mini-css-extract-plugin": "^2.5.3", "node-watch": "^0.7.4", - "oak-backend-base": "^4.1.9", - "oak-domain": "^5.1.9", - "oak-frontend-base": "^5.3.18", + "oak-backend-base": "file:../oak-backend-base", + "oak-domain": "file:../oak-domain", + "oak-frontend-base": "file:../oak-frontend-base", "parse-asn1": "5.1.6", "postcss": "^8.4.4", "postcss-flexbugs-fixes": "^5.0.2", From 9b7321d6b2465009c2e7001368b5a68d1f38c634 Mon Sep 17 00:00:00 2001 From: wkj <278599135@.com> Date: Thu, 21 Nov 2024 19:45:40 +0800 Subject: [PATCH 3/7] =?UTF-8?q?endpoints=20=E6=8E=A5=E6=94=B6=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/create.js | 2 +- lib/server/start.js | 12 ++++++------ src/server/start.ts | 11 +++++------ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/lib/create.js b/lib/create.js index 010cca9..92a2a54 100644 --- a/lib/create.js +++ b/lib/create.js @@ -240,7 +240,7 @@ async function create(dirName, cmd) { } // 获取package.json内容 const packageJson = (0, template_1.packageJsonContent)({ - name: DEFAULT_PROJECT_NAME, // 后面再统一rename + name: DEFAULT_PROJECT_NAME, version, description, cliName: config_1.CLI_NAME, diff --git a/lib/server/start.js b/lib/server/start.js index cc066a7..0ef4a2e 100644 --- a/lib/server/start.js +++ b/lib/server/start.js @@ -41,14 +41,14 @@ 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()), } : serverConfiguration.cors ? { - origin: serverConfiguration.cors.origin, //socket.io配置cors origin是支持数组和字符串 + origin: serverConfiguration.cors.origin, allowedHeaders: [ ...corsHeaders.concat(connector.getCorsHeader()), ...(serverConfiguration.cors.headers || []), @@ -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/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) { From ddc419bd7c87f8a31c174332b214600abaf66098 Mon Sep 17 00:00:00 2001 From: wkj <278599135@.com> Date: Mon, 25 Nov 2024 11:08:57 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=A7=BB=E9=99=A4echarts=E5=92=8Cwangedito?= =?UTF-8?q?r5=E7=9A=84cdn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/web/webpack.config.js | 16 +++++----------- lib/create.js | 2 +- lib/server/start.js | 2 +- template/web/public/index.html | 17 ----------------- 4 files changed, 7 insertions(+), 30 deletions(-) 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/create.js b/lib/create.js index 92a2a54..010cca9 100644 --- a/lib/create.js +++ b/lib/create.js @@ -240,7 +240,7 @@ async function create(dirName, cmd) { } // 获取package.json内容 const packageJson = (0, template_1.packageJsonContent)({ - name: DEFAULT_PROJECT_NAME, + name: DEFAULT_PROJECT_NAME, // 后面再统一rename version, description, cliName: config_1.CLI_NAME, diff --git a/lib/server/start.js b/lib/server/start.js index 0ef4a2e..3d6705f 100644 --- a/lib/server/start.js +++ b/lib/server/start.js @@ -48,7 +48,7 @@ async function startup(path, connector, omitWatchers, omitTimers, routine) { } : serverConfiguration.cors ? { - origin: serverConfiguration.cors.origin, + origin: serverConfiguration.cors.origin, //socket.io配置cors origin是支持数组和字符串 allowedHeaders: [ ...corsHeaders.concat(connector.getCorsHeader()), ...(serverConfiguration.cors.headers || []), 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 @@ - - - - - - - -