From a9df111e7116fbff7ae4598b7d3e919c1273fdcb Mon Sep 17 00:00:00 2001 From: pshu Date: Mon, 27 May 2024 16:46:49 +0800 Subject: [PATCH 1/4] Reapply "fix:dynamic import as namespace import (#1171)" (#1208) This reverts commit 6e69d852b6f2b2a4cf169003a473ad50692cd207. --- crates/mako/src/generate/transform.rs | 4 +- crates/mako/src/plugins/bundless_compiler.rs | 4 +- crates/mako/src/plugins/context_module.rs | 2 +- crates/mako/src/visitors/dynamic_import.rs | 100 ++++++++++++++---- crates/mako/templates/app_runtime.stpl | 5 + .../javascript.require-dynamic/expect.js | 4 +- .../javascript.require-dynamic/src/index.ts | 8 +- .../runtime.dynamic_import_interop/expect.js | 16 +++ .../runtime.dynamic_import_interop/index.js | 5 + .../mako.config.json | 10 ++ .../runtime.dynamic_import_interop/src/cjs.js | 4 + packages/mako/binding.d.ts | 4 - 12 files changed, 132 insertions(+), 34 deletions(-) create mode 100644 e2e/fixtures/runtime.dynamic_import_interop/expect.js create mode 100644 e2e/fixtures/runtime.dynamic_import_interop/index.js create mode 100644 e2e/fixtures/runtime.dynamic_import_interop/mako.config.json create mode 100644 e2e/fixtures/runtime.dynamic_import_interop/src/cjs.js diff --git a/crates/mako/src/generate/transform.rs b/crates/mako/src/generate/transform.rs index a6706a1ed..acf4786dd 100644 --- a/crates/mako/src/generate/transform.rs +++ b/crates/mako/src/generate/transform.rs @@ -240,9 +240,7 @@ pub fn transform_js_generate(transform_js_param: TransformJsParam) -> Result<()> let mut meta_url_replacer = MetaUrlReplacer {}; ast.ast.visit_mut_with(&mut meta_url_replacer); - let mut dynamic_import = DynamicImport { - context: context.clone(), - }; + let mut dynamic_import = DynamicImport::new(context.clone(), dep_map); ast.ast.visit_mut_with(&mut dynamic_import); // replace require to __mako_require__ diff --git a/crates/mako/src/plugins/bundless_compiler.rs b/crates/mako/src/plugins/bundless_compiler.rs index f8722042e..413efc855 100644 --- a/crates/mako/src/plugins/bundless_compiler.rs +++ b/crates/mako/src/plugins/bundless_compiler.rs @@ -236,9 +236,7 @@ fn transform_js_generate( }; ast.ast.visit_mut_with(&mut dep_replacer); - let mut dynamic_import = DynamicImport { - context: context.clone(), - }; + let mut dynamic_import = DynamicImport::new(context.clone(), dep_map); ast.ast.visit_mut_with(&mut dynamic_import); ast.ast diff --git a/crates/mako/src/plugins/context_module.rs b/crates/mako/src/plugins/context_module.rs index e9c021a09..0a10c7750 100644 --- a/crates/mako/src/plugins/context_module.rs +++ b/crates/mako/src/plugins/context_module.rs @@ -166,7 +166,7 @@ impl VisitMut for ContextModuleVisitor { .as_callee(); // TODO: allow use await in args // eg: import(`./i18n${await xxx()}`) - expr.args = vec![quote_ident!("m") + expr.args = vec![member_expr!(DUMMY_SP, m.default) .as_call(DUMMY_SP, expr.args.clone()) .as_expr() .to_owned() diff --git a/crates/mako/src/visitors/dynamic_import.rs b/crates/mako/src/visitors/dynamic_import.rs index 1d70b0806..8db3fa1a4 100644 --- a/crates/mako/src/visitors/dynamic_import.rs +++ b/crates/mako/src/visitors/dynamic_import.rs @@ -1,20 +1,74 @@ use std::sync::Arc; use mako_core::swc_common::DUMMY_SP; -use mako_core::swc_ecma_ast::{ArrayLit, Expr, ExprOrSpread, Lit}; +use mako_core::swc_ecma_ast::{ArrayLit, Expr, ExprOrSpread, Lit, MemberExpr}; use mako_core::swc_ecma_visit::{VisitMut, VisitMutWith}; - -use crate::ast::utils::{ - id, is_dynamic_import, member_call, member_prop, promise_all, require_ensure, +use swc_core::ecma::ast::{Ident, Module, Stmt, VarDeclKind}; +use swc_core::ecma::utils::{ + member_expr, private_ident, quote_ident, quote_str, ExprFactory, IsDirective, }; + +use crate::ast::utils::{is_dynamic_import, member_call, member_prop, promise_all, require_ensure}; use crate::compiler::Context; use crate::generate::chunk::ChunkId; +use crate::visitors::dep_replacer::DependenciesToReplace; -pub struct DynamicImport { +pub struct DynamicImport<'a> { pub context: Arc, + interop: Ident, + changed: bool, + dep_to_replace: &'a DependenciesToReplace, +} + +impl<'a> DynamicImport<'a> { + pub fn new(context: Arc, dep_map: &'a DependenciesToReplace) -> Self { + let interop = private_ident!("interop"); + + Self { + context, + interop, + changed: false, + dep_to_replace: dep_map, + } + } } -impl VisitMut for DynamicImport { +impl<'a> VisitMut for DynamicImport<'a> { + fn visit_mut_module(&mut self, n: &mut Module) { + n.visit_mut_children_with(self); + + if self.changed { + let insert_at = n + .body + .iter() + .position(|module_item| { + !module_item + .as_stmt() + .map_or(false, |stmt| stmt.is_directive()) + }) + .unwrap(); + + let (id, _) = self + .dep_to_replace + .resolved + .get("@swc/helpers/_/_interop_require_wildcard") + .unwrap(); + + let require_interop = quote_ident!("__mako_require__") + .as_call(DUMMY_SP, vec![quote_str!(id.clone()).as_arg()]); + + let stmt: Stmt = Expr::Member(MemberExpr { + span: DUMMY_SP, + obj: require_interop.into(), + prop: quote_ident!("_").into(), + }) + .into_var_decl(VarDeclKind::Var, self.interop.clone().into()) + .into(); + + n.body.insert(insert_at, stmt.into()); + } + } + fn visit_mut_expr(&mut self, expr: &mut Expr) { if let Expr::Call(call_expr) = expr { if is_dynamic_import(call_expr) { @@ -59,6 +113,7 @@ impl VisitMut for DynamicImport { chunk_ids }; + self.changed = true; // build new expr // e.g. // Promise.all([ require.ensure("id") ]).then(require.bind(require, "id")) @@ -80,26 +135,24 @@ impl VisitMut for DynamicImport { elems: to_ensure_elems, })), }); - let require_call = member_call( - Expr::Ident(id("__mako_require__")), - member_prop("bind"), + + let require_call = member_expr!(DUMMY_SP, __mako_require__.dr).as_call( + DUMMY_SP, vec![ - ExprOrSpread { - spread: None, - expr: Box::new(Expr::Ident(id("__mako_require__"))), - }, + self.interop.clone().as_arg(), ExprOrSpread { spread: None, expr: Box::new(Expr::Lit(Lit::Str(resolved_source.into()))), }, ], ); + member_call( load_promise, member_prop("then"), vec![ExprOrSpread { spread: None, - expr: Box::new(require_call), + expr: require_call.into(), }], ) }; @@ -112,12 +165,15 @@ impl VisitMut for DynamicImport { #[cfg(test)] mod tests { + use std::collections::HashMap; + use mako_core::swc_common::GLOBALS; use mako_core::swc_ecma_visit::VisitMutWith; use super::DynamicImport; use crate::ast::tests::TestUtils; use crate::generate::chunk::{Chunk, ChunkType}; + use crate::visitors::dep_replacer::DependenciesToReplace; // TODO: add nested chunk test #[test] @@ -125,9 +181,10 @@ mod tests { assert_eq!( run(r#"import("foo");"#), r#" +var interop = __mako_require__("hashed_helper")._; Promise.all([ __mako_require__.ensure("foo") -]).then(__mako_require__.bind(__mako_require__, "foo")); +]).then(__mako_require__.dr(interop, "foo")); "# .trim() ); @@ -142,10 +199,17 @@ Promise.all([ cg.add_chunk(foo); } let ast = test_utils.ast.js_mut(); + + let dep_to_replace = DependenciesToReplace { + resolved: maplit::hashmap! { + "@swc/helpers/_/_interop_require_wildcard".to_string() => + ("hashed_helper".to_string(), "dummy".into()) + }, + missing: HashMap::new(), + }; + GLOBALS.set(&test_utils.context.meta.script.globals, || { - let mut visitor = DynamicImport { - context: test_utils.context.clone(), - }; + let mut visitor = DynamicImport::new(test_utils.context.clone(), &dep_to_replace); ast.ast.visit_mut_with(&mut visitor); }); let code = test_utils.js_ast_to_code(); diff --git a/crates/mako/templates/app_runtime.stpl b/crates/mako/templates/app_runtime.stpl index 12edcc080..579e0ee79 100644 --- a/crates/mako/templates/app_runtime.stpl +++ b/crates/mako/templates/app_runtime.stpl @@ -59,6 +59,11 @@ function createRuntime(makoModules, entryModuleId, global) { }); }; requireModule.d = Object.defineProperty.bind(Object); + requireModule.dr = function(interop, request) { + return function(){ + return interop(requireModule(request)); + } + }; <% if has_dynamic_chunks || has_hmr { %> /* mako/runtime/ensure chunk */ diff --git a/e2e/fixtures/javascript.require-dynamic/expect.js b/e2e/fixtures/javascript.require-dynamic/expect.js index 03a76b9ce..5aff33c90 100644 --- a/e2e/fixtures/javascript.require-dynamic/expect.js +++ b/e2e/fixtures/javascript.require-dynamic/expect.js @@ -37,7 +37,7 @@ assert.match( assert.match( asyncContent, - moduleReg("src/i18n\\?context&glob=\\*\\*/\\*.json&async", "'./zh-CN.json': ()=>Promise.all([\n.*__mako_require__.ensure(\"src/i18n/zh-CN.json\")\n.*]).then(__mako_require__.bind(__mako_require__, \"src/i18n/zh-CN.json\"))", true), + moduleReg("src/i18n\\?context&glob=\\*\\*/\\*.json&async", "'./zh-CN.json': ()=>Promise.all([\n.*__mako_require__.ensure(\"src/i18n/zh-CN.json\")\n.*]).then(__mako_require__.dr(interop, \"src/i18n/zh-CN.json\"))", true), "should generate context module with correct map in async chunk", ); @@ -49,7 +49,7 @@ assert.match( assert.match( asyncContent, - moduleReg("src/i18n\\?context&glob=\\*\\*/\\*.json&async", "'./en-US.json': ()=>Promise.all([\n.*__mako_require__.ensure(\"src/i18n/en-US.json\")\n.*]).then(__mako_require__.bind(__mako_require__, \"src/i18n/en-US.json\"))", true), + moduleReg("src/i18n\\?context&glob=\\*\\*/\\*.json&async", "'./en-US.json': ()=>Promise.all([\n.*__mako_require__.ensure(\"src/i18n/en-US.json\")\n.*]).then(__mako_require__.dr(interop, \"src/i18n/en-US.json\"))", true), "should generate context module with correct map in async chunk", ); diff --git a/e2e/fixtures/javascript.require-dynamic/src/index.ts b/e2e/fixtures/javascript.require-dynamic/src/index.ts index ab3d50ee6..e295a4af7 100644 --- a/e2e/fixtures/javascript.require-dynamic/src/index.ts +++ b/e2e/fixtures/javascript.require-dynamic/src/index.ts @@ -4,7 +4,9 @@ function loadLang(lang) { function loadLangExt(lang, ext) { // nested dynamic require + with then callback - return import(`./i18n/${lang}.${(require(`./ext/${ext}`)).default}`).then(m => m); + return import(`./i18n/${lang}.${(require(`./ext/${ext}`)).default}`) + + .then(m => m); } function loadFile(file) { @@ -15,7 +17,7 @@ function loadFile2(file) { return require('./fake.js/' + file); } -console.log(loadLang('zh-CN')); -console.log(loadLangExt('zh-CN', 'json')); +loadLang('zh-CN').then(console.log); +loadLangExt('zh-CN', 'json').then(console.log); console.log(loadFile('/zh-CN.json')); console.log(loadFile2('a.js')); diff --git a/e2e/fixtures/runtime.dynamic_import_interop/expect.js b/e2e/fixtures/runtime.dynamic_import_interop/expect.js new file mode 100644 index 000000000..3977891fe --- /dev/null +++ b/e2e/fixtures/runtime.dynamic_import_interop/expect.js @@ -0,0 +1,16 @@ +const assert = require("assert"); +const { + parseBuildResult, + moduleReg, + injectSimpleJest, +} = require("../../../scripts/test-utils"); +const { files } = parseBuildResult(__dirname); + +injectSimpleJest(); + +const index = files["index.js"]; + +expect(index).toContain( + 'var interop = __mako_require__("@swc/helpers/_/_interop_require_wildcard")._;', +); +expect(index).toContain('then(__mako_require__.dr(interop, "src/cjs.js"))'); diff --git a/e2e/fixtures/runtime.dynamic_import_interop/index.js b/e2e/fixtures/runtime.dynamic_import_interop/index.js new file mode 100644 index 000000000..fd39b6447 --- /dev/null +++ b/e2e/fixtures/runtime.dynamic_import_interop/index.js @@ -0,0 +1,5 @@ +it("should interop cjs module with default", async () => { + let cjs = await import("./src/cjs"); + + expect(cjs).toEqual({ default: { foo: 42 }, foo: 42 }); +}); diff --git a/e2e/fixtures/runtime.dynamic_import_interop/mako.config.json b/e2e/fixtures/runtime.dynamic_import_interop/mako.config.json new file mode 100644 index 000000000..7856f9a68 --- /dev/null +++ b/e2e/fixtures/runtime.dynamic_import_interop/mako.config.json @@ -0,0 +1,10 @@ +{ + "optimization": { + "skipModules": false, + "concatenateModules": false + }, + "entry": { + "index": "./index.js" + }, + "moduleIdStrategy": "named" +} diff --git a/e2e/fixtures/runtime.dynamic_import_interop/src/cjs.js b/e2e/fixtures/runtime.dynamic_import_interop/src/cjs.js new file mode 100644 index 000000000..0417930f1 --- /dev/null +++ b/e2e/fixtures/runtime.dynamic_import_interop/src/cjs.js @@ -0,0 +1,4 @@ +module.exports = { + foo: 42, + default: "ddd", +}; diff --git a/packages/mako/binding.d.ts b/packages/mako/binding.d.ts index 4252f5ef0..8e93a5f8e 100644 --- a/packages/mako/binding.d.ts +++ b/packages/mako/binding.d.ts @@ -3,10 +3,6 @@ /* auto-generated by NAPI-RS */ -export interface TransformOutput { - code: string; - map?: string; -} export interface JsHooks { load?: (filePath: string) => Promise<{ content: string; type: 'css' | 'js' }>; generateEnd?: (data: { From 8379d4c05bb366d2084bd69306b88b30bdc2ee27 Mon Sep 17 00:00:00 2001 From: Jinbao1001 Date: Tue, 28 May 2024 13:30:11 +0800 Subject: [PATCH 2/4] release: @umijs/mako@0.4.18-canary.20240528.5 --- packages/bundler-mako/package.json | 2 +- packages/mako/binding.d.ts | 4 ++++ packages/mako/npm/darwin-arm64/package.json | 2 +- packages/mako/npm/darwin-x64/package.json | 2 +- packages/mako/npm/linux-x64-gnu/package.json | 2 +- packages/mako/package.json | 8 ++++---- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/bundler-mako/package.json b/packages/bundler-mako/package.json index 14367cada..e16a2686b 100644 --- a/packages/bundler-mako/package.json +++ b/packages/bundler-mako/package.json @@ -2,7 +2,7 @@ "name": "@umijs/bundler-mako", "version": "0.4.17", "dependencies": { - "@umijs/mako": "0.4.18-canary.20240521.4", + "@umijs/mako": "0.4.18-canary.20240528.5", "@umijs/bundler-utils": "^4.0.81", "chalk": "^4.1.2", "compression": "^1.7.4", diff --git a/packages/mako/binding.d.ts b/packages/mako/binding.d.ts index 8e93a5f8e..4252f5ef0 100644 --- a/packages/mako/binding.d.ts +++ b/packages/mako/binding.d.ts @@ -3,6 +3,10 @@ /* auto-generated by NAPI-RS */ +export interface TransformOutput { + code: string; + map?: string; +} export interface JsHooks { load?: (filePath: string) => Promise<{ content: string; type: 'css' | 'js' }>; generateEnd?: (data: { diff --git a/packages/mako/npm/darwin-arm64/package.json b/packages/mako/npm/darwin-arm64/package.json index 7a8f37dd6..b1c0bc78a 100644 --- a/packages/mako/npm/darwin-arm64/package.json +++ b/packages/mako/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/mako-darwin-arm64", - "version": "0.4.18-canary.20240521.4", + "version": "0.4.18-canary.20240528.5", "os": [ "darwin" ], diff --git a/packages/mako/npm/darwin-x64/package.json b/packages/mako/npm/darwin-x64/package.json index 52f59be21..16cc82f9e 100644 --- a/packages/mako/npm/darwin-x64/package.json +++ b/packages/mako/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/mako-darwin-x64", - "version": "0.4.18-canary.20240521.4", + "version": "0.4.18-canary.20240528.5", "os": [ "darwin" ], diff --git a/packages/mako/npm/linux-x64-gnu/package.json b/packages/mako/npm/linux-x64-gnu/package.json index fbbeeadbe..cb9d87c82 100644 --- a/packages/mako/npm/linux-x64-gnu/package.json +++ b/packages/mako/npm/linux-x64-gnu/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/mako-linux-x64-gnu", - "version": "0.4.18-canary.20240521.4", + "version": "0.4.18-canary.20240528.5", "os": [ "linux" ], diff --git a/packages/mako/package.json b/packages/mako/package.json index 1cdb3bbc9..54d59163d 100644 --- a/packages/mako/package.json +++ b/packages/mako/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/mako", - "version": "0.4.18-canary.20240521.4", + "version": "0.4.18-canary.20240528.5", "main": "dist/index.js", "types": "dist/index.d.ts", "bin": { @@ -66,9 +66,9 @@ "src:build": "father build" }, "optionalDependencies": { - "@umijs/mako-darwin-arm64": "0.4.18-canary.20240521.4", - "@umijs/mako-darwin-x64": "0.4.18-canary.20240521.4", - "@umijs/mako-linux-x64-gnu": "0.4.18-canary.20240521.4" + "@umijs/mako-darwin-arm64": "0.4.18-canary.20240528.5", + "@umijs/mako-darwin-x64": "0.4.18-canary.20240528.5", + "@umijs/mako-linux-x64-gnu": "0.4.18-canary.20240528.5" }, "repository": "git@github.com:umijs/mako.git" } \ No newline at end of file From 05a2f72d0275da44c0f0507fcde13fd4138c4942 Mon Sep 17 00:00:00 2001 From: pshu Date: Wed, 29 May 2024 14:45:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20=E2=AC=86=EF=B8=8F=20update=20pnpm?= =?UTF-8?q?-lock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pnpm-lock.yaml | 63 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 56 insertions(+), 7 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 57277c715..d5315b65a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -366,7 +366,7 @@ importers: version: 4.1.6 '@umijs/mako': specifier: 0.4.18-canary.20240521.4 - version: link:../mako + version: 0.4.18-canary.20240521.4 chalk: specifier: ^4.1.2 version: 4.1.2 @@ -445,14 +445,14 @@ importers: version: 21.1.1 optionalDependencies: '@umijs/mako-darwin-arm64': - specifier: 0.4.18-canary.20240521.4 - version: 0.4.18-canary.20240521.4 + specifier: 0.4.18-canary.20240528.5 + version: 0.4.18-canary.20240528.5 '@umijs/mako-darwin-x64': - specifier: 0.4.18-canary.20240521.4 - version: 0.4.18-canary.20240521.4 + specifier: 0.4.18-canary.20240528.5 + version: 0.4.18-canary.20240528.5 '@umijs/mako-linux-x64-gnu': - specifier: 0.4.18-canary.20240521.4 - version: 0.4.18-canary.20240521.4 + specifier: 0.4.18-canary.20240528.5 + version: 0.4.18-canary.20240528.5 devDependencies: '@napi-rs/cli': specifier: ^2.18.0 @@ -5127,6 +5127,15 @@ packages: dev: false optional: true + /@umijs/mako-darwin-arm64@0.4.18-canary.20240528.5: + resolution: {integrity: sha512-37J5psAGJuUst8a5104u0E4La4iJZRM2Q5SVVlbPZSUhLXfYUVhXiPKgJPuUQfPxe3QHywGJtFJ26kBhPz3vrA==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: false + optional: true + /@umijs/mako-darwin-x64@0.4.18-canary.20240521.4: resolution: {integrity: sha512-RzJxEoDDoEcM5zqF5hfZ5NsOqpR5zN/s9nCG/Gar2jIPHbc5oi3oEyGpC/gglBYLT2//+oESo71yn6m1U0glxQ==} engines: {node: '>= 10'} @@ -5136,6 +5145,15 @@ packages: dev: false optional: true + /@umijs/mako-darwin-x64@0.4.18-canary.20240528.5: + resolution: {integrity: sha512-pHxsq4EOF0s5qLtrX3pRbNXOQLg16St6IipxsqF7a3SLzhZPU61+3Wl8vjYMbbZnu5d/r2Fz+lqBPvk3eXxZhQ==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: false + optional: true + /@umijs/mako-linux-x64-gnu@0.4.18-canary.20240521.4: resolution: {integrity: sha512-/TJaXDaIC3Djurw/s1VrKxv38CQ7OU4nwJfK66j8D3+nUlgQwE0XyHzmS31hYELpjOI5nUjIJXAW5nXCsYqtsA==} engines: {node: '>= 10'} @@ -5145,6 +5163,37 @@ packages: dev: false optional: true + /@umijs/mako-linux-x64-gnu@0.4.18-canary.20240528.5: + resolution: {integrity: sha512-0sPdKfzqUkzQ5vCWgCbXz7dTNg4dOnWLt9UY6HCCjoXs4fGFP0/chWPrnDlWloaZmHwnpc7afBJh24qKuCQZcg==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@umijs/mako@0.4.18-canary.20240521.4: + resolution: {integrity: sha512-dx+TWZjFqLf2vqARvV2Eyb9gzdpdGKbHgvcPI7p4tgvXbr1q+z6Iu4KbvPtqdUjpLn0FZn1hP/zfRRTR1vFbiQ==} + engines: {node: '>= 16'} + hasBin: true + dependencies: + '@swc/helpers': 0.5.1 + less: 4.2.0 + less-plugin-resolve: 1.0.2 + lodash: 4.17.21 + node-libs-browser-okam: 2.2.5 + react-error-overlay: 6.0.9 + react-refresh: 0.14.0 + workerpool: 9.1.1 + yargs-parser: 21.1.1 + optionalDependencies: + '@umijs/mako-darwin-arm64': 0.4.18-canary.20240521.4 + '@umijs/mako-darwin-x64': 0.4.18-canary.20240521.4 + '@umijs/mako-linux-x64-gnu': 0.4.18-canary.20240521.4 + transitivePeerDependencies: + - supports-color + dev: false + /@umijs/mfsu@4.0.70: resolution: {integrity: sha512-Kg4SfEvU90DW9Nxfr/WozWduQmGvKAWEyUUrn6ND8i3AapUA8MOYDWRVZ/61HKHBcPt9Y6ZPg2cLWSFeNk529g==} dependencies: From 8e19f3cdaa7026aec8a7d492bd94145739546a16 Mon Sep 17 00:00:00 2001 From: sorrycc Date: Thu, 6 Jun 2024 16:45:17 +0800 Subject: [PATCH 4/4] release: @umijs/mako@0.5.5-canary.20240606.1 --- packages/bundler-mako/package.json | 2 +- packages/mako/npm/darwin-arm64/package.json | 2 +- packages/mako/npm/darwin-x64/package.json | 2 +- packages/mako/npm/linux-x64-gnu/package.json | 2 +- packages/mako/npm/linux-x64-musl/package.json | 2 +- packages/mako/package.json | 10 +++++----- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/bundler-mako/package.json b/packages/bundler-mako/package.json index bcdc16174..da51787f8 100644 --- a/packages/bundler-mako/package.json +++ b/packages/bundler-mako/package.json @@ -3,7 +3,7 @@ "version": "0.5.4", "dependencies": { "@umijs/bundler-utils": "^4.0.81", - "@umijs/mako": "0.5.4", + "@umijs/mako": "0.5.5-canary.20240606.1", "chalk": "^4.1.2", "compression": "^1.7.4", "connect-history-api-fallback": "^2.0.0", diff --git a/packages/mako/npm/darwin-arm64/package.json b/packages/mako/npm/darwin-arm64/package.json index 343024e49..0754e95c2 100644 --- a/packages/mako/npm/darwin-arm64/package.json +++ b/packages/mako/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/mako-darwin-arm64", - "version": "0.5.4", + "version": "0.5.5-canary.20240606.1", "os": [ "darwin" ], diff --git a/packages/mako/npm/darwin-x64/package.json b/packages/mako/npm/darwin-x64/package.json index 6156b0665..005f3ad00 100644 --- a/packages/mako/npm/darwin-x64/package.json +++ b/packages/mako/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/mako-darwin-x64", - "version": "0.5.4", + "version": "0.5.5-canary.20240606.1", "os": [ "darwin" ], diff --git a/packages/mako/npm/linux-x64-gnu/package.json b/packages/mako/npm/linux-x64-gnu/package.json index a592efd23..4f673cc30 100644 --- a/packages/mako/npm/linux-x64-gnu/package.json +++ b/packages/mako/npm/linux-x64-gnu/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/mako-linux-x64-gnu", - "version": "0.5.4", + "version": "0.5.5-canary.20240606.1", "os": [ "linux" ], diff --git a/packages/mako/npm/linux-x64-musl/package.json b/packages/mako/npm/linux-x64-musl/package.json index 57a0242ba..0b641586b 100644 --- a/packages/mako/npm/linux-x64-musl/package.json +++ b/packages/mako/npm/linux-x64-musl/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/mako-linux-x64-musl", - "version": "0.5.4", + "version": "0.5.5-canary.20240606.1", "os": [ "linux" ], diff --git a/packages/mako/package.json b/packages/mako/package.json index c06beaae8..11089251c 100644 --- a/packages/mako/package.json +++ b/packages/mako/package.json @@ -1,6 +1,6 @@ { "name": "@umijs/mako", - "version": "0.5.4", + "version": "0.5.5-canary.20240606.1", "main": "dist/index.js", "types": "dist/index.d.ts", "bin": { @@ -68,10 +68,10 @@ "src:build": "father build" }, "optionalDependencies": { - "@umijs/mako-darwin-arm64": "0.5.4", - "@umijs/mako-darwin-x64": "0.5.4", - "@umijs/mako-linux-x64-gnu": "0.5.4", - "@umijs/mako-linux-x64-musl": "0.5.4" + "@umijs/mako-darwin-arm64": "0.5.5-canary.20240606.1", + "@umijs/mako-darwin-x64": "0.5.5-canary.20240606.1", + "@umijs/mako-linux-x64-gnu": "0.5.5-canary.20240606.1", + "@umijs/mako-linux-x64-musl": "0.5.5-canary.20240606.1" }, "repository": "git@github.com:umijs/mako.git" } \ No newline at end of file