From ba3f64fabefaa8196b2f21bf77d26fce3f551afa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 11:30:20 +0800 Subject: [PATCH 1/5] chore: bump micromatch from 4.0.5 to 4.0.8 (#773) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pnpm-lock.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bbdd8bc8..3896cc64 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2967,7 +2967,7 @@ packages: jest-util: 27.5.1 jest-validate: 27.5.1 jest-watcher: 27.5.1 - micromatch: 4.0.5 + micromatch: 4.0.8 rimraf: 3.0.2 slash: 3.0.0 strip-ansi: 6.0.1 @@ -3099,7 +3099,7 @@ packages: jest-haste-map: 27.5.1 jest-regex-util: 27.5.1 jest-util: 27.5.1 - micromatch: 4.0.5 + micromatch: 4.0.8 pirates: 4.0.5 slash: 3.0.0 source-map: 0.6.1 @@ -3123,7 +3123,7 @@ packages: jest-haste-map: 29.5.0 jest-regex-util: 29.4.3 jest-util: 29.5.0 - micromatch: 4.0.5 + micromatch: 4.0.8 pirates: 4.0.5 slash: 3.0.0 write-file-atomic: 4.0.2 @@ -5718,7 +5718,7 @@ packages: '@nodelib/fs.walk': 1.2.8 glob-parent: 5.1.2 merge2: 1.4.1 - micromatch: 4.0.5 + micromatch: 4.0.8 /fast-json-stable-stringify@2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} @@ -6695,7 +6695,7 @@ packages: jest-runner: 27.5.1 jest-util: 27.5.1 jest-validate: 27.5.1 - micromatch: 4.0.5 + micromatch: 4.0.8 parse-json: 5.2.0 pretty-format: 27.5.1 slash: 3.0.0 @@ -6785,7 +6785,7 @@ packages: jest-serializer: 27.5.1 jest-util: 27.5.1 jest-worker: 27.5.1 - micromatch: 4.0.5 + micromatch: 4.0.8 walker: 1.0.8 optionalDependencies: fsevents: 2.3.3 @@ -6804,7 +6804,7 @@ packages: jest-regex-util: 29.4.3 jest-util: 29.5.0 jest-worker: 29.5.0 - micromatch: 4.0.5 + micromatch: 4.0.8 walker: 1.0.8 optionalDependencies: fsevents: 2.3.3 @@ -6862,7 +6862,7 @@ packages: '@types/stack-utils': 2.0.1 chalk: 4.1.2 graceful-fs: 4.2.10 - micromatch: 4.0.5 + micromatch: 4.0.8 pretty-format: 27.5.1 slash: 3.0.0 stack-utils: 2.0.5 @@ -7389,7 +7389,7 @@ packages: execa: 7.1.1 lilconfig: 2.1.0 listr2: 5.0.8 - micromatch: 4.0.5 + micromatch: 4.0.8 normalize-path: 3.0.0 object-inspect: 1.12.3 pidtree: 0.6.0 @@ -7618,8 +7618,8 @@ packages: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} - /micromatch@4.0.5: - resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} + /micromatch@4.0.8: + resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} engines: {node: '>=8.6'} dependencies: braces: 3.0.3 From d647e1be8c345a73a5634413ef667436e606eb0d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 15:28:12 +0800 Subject: [PATCH 2/5] chore: bump elliptic from 6.5.4 to 6.5.7 (#774) Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.4 to 6.5.7. - [Commits](https://github.com/indutny/elliptic/compare/v6.5.4...v6.5.7) --- updated-dependencies: - dependency-name: elliptic dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pnpm-lock.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3896cc64..e346fb7d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4586,7 +4586,7 @@ packages: browserify-rsa: 4.1.0 create-hash: 1.2.0 create-hmac: 1.1.7 - elliptic: 6.5.4 + elliptic: 6.5.7 inherits: 2.0.4 parse-asn1: 5.1.6 readable-stream: 3.6.2 @@ -4954,7 +4954,7 @@ packages: resolution: {integrity: sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==} dependencies: bn.js: 4.12.0 - elliptic: 6.5.4 + elliptic: 6.5.7 dev: false /create-hash@1.2.0: @@ -5326,8 +5326,8 @@ packages: /electron-to-chromium@1.4.331: resolution: {integrity: sha512-tdtr9y9oJl8VDiS+HeB6e/JDJqdDGjIk3yRfEMHm5rDnWQ/D5SbafybAayInxolbfbH6pouV5g7ZUAwE/WVtHw==} - /elliptic@6.5.4: - resolution: {integrity: sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==} + /elliptic@6.5.7: + resolution: {integrity: sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==} dependencies: bn.js: 4.12.0 brorand: 1.1.0 From 19687f187753db8bb7b170d7dbc9b954a9d1326e Mon Sep 17 00:00:00 2001 From: Jinbao1001 Date: Fri, 18 Oct 2024 12:37:02 +0800 Subject: [PATCH 3/5] fix: use asyncChunks instead of babel-plugin-dynamic-import-node (#784) * fix: use asyncChunks instead of babel-plugin-dynamic-import-node * fix: update lock --- src/builder/bundle/index.ts | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/builder/bundle/index.ts b/src/builder/bundle/index.ts index 548a2d54..2cf8d7ea 100644 --- a/src/builder/bundle/index.ts +++ b/src/builder/bundle/index.ts @@ -31,7 +31,9 @@ interface IBundleOpts { incremental?: boolean; } -function bundle(opts: Omit): Promise; +function bundle( + opts: Omit, +): Promise; function bundle(opts: IBundleOpts): Promise; async function bundle(opts: IBundleOpts): Promise { const enableCache = process.env.FATHER_CACHE !== 'none'; @@ -111,7 +113,6 @@ async function bundle(opts: IBundleOpts): Promise { }, ], beforeBabelPlugins: [ - require.resolve('babel-plugin-dynamic-import-node'), ...(babelSCOpts ? [[require.resolve('babel-plugin-styled-components'), babelSCOpts]] : []), @@ -122,7 +123,11 @@ async function bundle(opts: IBundleOpts): Promise { // configure library related options chainWebpack(memo: any) { memo.output.libraryTarget('umd'); - + memo.merge({ + output: { + asyncChunks: false, + }, + }); if (config?.name) { memo.output.library(config.name); } @@ -165,21 +170,21 @@ async function bundle(opts: IBundleOpts): Promise { // enable webpack persistent cache ...(enableCache ? { - cache: { - buildDependencies: opts.buildDependencies, - }, - } + cache: { + buildDependencies: opts.buildDependencies, + }, + } : {}), // collect close handlers for watch mode ...(opts.watch ? { - onBuildComplete({ isFirstCompile, close }: any) { - if (isFirstCompile) closeHandlers.push(close); - // log for watch mode - else logStatus(); - }, - } + onBuildComplete({ isFirstCompile, close }: any) { + if (isFirstCompile) closeHandlers.push(close); + // log for watch mode + else logStatus(); + }, + } : {}), disableCopy: true, }); From 8e88632a7f5396ce9dda9f962a355a2282900573 Mon Sep 17 00:00:00 2001 From: Jinbao1001 Date: Fri, 18 Oct 2024 12:38:53 +0800 Subject: [PATCH 4/5] build: release 4.5.1 --- boilerplate/package.json | 2 +- package.json | 12 +++---- pnpm-lock.yaml | 76 ++++++++++++++++++++-------------------- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/boilerplate/package.json b/boilerplate/package.json index eebbf672..1dc3b820 100644 --- a/boilerplate/package.json +++ b/boilerplate/package.json @@ -1,6 +1,6 @@ { "name": "create-father", - "version": "4.5.0", + "version": "4.5.1", "description": "Creator for father boilerplate", "homepage": "https://github.com/umijs/father/tree/master/boilerplate#readme", "bugs": "https://github.com/umijs/father/issues", diff --git a/package.json b/package.json index 4beec2be..13412e65 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "father", - "version": "4.5.0", + "version": "4.5.1", "description": "A bundless/bundle build tool", "homepage": "https://github.com/umijs/father#readme", "bugs": "https://github.com/umijs/father/issues", @@ -43,12 +43,12 @@ }, "dependencies": { "@microsoft/api-extractor": "7.39.1", - "@umijs/babel-preset-umi": "^4.3.12", - "@umijs/bundler-utils": "^4.3.12", - "@umijs/bundler-webpack": "^4.3.12", + "@umijs/babel-preset-umi": "^4.3.27", + "@umijs/bundler-utils": "^4.3.27", + "@umijs/bundler-webpack": "^4.3.27", "@umijs/case-sensitive-paths-webpack-plugin": "^1.0.1", - "@umijs/core": "^4.3.12", - "@umijs/utils": "^4.3.12", + "@umijs/core": "^4.3.27", + "@umijs/utils": "^4.3.27", "@vercel/ncc": "0.33.3", "babel-plugin-dynamic-import-node": "2.3.3", "babel-plugin-module-resolver": "4.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e346fb7d..181dee9b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,23 +12,23 @@ importers: specifier: 7.39.1 version: 7.39.1(@types/node@18.15.13) '@umijs/babel-preset-umi': - specifier: ^4.3.12 - version: 4.3.12 + specifier: ^4.3.27 + version: 4.3.27 '@umijs/bundler-utils': - specifier: ^4.3.12 - version: 4.3.12 + specifier: ^4.3.27 + version: 4.3.27 '@umijs/bundler-webpack': - specifier: ^4.3.12 - version: 4.3.12(typescript@5.3.3)(webpack@5.80.0) + specifier: ^4.3.27 + version: 4.3.27(typescript@5.3.3)(webpack@5.80.0) '@umijs/case-sensitive-paths-webpack-plugin': specifier: ^1.0.1 version: 1.0.1 '@umijs/core': - specifier: ^4.3.12 - version: 4.3.12 + specifier: ^4.3.27 + version: 4.3.27 '@umijs/utils': - specifier: ^4.3.12 - version: 4.3.12 + specifier: ^4.3.27 + version: 4.3.27 '@vercel/ncc': specifier: 0.33.3 version: 0.33.3 @@ -3761,24 +3761,24 @@ packages: dependencies: '@types/yargs-parser': 21.0.0 - /@umijs/babel-preset-umi@4.3.12: - resolution: {integrity: sha512-aItA/OUu5/cMcTC/QXBGLtcInedOnF2pBc5YhoAgsMN+lpkO5v/8tByfohqXT5/2LVzNH7x/H8ALjZWjO+WOVQ==} + /@umijs/babel-preset-umi@4.3.27: + resolution: {integrity: sha512-HOVxEkIFNQKKwMNwsdYo644CnT9fxwAvenIWOIQS5CFsZn6GGaEPVk9vgCTzXLiM2oT2F2OrDAxr6m6+5U7ZHw==} dependencies: '@babel/runtime': 7.23.6 '@bloomberg/record-tuple-polyfill': 0.0.4 - '@umijs/bundler-utils': 4.3.12 - '@umijs/utils': 4.3.12 + '@umijs/bundler-utils': 4.3.27 + '@umijs/utils': 4.3.27 core-js: 3.34.0 transitivePeerDependencies: - supports-color dev: false - /@umijs/bundler-esbuild@4.3.12: - resolution: {integrity: sha512-docsxqwgxFMygpdosxI2mjL2sYuN7JBp7QcKD3qf/URrWOeo0lPq5Oi7YALrfVPEsHUimW7JVEYszCuo+U4//A==} + /@umijs/bundler-esbuild@4.3.27: + resolution: {integrity: sha512-pibT0RAabzxEo9ZXpR9pkG10jFmsgB0iNi49x8GHsJVEmPr33fTzBVyqoI0he5PHIhYuXMhsvN3loP2O6VOjcg==} hasBin: true dependencies: - '@umijs/bundler-utils': 4.3.12 - '@umijs/utils': 4.3.12 + '@umijs/bundler-utils': 4.3.27 + '@umijs/utils': 4.3.27 enhanced-resolve: 5.9.3 postcss: 8.4.31 postcss-flexbugs-fixes: 5.0.2(postcss@8.4.31) @@ -3799,10 +3799,10 @@ packages: - supports-color dev: true - /@umijs/bundler-utils@4.3.12: - resolution: {integrity: sha512-F9RjftHWtWgxrTBPpvzfqgAqsYHhgnPKQLFRokQzKaF+qPbK5CXj1DhePDWb9tFQxzKmkiCfzg419uVqjctloQ==} + /@umijs/bundler-utils@4.3.27: + resolution: {integrity: sha512-3qGC0Uhq3HCEAeOKjnQVT9CJftV8ZNXK7xcX0DENK8tMCCAE6SLHNCrVZNvQ/MO+Njgkp3Kgc6vVEhE3OvfLtQ==} dependencies: - '@umijs/utils': 4.3.12 + '@umijs/utils': 4.3.27 esbuild: 0.21.4 regenerate: 1.4.2 regenerate-unicode-properties: 10.1.1 @@ -3811,20 +3811,20 @@ packages: - supports-color dev: false - /@umijs/bundler-webpack@4.3.12(typescript@5.3.3)(webpack@5.80.0): - resolution: {integrity: sha512-WDLK2Y7arX+S60OO/p6pM4G+YcLidLOGbpGcvm5IHUcpMyJltPfLTN/xvVd+Gyn3TXxMaLA16BEiTDTUSrpohA==} + /@umijs/bundler-webpack@4.3.27(typescript@5.3.3)(webpack@5.80.0): + resolution: {integrity: sha512-E/pufw3sMxl5k8t/9GbPJP3NuhFcmwLNlMWHEhTirtGqPlYC7Gsqn07H6ZPAwXaDoB8M3u0Rowmgn9KBtWGFFQ==} hasBin: true dependencies: '@svgr/core': 6.5.1 '@svgr/plugin-jsx': 6.5.1(@svgr/core@6.5.1) '@svgr/plugin-svgo': 6.5.1(@svgr/core@6.5.1) '@types/hapi__joi': 17.1.9 - '@umijs/babel-preset-umi': 4.3.12 - '@umijs/bundler-utils': 4.3.12 + '@umijs/babel-preset-umi': 4.3.27 + '@umijs/bundler-utils': 4.3.27 '@umijs/case-sensitive-paths-webpack-plugin': 1.0.1 - '@umijs/mfsu': 4.3.12 + '@umijs/mfsu': 4.3.27 '@umijs/react-refresh-webpack-plugin': 0.5.11(react-refresh@0.14.0)(webpack@5.80.0) - '@umijs/utils': 4.3.12 + '@umijs/utils': 4.3.27 cors: 2.8.5 css-loader: 6.7.1(webpack@5.80.0) es5-imcompatible-versions: 0.1.80 @@ -3852,21 +3852,21 @@ packages: resolution: {integrity: sha512-kDKJ8yTarxwxGJDInG33hOpaQRZ//XpNuuznQ/1Mscypw6kappzFmrBr2dOYave++K7JHouoANF354UpbEQw0Q==} dev: false - /@umijs/core@4.3.12: - resolution: {integrity: sha512-PdrzIxpicKTN0jTqJ3Rl+BTVXP/gNIjy7+Sn/z3AgbgZek2EObPsV72sXvMbTzvqLL35XPdZF+Ci9CnLXVGZTQ==} + /@umijs/core@4.3.27: + resolution: {integrity: sha512-DfJYfQsAvdgkKoYj8A0tJTHS2TR1hJHD9kOuosrWMCvi9O9RLHBvm/qa9EKw0LukKYDZqJYKJNVT3lFK0jdxfA==} dependencies: - '@umijs/bundler-utils': 4.3.12 - '@umijs/utils': 4.3.12 + '@umijs/bundler-utils': 4.3.27 + '@umijs/utils': 4.3.27 transitivePeerDependencies: - supports-color dev: false - /@umijs/mfsu@4.3.12: - resolution: {integrity: sha512-yryvvFTpbqgkZtnzPzHQj4/kYkl0hTKUnDr7KY0qq212y8lnykFD/afsmSk5IX0TEeel2bwYZV4a5RUEq1ahOA==} + /@umijs/mfsu@4.3.27: + resolution: {integrity: sha512-efyg3CWUJcKBCd7MbtdPMtbr/ijoGtgsaFmrRuJbf3dajtV7kh+QVyLcnCIqmAyCJv9DJzN6VqXlSOkg99loSQ==} dependencies: - '@umijs/bundler-esbuild': 4.3.12 - '@umijs/bundler-utils': 4.3.12 - '@umijs/utils': 4.3.12 + '@umijs/bundler-esbuild': 4.3.27 + '@umijs/bundler-utils': 4.3.27 + '@umijs/utils': 4.3.27 enhanced-resolve: 5.9.3 is-equal: 1.6.4 transitivePeerDependencies: @@ -3942,8 +3942,8 @@ packages: pino: 7.11.0 dev: true - /@umijs/utils@4.3.12: - resolution: {integrity: sha512-mq7zm9HEcOmnf7uaedZlu1pVL65FFPjTIuyY0RvggETaAwfoeYBwQQQktPS8icjbpWlf4pe14a2cT/emVXjweQ==} + /@umijs/utils@4.3.27: + resolution: {integrity: sha512-jPKXR4GnRavWprXUfUKQzUvH1urK7qhZhNrKRP8v9kkEiI9CSz3Dl95TdcmEKhZuZrx7HzO5B9gS21G7Up+W2g==} dependencies: chokidar: 3.5.3 pino: 7.11.0 From e537130aa545d3fa68e838f4dea1611f3bd025ac Mon Sep 17 00:00:00 2001 From: Jinbao1001 Date: Wed, 30 Oct 2024 14:44:38 +0800 Subject: [PATCH 5/5] fix: bundless output logger --- src/builder/bundless/loaders/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/builder/bundless/loaders/index.ts b/src/builder/bundless/loaders/index.ts index b3dd6e42..929e7ad5 100644 --- a/src/builder/bundless/loaders/index.ts +++ b/src/builder/bundless/loaders/index.ts @@ -55,8 +55,8 @@ function dealResult(result: any, args: ILoaderArgs) { fs.copyFileSync(args.fileAbsPath, fileDistAbsPath); } logger.quietExpect.event( - `Bundless ${chalk.gray(path.basename(fileDistAbsPath))} to ${chalk.gray( - args.fileDistPath, + `Bundless ${chalk.gray(path.basename(args.fileAbsPath))} to ${chalk.gray( + replacePathExt(args.fileDistPath, result.options.ext), )}${result?.options.declaration ? ' (with declaration)' : ''}`, ); // prepare for declaration