From a4b2df01de1a54a71c167ee3bf65c45014ce4e4a Mon Sep 17 00:00:00 2001 From: "zhisai.szs" Date: Thu, 18 May 2023 19:29:29 +0800 Subject: [PATCH 1/2] fix: json extension --- CHANGELOG.md | 8 ++++++-- package.json | 2 +- src/utils/webpack-config.ts | 1 + src/utils/webpack-dll-config.ts | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64ee7f95..b32d89ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,11 @@ - -## [4.3.20-beta.1](https://github.com/prijs/pri/compare/3.3.28-beta.5...4.3.20-beta.1) (2023-02-02) + +## [4.4.1-beta.0](https://github.com/prijs/pri/compare/3.3.28-beta.5...4.4.1-beta.0) (2023-05-18) ### Bug Fixes * 判断包名都用package.json中的name ([29e33df](https://github.com/prijs/pri/commit/29e33df)) +* 使用reject替代throw，使得child_process子进程可以以异常状态退出 ([ed9d17d](https://github.com/prijs/pri/commit/ed9d17d)) * 修复子package互相引用的时候，测试报错的问题 ([55570a9](https://github.com/prijs/pri/commit/55570a9)) * 修复组件编译模式无差别产生 sourcemap ([06a444f](https://github.com/prijs/pri/commit/06a444f)) * 子包路由解析问题 ([37da1be](https://github.com/prijs/pri/commit/37da1be)) @@ -15,6 +16,8 @@ * analyse output ([39c6c0c](https://github.com/prijs/pri/commit/39c6c0c)) * auth selected package ([6987871](https://github.com/prijs/pri/commit/6987871)) * autofix package.version while betaBranch ([596b803](https://github.com/prijs/pri/commit/596b803)) +* babel ([015ae00](https://github.com/prijs/pri/commit/015ae00)) +* babel ([54790e6](https://github.com/prijs/pri/commit/54790e6)) * babel-loader options ([01ec7be](https://github.com/prijs/pri/commit/01ec7be)) * bug ([c37b05b](https://github.com/prijs/pri/commit/c37b05b)) * bug ([b65ab71](https://github.com/prijs/pri/commit/b65ab71)) @@ -77,6 +80,7 @@ * type ([f67ca43](https://github.com/prijs/pri/commit/f67ca43)) * update ([722c764](https://github.com/prijs/pri/commit/722c764)) * update fork-ts-checker-webpack-plugin ([0caed8e](https://github.com/prijs/pri/commit/0caed8e)) +* upgrade babel ([1f8aa7d](https://github.com/prijs/pri/commit/1f8aa7d)) * use sync mode when process.stdio is connected to pipe ([9eb7a50](https://github.com/prijs/pri/commit/9eb7a50)) * version ([fe2136b](https://github.com/prijs/pri/commit/fe2136b)) * WrapContent plugin ([7dffb13](https://github.com/prijs/pri/commit/7dffb13)) diff --git a/package.json b/package.json index ca3cc543..3851b100 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pri", - "version": "4.4.0", + "version": "4.4.1", "types": "src/node/index.ts", "main": "built/node/index.js", "scripts": { diff --git a/src/utils/webpack-config.ts b/src/utils/webpack-config.ts index 58a884d0..dd43f42c 100644 --- a/src/utils/webpack-config.ts +++ b/src/utils/webpack-config.ts @@ -317,6 +317,7 @@ export const getWebpackConfig = async (opts: IOptions) => { 'eot', 'ttf', 'svg', + '.json' ], }, resolveLoader: { diff --git a/src/utils/webpack-dll-config.ts b/src/utils/webpack-dll-config.ts index 0825a801..6b8b234e 100644 --- a/src/utils/webpack-dll-config.ts +++ b/src/utils/webpack-dll-config.ts @@ -71,7 +71,7 @@ export const getWebpackDllConfig = (opts: IDllOptions) => { // Self node_modules path.join(__dirname, '../../../node_modules'), ], - extensions: ['.js', '.jsx', '.tsx', '.ts', '.scss', '.less', '.css'], + extensions: ['.js', '.jsx', '.tsx', '.ts', '.scss', '.less', '.css', '.json'], }, resolveLoader: { From 2005f4d0affe5b88a383c9cf029a06cbb1eed937 Mon Sep 17 00:00:00 2001 From: "zhisai.szs" Date: Thu, 18 May 2023 19:30:01 +0800 Subject: [PATCH 2/2] fix: json extension --- CHANGELOG.md | 2 -- src/utils/webpack-config.ts | 2 +- src/utils/webpack-dll-config.ts | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b32d89ac..f9f9a06a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,3 @@ - -## [4.4.1-beta.0](https://github.com/prijs/pri/compare/3.3.28-beta.5...4.4.1-beta.0) (2023-05-18) ### Bug Fixes diff --git a/src/utils/webpack-config.ts b/src/utils/webpack-config.ts index dd43f42c..04ba4653 100644 --- a/src/utils/webpack-config.ts +++ b/src/utils/webpack-config.ts @@ -317,7 +317,7 @@ export const getWebpackConfig = async (opts: IOptions) => { 'eot', 'ttf', 'svg', - '.json' + '.json', ], }, resolveLoader: { diff --git a/src/utils/webpack-dll-config.ts b/src/utils/webpack-dll-config.ts index 6b8b234e..ac2d4b36 100644 --- a/src/utils/webpack-dll-config.ts +++ b/src/utils/webpack-dll-config.ts @@ -71,7 +71,7 @@ export const getWebpackDllConfig = (opts: IDllOptions) => { // Self node_modules path.join(__dirname, '../../../node_modules'), ], - extensions: ['.js', '.jsx', '.tsx', '.ts', '.scss', '.less', '.css', '.json'], + extensions: ['.js', '.jsx', '.tsx', '.ts', '.scss', '.less', '.css', '.json'], }, resolveLoader: {