Skip to content

Commit 91986d5

Browse files
authored
rewrite: add ignore regex for import rewriting to skip 'import () {' or 'import (a, b) {' class members, fixes #163 (#164)
bump to 2.17.2
1 parent c1124c0 commit 91986d5

File tree

6 files changed

+28
-6
lines changed

6 files changed

+28
-6
lines changed

dist/sw.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/wombat.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/wombatWorkers.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@webrecorder/wabac",
3-
"version": "2.17.1",
3+
"version": "2.17.2",
44
"main": "index.js",
55
"type": "module",
66
"license": "AGPL-3.0-or-later",

src/rewrite/jsrewriter.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ const createJSRules = () => {
126126
// ignore 'async import', custom function
127127
[/async\s+import\s*\(/, x => x],
128128

129+
[/[^$.]\bimport\s*\([^)]*\)\s*\{/, x => x],
130+
129131
// esm dynamic import, if found, mark as module
130132
[/[^$.]\bimport\s*\(/, replaceImport("import", "____wb_rewrite_import__")]
131133
];

test/rewriteJS.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,22 @@ test(rewriteJS,
176176
"await ____wb_rewrite_import__ (null, somefile);"
177177
);
178178

179+
// dynamic import rewrite (non-module)
180+
test(rewriteJS, `\
181+
class X {
182+
import(a, b, c) {
183+
await import (somefile);
184+
}
185+
}`, `\
186+
class X {
187+
import(a, b, c) {
188+
await ____wb_rewrite_import__ (null, somefile);
189+
}
190+
}`
191+
);
192+
193+
194+
179195

180196
// import/export module rewrite
181197
test(rewriteJSImport, `\
@@ -294,6 +310,10 @@ test(rewriteJS, "a.import(5);");
294310

295311
test(rewriteJS, "$import(5);");
296312

313+
test(rewriteJS, " import() {");
314+
315+
test(rewriteJS, " import(a, b, c) {");
316+
297317
test(rewriteJS, "async import(val) { ... }");
298318

299319
test(rewriteJSImport, "\

0 commit comments

Comments
 (0)