refactor(commonjs): work around linting issues

rollup · Nov 9, 2021 · a782ae9 · a782ae9
1 parent 92c7442
commit a782ae9
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 1,111 deletions.
diff --git a/packages/commonjs/src/transform-commonjs.js b/packages/commonjs/src/transform-commonjs.js
@@ -227,9 +227,10 @@ export default async function transformCommonjs(
             let shouldRemoveRequireStatement = false;
 
             if (currentTryBlockEnd !== null) {
-              ({ canConvertRequire, shouldRemoveRequireStatement } =
-                getIgnoreTryCatchRequireStatementMode(node.arguments[0].value));
-
+              const ignoreTryCatchRequire = getIgnoreTryCatchRequireStatementMode(
+                node.arguments[0].value
+              );
+              ({ canConvertRequire, shouldRemoveRequireStatement } = ignoreTryCatchRequire);
               if (shouldRemoveRequireStatement) {
                 hasRemovedRequire = true;
               }
@@ -490,17 +491,15 @@ export default async function transformCommonjs(
   }
 
   if (usesRequireWrapper) {
-    magicString
-      .trim()
-      .indent('\t')
-      .prepend(
-        `var ${isRequiredName};
+    magicString.trim().indent('\t');
+    magicString.prepend(
+      `var ${isRequiredName};
 
 function ${requireName} () {
 \tif (${isRequiredName}) return ${exportsName};
 \t${isRequiredName} = 1;
 `
-      ).append(`
+    ).append(`
 \treturn ${exportsName};
 }`);
     if (exportMode === 'replace') {

diff --git a/packages/commonjs/test/fixtures/form/constant-template-literal/output.js b/packages/commonjs/test/fixtures/form/constant-template-literal/output.js
@@ -1,7 +1,7 @@
 import * as commonjsHelpers from "_commonjsHelpers.js";
 import { commonjsRequire as commonjsRequire } from "_commonjs-dynamic-modules";
 import { __exports as input } from "\u0000fixtures/form/constant-template-literal/input.js?commonjs-exports"
-import require$$0 from "\u0000/Users/lukastaegert/Github/rollup-plugins/packages/commonjs/test/fixtures/form/constant-template-literal/tape.js?commonjs-proxy";
+import require$$0 from "\u0000CWD/fixtures/form/constant-template-literal/tape.js?commonjs-proxy";
 
 var foo = require$$0;
 console.log(foo);

diff --git a/packages/commonjs/test/fixtures/form/ignore-ids-function/output.js b/packages/commonjs/test/fixtures/form/ignore-ids-function/output.js
@@ -1,7 +1,7 @@
 import * as commonjsHelpers from "_commonjsHelpers.js";
 import { commonjsRequire as commonjsRequire } from "_commonjs-dynamic-modules";
 import { __exports as input } from "\u0000fixtures/form/ignore-ids-function/input.js?commonjs-exports"
-import require$$0 from "\u0000/Users/lukastaegert/Github/rollup-plugins/packages/commonjs/test/fixtures/form/ignore-ids-function/bar.js?commonjs-proxy";
+import require$$0 from "\u0000CWD/fixtures/form/ignore-ids-function/bar.js?commonjs-proxy";
 
 var foo = require( 'foo' );
 var bar = require$$0;

diff --git a/packages/commonjs/test/fixtures/form/ignore-ids/output.js b/packages/commonjs/test/fixtures/form/ignore-ids/output.js
@@ -1,7 +1,7 @@
 import * as commonjsHelpers from "_commonjsHelpers.js";
 import { commonjsRequire as commonjsRequire } from "_commonjs-dynamic-modules";
 import { __exports as input } from "\u0000fixtures/form/ignore-ids/input.js?commonjs-exports"
-import require$$0 from "\u0000/Users/lukastaegert/Github/rollup-plugins/packages/commonjs/test/fixtures/form/ignore-ids/bar.js?commonjs-proxy";
+import require$$0 from "\u0000CWD/fixtures/form/ignore-ids/bar.js?commonjs-proxy";
 
 var foo = require( 'foo' );
 var bar = require$$0;

diff --git a/packages/commonjs/test/fixtures/form/multi-entry-module-exports/output1.js b/packages/commonjs/test/fixtures/form/multi-entry-module-exports/output1.js
@@ -1,6 +1,6 @@
 import * as commonjsHelpers from "_commonjsHelpers.js";
 import { commonjsRequire as commonjsRequire } from "_commonjs-dynamic-modules";
-import require$$0 from "\u0000/Users/lukastaegert/Github/rollup-plugins/packages/commonjs/test/fixtures/form/multi-entry-module-exports/input2.js?commonjs-proxy";
+import require$$0 from "\u0000CWD/fixtures/form/multi-entry-module-exports/input2.js?commonjs-proxy";
 
 const t2 = require$$0;
 

diff --git a/packages/commonjs/test/fixtures/form/multiple-var-declarations-b/output.js b/packages/commonjs/test/fixtures/form/multiple-var-declarations-b/output.js
@@ -1,7 +1,7 @@
 import * as commonjsHelpers from "_commonjsHelpers.js";
 import { commonjsRequire as commonjsRequire } from "_commonjs-dynamic-modules";
 import { __exports as input } from "\u0000fixtures/form/multiple-var-declarations-b/input.js?commonjs-exports"
-import require$$0 from "\u0000/Users/lukastaegert/Github/rollup-plugins/packages/commonjs/test/fixtures/form/multiple-var-declarations-b/a.js?commonjs-proxy";
+import require$$0 from "\u0000CWD/fixtures/form/multiple-var-declarations-b/a.js?commonjs-proxy";
 
 var a = require$$0
   , b = 42;

diff --git a/packages/commonjs/test/fixtures/form/multiple-var-declarations-c/output.js b/packages/commonjs/test/fixtures/form/multiple-var-declarations-c/output.js
@@ -1,7 +1,7 @@
 import * as commonjsHelpers from "_commonjsHelpers.js";
 import { commonjsRequire as commonjsRequire } from "_commonjs-dynamic-modules";
 import { __exports as input } from "\u0000fixtures/form/multiple-var-declarations-c/input.js?commonjs-exports"
-import require$$0 from "\u0000/Users/lukastaegert/Github/rollup-plugins/packages/commonjs/test/fixtures/form/multiple-var-declarations-c/b.js?commonjs-proxy";
+import require$$0 from "\u0000CWD/fixtures/form/multiple-var-declarations-c/b.js?commonjs-proxy";
 
 var a = 'a'
   , b = require$$0

diff --git a/packages/commonjs/test/fixtures/form/multiple-var-declarations/output.js b/packages/commonjs/test/fixtures/form/multiple-var-declarations/output.js
@@ -1,7 +1,7 @@
 import * as commonjsHelpers from "_commonjsHelpers.js";
 import { commonjsRequire as commonjsRequire } from "_commonjs-dynamic-modules";
 import { __exports as input } from "\u0000fixtures/form/multiple-var-declarations/input.js?commonjs-exports"
-import require$$0 from "\u0000/Users/lukastaegert/Github/rollup-plugins/packages/commonjs/test/fixtures/form/multiple-var-declarations/a.js?commonjs-proxy";
+import require$$0 from "\u0000CWD/fixtures/form/multiple-var-declarations/a.js?commonjs-proxy";
 import require$$1 from "\u0000/Users/lukastaegert/Github/rollup-plugins/packages/commonjs/test/fixtures/form/multiple-var-declarations/b.js?commonjs-proxy";
 
 var a = require$$0()

diff --git a/packages/commonjs/test/fixtures/form/no-exports-entry/output.js b/packages/commonjs/test/fixtures/form/no-exports-entry/output.js
@@ -1,7 +1,7 @@
 import * as commonjsHelpers from "_commonjsHelpers.js";
 import { commonjsRequire as commonjsRequire } from "_commonjs-dynamic-modules";
 import { __exports as input_1 } from "\u0000fixtures/form/no-exports-entry/input.js?commonjs-exports"
-import require$$0 from "\u0000/Users/lukastaegert/Github/rollup-plugins/packages/commonjs/test/fixtures/form/no-exports-entry/dummy.js?commonjs-proxy";
+import require$$0 from "\u0000CWD/fixtures/form/no-exports-entry/dummy.js?commonjs-proxy";
 
 var dummy = require$$0;
 

diff --git a/packages/commonjs/test/fixtures/form/require-collision/output.js b/packages/commonjs/test/fixtures/form/require-collision/output.js
@@ -1,7 +1,7 @@
 import * as commonjsHelpers from "_commonjsHelpers.js";
 import { commonjsRequire as commonjsRequire } from "_commonjs-dynamic-modules";
 import { __exports as input } from "\u0000fixtures/form/require-collision/input.js?commonjs-exports"
-import require$$1 from "\u0000/Users/lukastaegert/Github/rollup-plugins/packages/commonjs/test/fixtures/form/require-collision/foo.js?commonjs-proxy";
+import require$$1 from "\u0000CWD/fixtures/form/require-collision/foo.js?commonjs-proxy";
 
 (function() {
   var foo = require$$1;

diff --git a/packages/commonjs/test/fixtures/form/unambiguous-with-default-export/output.js b/packages/commonjs/test/fixtures/form/unambiguous-with-default-export/output.js
@@ -1,6 +1,6 @@
 import * as commonjsHelpers from "_commonjsHelpers.js";
 import { commonjsRequire as commonjsRequire } from "_commonjs-dynamic-modules";
 import { __exports as input } from "\u0000fixtures/form/unambiguous-with-default-export/input.js?commonjs-exports"
-import "\u0000/Users/lukastaegert/Github/rollup-plugins/packages/commonjs/test/fixtures/form/unambiguous-with-default-export/foo.js?commonjs-proxy";
+import "\u0000CWD/fixtures/form/unambiguous-with-default-export/foo.js?commonjs-proxy";
 
 export default {};
diff --git a/packages/commonjs/test/fixtures/form/unambiguous-with-import/output.js b/packages/commonjs/test/fixtures/form/unambiguous-with-import/output.js
@@ -1,6 +1,6 @@
 import * as commonjsHelpers from "_commonjsHelpers.js";
 import { commonjsRequire as commonjsRequire } from "_commonjs-dynamic-modules";
 import { __exports as input } from "\u0000fixtures/form/unambiguous-with-import/input.js?commonjs-exports"
-import "\u0000/Users/lukastaegert/Github/rollup-plugins/packages/commonjs/test/fixtures/form/unambiguous-with-import/foo.js?commonjs-proxy";
+import "\u0000CWD/fixtures/form/unambiguous-with-import/foo.js?commonjs-proxy";
 
 import './bar.js';
diff --git a/packages/commonjs/test/fixtures/form/unambiguous-with-named-export/output.js b/packages/commonjs/test/fixtures/form/unambiguous-with-named-export/output.js
@@ -1,6 +1,6 @@
 import * as commonjsHelpers from "_commonjsHelpers.js";
 import { commonjsRequire as commonjsRequire } from "_commonjs-dynamic-modules";
 import { __exports as input } from "\u0000fixtures/form/unambiguous-with-named-export/input.js?commonjs-exports"
-import "\u0000/Users/lukastaegert/Github/rollup-plugins/packages/commonjs/test/fixtures/form/unambiguous-with-named-export/foo.js?commonjs-proxy";
+import "\u0000CWD/fixtures/form/unambiguous-with-named-export/foo.js?commonjs-proxy";
 
 export {};
diff --git a/packages/commonjs/test/form.js b/packages/commonjs/test/form.js
@@ -78,7 +78,10 @@ if (path.sep === '/') {
           const expected = fs.readFileSync(outputFile, 'utf-8').trim();
           // eslint-disable-next-line no-await-in-loop
           const transformed = await transform.call(transformContext, input, id);
-          const actual = (transformed ? transformed.code : input).trim().replace(/\0/g, '_');
+          const actual = (transformed ? transformed.code : input)
+            .trim()
+            .replace(/\0/g, '_')
+            .replace(process.cwd(), 'CWD');
 
           // uncomment to update snapshots
           // fs.writeFileSync(outputFile, `${actual}\n`);