@surma/rollup-plugin-off-main-thread - npm Package Compare versions

Comparing version 2.1.0 to 2.2.0

index.js

@@ -14,2 +14,4 @@ /**
 
+"use strict";
+
 const { readFileSync } = require("fs");
@@ -19,3 +21,2 @@ const { join } = require("path");
 const MagicString = require("magic-string");
-const tippex = require("tippex");
 const json5 = require("json5");
@@ -103,8 +104,4 @@
 
-      // Tippex is performing regex matching under the hood, but automatically ignores comments
-      // and string contents so it's more reliable on JS syntax.
-      tippex.match(
-        code,
-        workerRegexpForTransform,
-        (
+      for (const match of code.matchAll(workerRegexpForTransform)) {
+        let [
           fullMatch,
@@ -115,22 +112,21 @@ partBeforeArgs,
           workerFile,
-        ) => {
-          // We need to get this before the `await`, otherwise `lastIndex`
-          // will be already overridden.
-          const workerParametersEndIndex = workerRegexpForTransform.lastIndex;
-          const matchIndex = workerParametersEndIndex - fullMatch.length;
-          const workerParametersStartIndex = matchIndex + partBeforeArgs.length;
+        ] = match;
 
-          let workerIdPromise;
-          if (workerSource === "import.meta.url") {
-            // Turn the current file into a chunk
-            workerIdPromise = Promise.resolve(id);
-          } else {
-            // Otherwise it's a string literal either directly or in the `new URL(...)`.
-            if (directWorkerFile) {
-              const fullMatchWithOpts = `${fullMatch}, …)`;
-              const fullReplacement = `new Worker(new URL(${directWorkerFile}, import.meta.url), …)`;
+        const workerParametersEndIndex = match.index + fullMatch.length;
+        const matchIndex = match.index;
+        const workerParametersStartIndex = matchIndex + partBeforeArgs.length;
 
-              if (!longWarningAlreadyShown) {
-                this.warn(
-                  `rollup-plugin-off-main-thread:
+        let workerIdPromise;
+        if (workerSource === "import.meta.url") {
+          // Turn the current file into a chunk
+          workerIdPromise = Promise.resolve(id);
+        } else {
+          // Otherwise it's a string literal either directly or in the `new URL(...)`.
+          if (directWorkerFile) {
+            const fullMatchWithOpts = `${fullMatch}, …)`;
+            const fullReplacement = `new Worker(new URL(${directWorkerFile}, import.meta.url), …)`;
+
+            if (!longWarningAlreadyShown) {
+              this.warn(
+                `rollup-plugin-off-main-thread:
 \`${fullMatchWithOpts}\` suggests that the Worker should be relative to the document, not the script.
@@ -142,49 +138,46 @@ In the bundler, we don't know what the final document's URL will be, and instead assume it's a URL relative to the current module.
 This will become a hard error in the future.`,
-                  matchIndex
-                );
-                longWarningAlreadyShown = true;
-              } else {
-                this.warn(
-                  `rollup-plugin-off-main-thread: Treating \`${fullMatchWithOpts}\` as \`${fullReplacement}\``,
-                  matchIndex
-                );
-              }
-              workerFile = directWorkerFile;
-            }
-
-            // Cut off surrounding quotes.
-            workerFile = workerFile.slice(1, -1);
-
-            if (!/^\.{1,2}\//.test(workerFile)) {
+                matchIndex
+              );
+              longWarningAlreadyShown = true;
+            } else {
               this.warn(
-                `Paths passed to the Worker constructor must be relative to the current file, i.e. start with ./ or ../ (just like dynamic import!). Ignoring "${workerFile}".`,
+                `rollup-plugin-off-main-thread: Treating \`${fullMatchWithOpts}\` as \`${fullReplacement}\``,
                 matchIndex
               );
-              return;
             }
+            workerFile = directWorkerFile;
+          }
 
-            workerIdPromise = this.resolve(workerFile, id).then(res => res.id);
+          // Cut off surrounding quotes.
+          workerFile = workerFile.slice(1, -1);
+
+          if (!/^\.{1,2}\//.test(workerFile)) {
+            this.warn(
+              `Paths passed to the Worker constructor must be relative to the current file, i.e. start with ./ or ../ (just like dynamic import!). Ignoring "${workerFile}".`,
+              matchIndex
+            );
+            continue;
           }
 
-          // tippex.match accepts only sync callback, but we want to perform &
-          // wait for async job here, so we track those promises separately.
-          replacementPromises.push(
-            (async () => {
-              const resolvedWorkerFile = await workerIdPromise;
-              workerFiles.push(resolvedWorkerFile);
-              const chunkRefId = this.emitFile({
-                id: resolvedWorkerFile,
-                type: "chunk"
-              });
-
-              ms.overwrite(
-                workerParametersStartIndex,
-                workerParametersEndIndex,
-                `new URL(import.meta.ROLLUP_FILE_URL_${chunkRefId}, import.meta.url)`
-              );
-            })()
-          );
+          workerIdPromise = this.resolve(workerFile, id).then(res => res.id);
         }
-      );
 
+        replacementPromises.push(
+          (async () => {
+            const resolvedWorkerFile = await workerIdPromise;
+            workerFiles.push(resolvedWorkerFile);
+            const chunkRefId = this.emitFile({
+              id: resolvedWorkerFile,
+              type: "chunk"
+            });
+
+            ms.overwrite(
+              workerParametersStartIndex,
+              workerParametersEndIndex,
+              `new URL(import.meta.ROLLUP_FILE_URL_${chunkRefId}, import.meta.url)`
+            );
+          })()
+        );
+      }
+
       // No matches found.
@@ -259,3 +252,4 @@ if (!replacementPromises.length) {
 
-      tippex.match(code, workerRegexpForOutput, (fullMatch, optionsWithCommaStr, optionsStr) => {
+      for (const match of code.matchAll(workerRegexpForOutput)) {
+        let [fullMatch, optionsWithCommaStr, optionsStr] = match;
         let options;
@@ -269,10 +263,10 @@ try {
           console.warn("Couldn't match options object", fullMatch, ": ", e);
-          return;
+          continue;
         }
         if (!("type" in options)) {
           // Nothing to do.
-          return;
+          continue;
         }
         delete options.type;
-        const replacementEnd = workerRegexpForOutput.lastIndex;
+        const replacementEnd = match.index + fullMatch.length;
         const replacementStart = replacementEnd - optionsWithCommaStr.length;
@@ -286,3 +280,3 @@ optionsStr = json5.stringify(options);
         );
-      });
+      }
 
@@ -304,5 +298,8 @@ // Mangle define() call
 
+      const newCode = ms.toString();
+      const hasCodeChanged = code !== newCode;
       return {
-        code: ms.toString(),
-        map: ms.generateMap({ hires: true })
+        code: newCode,
+        // Avoid generating sourcemaps if possible as it can be a very expensive operation
+        map: hasCodeChanged ? ms.generateMap({ hires: true }) : null
       };
@@ -309,0 +306,0 @@ }

karma.conf.js

@@ -0,0 +0,0 @@ /**

package.json

 {
   "name": "@surma/rollup-plugin-off-main-thread",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Use Rollup with workers and ES6 modules today.",
@@ -31,7 +31,6 @@ "main": "index.js",
   "dependencies": {
-    "ejs": "^2.6.1",
+    "ejs": "^3.1.6",
     "json5": "^2.2.0",
-    "magic-string": "^0.25.0",
-    "tippex": "^3.0.0"
+    "magic-string": "^0.25.0"
   }
 }

README.md

@@ -0,0 +0,0 @@ # rollup-plugin-off-main-thread

renovate.json

 {
   "extends": ["config:base"]
 }

run_tests.js

@@ -0,0 +0,0 @@ /**

tests/amd-function-name.test.js

@@ -0,0 +0,0 @@ /**

tests/asset-in-worker.test.js

@@ -0,0 +0,0 @@ /**

tests/dynamic-import.test.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/amd-function-name/a.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/amd-function-name/config.json

 {
   "amdFunctionName": "foo"
 }

tests/fixtures/amd-function-name/entry.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/assets-in-worker/entry.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/assets-in-worker/rollup.config.js

@@ -0,0 +0,0 @@ const MARKER = "my-special-import";

tests/fixtures/assets-in-worker/worker.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/dynamic-import/a.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/dynamic-import/entry.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/import-meta-worker/a.js

@@ -0,0 +0,0 @@ let worker;

tests/fixtures/import-meta-worker/entry.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/import-meta/a.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/import-meta/entry.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/import-worker-url-custom-scheme/a.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/import-worker-url-custom-scheme/b.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/import-worker-url-custom-scheme/config.json

 {
   "urlLoaderScheme": "fancy-custom-scheme"
 }

tests/fixtures/import-worker-url-custom-scheme/entry.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/import-worker-url-custom-scheme/worker.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/import-worker-url/a.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/import-worker-url/b.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/import-worker-url/entry.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/import-worker-url/worker.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/module-worker/a.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/module-worker/b.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/module-worker/entry.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/module-worker/rollup.config.js

@@ -0,0 +0,0 @@ module.exports = (config, outputOptions, omt) => {

tests/fixtures/module-worker/worker.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/more-workers/a.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/more-workers/b.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/more-workers/entry.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/more-workers/worker_a.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/more-workers/worker_b.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/public-path/a.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/public-path/config.json

 {
   "publicPath": "/base/tests/fixtures/public-path/build"
 }

tests/fixtures/public-path/entry.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/simple-bundle/a.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/simple-bundle/entry.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/single-default/a.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/single-default/entry.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/url-import-meta-worker/a.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/url-import-meta-worker/b.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/url-import-meta-worker/entry.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/url-import-meta-worker/worker.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/worker/a.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/worker/b.js

@@ -0,0 +0,0 @@ /**

tests/fixtures/worker/entry.js

@@ -14,8 +14,2 @@ /**
 
-/*
- * This is commented out and should be ignored by the plugin.
- * If it doesn't, Rollup and test will fail.
- * new Worker("non-existing-worker", { type: "module" });
- */
-
 // The type module should get removed for AMD format!
@@ -22,0 +16,0 @@ const w = new Worker("./worker.js", { type: "module" });

tests/fixtures/worker/worker.js

@@ -0,0 +0,0 @@ /**

tests/import-meta-worker.test.js

@@ -0,0 +0,0 @@ /**

tests/import-meta.test.js

@@ -0,0 +0,0 @@ /**

tests/import-worker-url-custom-scheme.test.js

@@ -0,0 +0,0 @@ /**

tests/import-worker-url.test.js

@@ -0,0 +0,0 @@ /**

tests/module-worker.test.js

@@ -0,0 +0,0 @@ /**

tests/more-workers.test.js

@@ -0,0 +0,0 @@ /**

tests/public-path.test.js

@@ -0,0 +0,0 @@ /**

tests/simple-bundle.test.js

@@ -0,0 +0,0 @@ /**

tests/single-default.test.js

@@ -0,0 +0,0 @@ /**

tests/url-import-meta-worker.test.js

@@ -0,0 +0,0 @@ /**

tests/worker.test.js

@@ -0,0 +0,0 @@ /**

New alerts

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

92625

increased by2%

Dependency count

3

decreased by-25%

Worsened metrics

Lines of code

1542

decreased by-0.64%

Number of medium supply chain risk alerts

2

increased by100%

Dependency changes

• + Addedansi-styles@4.3.0(transitive)

• + Addedasync@3.2.5(transitive)

• + Addedbalanced-match@1.0.2(transitive)

• + Addedbrace-expansion@1.1.112.0.1(transitive)

• + Addedchalk@4.1.2(transitive)

• + Addedcolor-convert@2.0.1(transitive)

• + Addedcolor-name@1.1.4(transitive)

• + Addedconcat-map@0.0.1(transitive)

• + Addedejs@3.1.10(transitive)

• + Addedfilelist@1.0.4(transitive)

• + Addedhas-flag@4.0.0(transitive)

• + Addedjake@10.9.1(transitive)

• + Addedminimatch@3.1.25.1.6(transitive)

• + Addedsupports-color@7.2.0(transitive)

• - Removedtippex@^3.0.0

• - Removedejs@2.7.4(transitive)

• - Removedtippex@3.0.0(transitive)

• Updatedejs@^3.1.6