feat: support worker-loader with config workerLoader (#6253)

* feat: support worker-loader with config workerLoader

* fix: ci

docs/config/README.md

@@ -1249,3 +1249,10 @@ export default {
 包含以下子配置项：
 
 - lazyCompilation，是否启用基于路由的按需编译
+
+## workerLoader <Badge>3.4.1+</Badge>
+
+- Type: `object`
+- Default: `false`
+
+开启 worker-loader 功能。

docs/config/README.zh-CN.md

@@ -1248,3 +1248,10 @@ export default {
 包含以下子配置项：
 
 - lazyCompilation，是否启用基于路由的按需编译
+
+## workerLoader <Badge>3.4.1+</Badge>
+
+- Type: `object`
+- Default: `false`
+
+开启 worker-loader 功能。

packages/bundler-webpack/package.json

@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@umijs/bundler-utils": "3.4.0",
-    "@umijs/deps": "0.2.34",
+    "@umijs/deps": "0.3.3",
     "@umijs/types": "3.4.0",
     "@umijs/utils": "3.4.0",
     "jest-worker": "26.6.2",

packages/bundler-webpack/src/fixtures/worker-loader/config.ts

@@ -0,0 +1,3 @@
+export default {
+  workerLoader: {},
+}

packages/bundler-webpack/src/fixtures/worker-loader/expect.ts

@@ -0,0 +1,7 @@
+import { IExpectOpts } from '../types';
+
+export default ({ indexJS, files }: IExpectOpts) => {
+  expect(files).toContain('index.js');
+  expect(files).toContain('worker.worker.js');
+  expect(indexJS).toContain(`return new Worker(__webpack_require__.p + "worker.worker.js");`);
+}

packages/bundler-webpack/src/fixtures/worker-loader/index.ts

@@ -0,0 +1,4 @@
+import Worker from './worker';
+
+const worker = new Worker();
+worker.postMessage('aaaa');

packages/bundler-webpack/src/fixtures/worker-loader/worker.js

@@ -0,0 +1,4 @@
+
+self.addEventListener('message', (e) => {
+  console.log('message received');
+});

packages/bundler-webpack/src/getConfig/getConfig.ts

@@ -352,6 +352,16 @@ export default async function getConfig(
     .use('raw-loader')
       .loader(require.resolve('@umijs/deps/compiled/raw-loader'));
 
+  if (config.workerLoader) {
+    // prettier-ignore
+    webpackConfig.module
+      .rule('worker')
+      .test(/.*worker.(ts|js)/)
+      .use('worker-loader')
+        .loader(require.resolve('@umijs/deps/compiled/worker-loader'))
+        .options(config.workerLoader);
+  }
+
   // css
   css({
     type,

packages/core/package.json

@@ -26,7 +26,7 @@
   "dependencies": {
     "@umijs/ast": "3.4.0",
     "@umijs/babel-preset-umi": "3.4.0",
-    "@umijs/deps": "0.2.34",
+    "@umijs/deps": "0.3.3",
     "@umijs/utils": "3.4.0"
   }
 }

packages/preset-built-in/package.json

@@ -28,7 +28,7 @@
     "@types/react-router-config": "5.0.1",
     "@umijs/babel-preset-umi": "3.4.0",
     "@umijs/bundler-webpack": "3.4.0",
-    "@umijs/deps": "0.2.34",
+    "@umijs/deps": "0.3.3",
     "@umijs/renderer-mpa": "3.4.0",
     "@umijs/renderer-react": "3.4.0",
     "@umijs/runtime": "3.4.0",

packages/preset-built-in/src/index.ts

@@ -67,6 +67,7 @@ export default function () {
       require.resolve('./plugins/features/umiInfo'),
       require.resolve('./plugins/features/runtimeHistory'),
       require.resolve('./plugins/features/webpack5'),
+      require.resolve('./plugins/features/workerLoader'),
 
       // html
       require.resolve('./plugins/features/html/favicon'),

packages/preset-built-in/src/plugins/features/workerLoader.ts

@@ -0,0 +1,12 @@
+import { IApi } from '@umijs/types';
+
+export default (api: IApi) => {
+  api.describe({
+    key: 'workerLoader',
+    config: {
+      schema(joi) {
+        return joi.object();
+      },
+    },
+  });
+};

packages/server/package.json

@@ -24,7 +24,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@umijs/deps": "0.2.34",
+    "@umijs/deps": "0.3.3",
     "@umijs/utils": "3.4.0"
   }
 }

packages/types/package.json

@@ -27,7 +27,7 @@
   "dependencies": {
     "@umijs/babel-preset-umi": "3.4.0",
     "@umijs/core": "3.4.0",
-    "@umijs/deps": "0.2.34",
+    "@umijs/deps": "0.3.3",
     "@umijs/server": "3.4.0",
     "@umijs/utils": "3.4.0",
     "webpack-chain": "6.5.1"

packages/umi/package.json

@@ -30,7 +30,7 @@
   "dependencies": {
     "@umijs/bundler-webpack": "3.4.0",
     "@umijs/core": "3.4.0",
-    "@umijs/deps": "0.2.34",
+    "@umijs/deps": "0.3.3",
     "@umijs/preset-built-in": "3.4.0",
     "@umijs/runtime": "3.4.0",
     "@umijs/types": "3.4.0",

packages/utils/package.json

@@ -24,6 +24,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@umijs/deps": "0.2.34"
+    "@umijs/deps": "0.3.3"
   }
 }

yarn.lock

@@ -2945,10 +2945,10 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@umijs/deps@0.2.34":
-  version "0.2.34"
-  resolved "https://registry.yarnpkg.com/@umijs/deps/-/deps-0.2.34.tgz#3d748c5818da53f013d16dbb686c1b00e4409a4b"
-  integrity sha512-6PUTf2IeMh1V1k0aoFOT4Z7gs3vYPOxkDuKsjglT+UrQxa8Wfm613U7LecnkC6nv3wZk23oolGmE6fjMgtYfSw==
+"@umijs/deps@0.3.3":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@umijs/deps/-/deps-0.3.3.tgz#b712f7b66c5d2339e7833fc2547b7b50b8390ade"
+  integrity sha512-MO13OHd77nXObz1B5xaYOc/ZxdVyaaV6ZRIVVxsWKsB941zEJC9lImvga7ZMd7d3Fy6+M7HRi9LsCo8PHUhp5Q==
   dependencies:
     chokidar "3.5.1"
     clipboardy "2.3.0"