GoogleChromeLabs · developit · Aug 13, 2019 · Jul 30, 2019
diff --git a/src/index.js b/src/index.js
@@ -68,8 +68,8 @@ export default class WorkerPlugin {
               return false;
             }
 
-            let loaderOptions = opts.name && { name: opts.name };
-            const req = `require(${JSON.stringify(workerLoader + (loaderOptions ? ('?' + JSON.stringify(loaderOptions)) : '') + '!' + dep.string)})`;
+            const loaderOptions = { name: opts.name || workerId };
+            const req = `require(${JSON.stringify(workerLoader + '?' + JSON.stringify(loaderOptions) + '!' + dep.string)})`;
             const id = `__webpack__worker__${++workerId}`;
             ParserHelpers.toConstantDependency(parser, id)(expr.arguments[0]);
 

diff --git a/test/fixtures/multiple/dep.js b/test/fixtures/multiple/dep.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+export const foo = 'bar';
diff --git a/test/fixtures/multiple/entry.js b/test/fixtures/multiple/entry.js
@@ -0,0 +1,28 @@
+/**
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+const worker0 = new Worker('./worker-0', { type: 'module' });
+const worker1 = new Worker('./worker-1', { type: 'module' });
+
+worker0.onmessage = ({ data }) => {
+  console.log('page got data: ', data);
+};
+worker0.postMessage('hello 0');
+
+worker1.onmessage = ({ data }) => {
+  console.log('page got data: ', data);
+};
+worker1.postMessage('hello 1');
diff --git a/test/fixtures/multiple/index.html b/test/fixtures/multiple/index.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html><body>
+  <!--
+ Copyright 2018 Google LLC
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ use this file except in compliance with the License. You may obtain a copy of
+ the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations under
+ the License.
+  -->
+  <script src="dist/main.js"></script>
+</body></html>
diff --git a/test/fixtures/multiple/worker-0.js b/test/fixtures/multiple/worker-0.js
@@ -0,0 +1,26 @@
+/**
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+import { foo } from './dep';
+
+console.log('hello from worker 0');
+
+addEventListener('message', ({ data }) => {
+  console.log('worker 0 got message', data);
+  if (data === 'hello 0') {
+    postMessage(foo);
+  }
+});
diff --git a/test/fixtures/multiple/worker-1.js b/test/fixtures/multiple/worker-1.js
@@ -0,0 +1,26 @@
+/**
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+import { foo } from './dep';
+
+console.log('hello from worker 1');
+
+addEventListener('message', ({ data }) => {
+  console.log('worker 1 got message', data);
+  if (data === 'hello 1') {
+    postMessage(foo);
+  }
+});
diff --git a/test/index.test.js b/test/index.test.js
@@ -45,6 +45,23 @@ describe('worker-plugin', () => {
     expect(main).toMatch(/module.exports = __webpack_require__\.p\s*\+\s*"0\.worker\.js"/g);
   });
 
+  test('it replaces multiple Worker exports with __webpack_require__', async () => {
+    const stats = await runWebpack('multiple', {
+      plugins: [
+        new WorkerPlugin()
+      ]
+    });
+
+    const assetNames = Object.keys(stats.assets);
+    expect(assetNames).toHaveLength(3);
+    expect(assetNames).toContainEqual('0.worker.js');
+    expect(assetNames).toContainEqual('1.worker.js');
+
+    const main = stats.assets['main.js'];
+    expect(main).toMatch(/module.exports = __webpack_require__\.p\s*\+\s*"0\.worker\.js"/g);
+    expect(main).toMatch(/module.exports = __webpack_require__\.p\s*\+\s*"1\.worker\.js"/g);
+  });
+
   test('retainModule:true leaves {type:module} in worker init', async () => {
     const { assets } = await runWebpack('basic', {
       plugins: [