From b02727c62cc86c0c757c2ebf80cba461d1558409 Mon Sep 17 00:00:00 2001 From: Wei Date: Sat, 18 Mar 2023 15:29:54 +0800 Subject: [PATCH 1/2] fix(worker): using data URLs for inline shared worker (#12014) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 翠 / green --- config/worker-options.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/worker-options.md b/config/worker-options.md index 840caa60..99500ae2 100644 --- a/config/worker-options.md +++ b/config/worker-options.md @@ -5,7 +5,7 @@ Options related to Web Workers. ## worker.format - **Type:** `'es' | 'iife'` -- **Default:** `iife` +- **Default:** `'iife'` Output format for worker bundle. From ae9ae4112d00e9ff842be35ee1d13d937453e45e Mon Sep 17 00:00:00 2001 From: waynzh Date: Mon, 20 Mar 2023 09:52:46 +0800 Subject: [PATCH 2/2] docs(cn): resolve conflicts --- config/worker-options.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/config/worker-options.md b/config/worker-options.md index 87782dfe..40d18f63 100644 --- a/config/worker-options.md +++ b/config/worker-options.md @@ -4,13 +4,8 @@ ## worker.format -<<<<<<< HEAD - **类型：** `'es' | 'iife'` -- **默认：** `iife` -======= -- **Type:** `'es' | 'iife'` -- **Default:** `'iife'` ->>>>>>> b02727c62cc86c0c757c2ebf80cba461d1558409 +- **默认：** `'iife'` worker 打包时的输出类型。