fix: bump @rollup/plugin-node-resolve to v13

.changeset/yellow-rockets-argue.md

@@ -0,0 +1,7 @@
+---
+'@web/dev-server': patch
+'@web/dev-server-rollup': patch
+'rollup-plugin-workbox': patch
+---
+
+Update dependency @rollup/plugin-node-resolve to v13

package.json

@@ -43,7 +43,7 @@
   },
   "devDependencies": {
     "@changesets/cli": "^2.16.0",
-    "@rollup/plugin-node-resolve": "^11.0.1",
+    "@rollup/plugin-node-resolve": "^13.0.4",
     "@rollup/plugin-typescript": "^8.1.0",
     "@types/chai": "^4.2.14",
     "@types/mocha": "^8.2.0",

packages/dev-server-rollup/package.json

@@ -57,8 +57,8 @@
     "@babel/plugin-transform-template-literals": "^7.12.1",
     "@rollup/plugin-alias": "^3.1.1",
     "@rollup/plugin-babel": "^5.2.2",
-    "@rollup/plugin-commonjs": "^18.0.0",
-    "@rollup/plugin-node-resolve": "^11.0.1",
+    "@rollup/plugin-commonjs": "^20.0.0",
+    "@rollup/plugin-node-resolve": "^13.0.4",
     "@rollup/plugin-replace": "^3.0.0",
     "@types/parse5": "^6.0.1",
     "@types/whatwg-url": "^8.0.0",

packages/dev-server-rollup/src/createRollupPluginContextAdapter.ts

@@ -69,10 +69,7 @@ export function createRollupPluginContextAdapter<
       if (!context) throw new Error('Context is required.');
 
       for (const pl of config.plugins ?? []) {
-        if (
-          pl.resolveImport &&
-          (!options.skipSelf || pl.resolveImport !== wdsPlugin.resolveImport)
-        ) {
+        if (pl.resolveImport && pl.resolveImport !== wdsPlugin.resolveImport && !options.skipSelf) {
           const result = await pl.resolveImport({ source, context });
           let resolvedId: string | undefined;
           if (typeof result === 'string') {

packages/dev-server-rollup/test/node/plugins/commonjs.test.ts

@@ -50,10 +50,9 @@ describe('@rollup/plugin-commonjs', () => {
 
     try {
       const text = await fetchText(`${host}/foo.js`);
-      expectIncludes(text, 'var foo_1 = "bar"; var lorem = "ipsum";');
+      expectIncludes(text, 'var foo_1 = foo.foo = "bar"; var lorem = foo.lorem = "ipsum";');
       expectIncludes(text, 'export default foo;');
-      expectIncludes(text, 'export { foo_1 as foo };');
-      expectIncludes(text, 'export { lorem };');
+      expectIncludes(text, 'export { foo as __moduleExports, foo_1 as foo, lorem };');
     } finally {
       server.stop();
     }
@@ -84,10 +83,7 @@ module.exports.lorem = lorem;`;
     try {
       const text = await fetchText(`${host}/foo.js`);
 
-      expectIncludes(text, 'export default foo_1;');
-      expectIncludes(text, 'export { foo_1 as __moduleExports };');
-      expectIncludes(text, 'export { foo_2 as foo }');
-      expectIncludes(text, 'export { lorem_1 as lorem }');
+      expectIncludes(text, 'export { foo_1 as __moduleExports, foo_2 as foo, lorem_1 as lorem, foo_1 as default };');
     } finally {
       server.stop();
     }
@@ -116,20 +112,13 @@ exports.default = _default;`;
       const text = await fetchText(`${host}/foo.js`);
       expectIncludes(
         text,
-        "import * as commonjsHelpers from '/__web-dev-server__/rollup/commonjsHelpers.js?web-dev-server-rollup-null-byte=%00commonjsHelpers.js';",
+        'import * as commonjsHelpers from "/__web-dev-server__/rollup/commonjsHelpers.js?web-dev-server-rollup-null-byte=%00commonjsHelpers.js";',
       );
-      expectIncludes(
-        text,
-        'var foo = commonjsHelpers.createCommonjsModule(function (module, exports) {',
-      );
-      expectIncludes(text, 'exports.__esModule = true;');
-      expectIncludes(text, 'exports.default = void 0;');
+      expectIncludes(text, 'foo.__esModule = true;');
+      expectIncludes(text, 'var default_1 = foo.default = void 0;');
       expectIncludes(text, "var _default = 'foo';");
-      expectIncludes(text, 'exports.default = _default;');
-      expectIncludes(
-        text,
-        'export default /*@__PURE__*/commonjsHelpers.getDefaultExportFromCjs(foo);',
-      );
+      expectIncludes(text, "default_1 = foo.default = _default;");
+      expectIncludes(text, 'export { foo as __moduleExports, default_1 as default };');
     } finally {
       server.stop();
     }
@@ -141,7 +130,7 @@ exports.default = _default;`;
         {
           name: 'test',
           resolveImport({ source }) {
-            if (source === 'bar') {
+            if (source === '\x00bar?commonjs-require') {
               return './bar.js';
             }
             return undefined;
@@ -158,13 +147,13 @@ exports.default = _default;`;
 
     try {
       const text = await fetchText(`${host}/foo.js`);
-      expectIncludes(text, "import './bar.js';");
+      expectIncludes(text, "import \"./bar.js\";");
       expectIncludes(
         text,
-        "import bar from '/__web-dev-server__/rollup/bar.js?web-dev-server-rollup-null-byte=%00",
+        'import require$$0 from "/__web-dev-server__/rollup/bar?web-dev-server-rollup-null-byte=%00bar%3Fcommonjs-external";',
       );
       expectIncludes(text, 'export default foo;');
-      expectIncludes(text, 'export { bar_1 as bar };');
+      expectIncludes(text, 'export { foo as __moduleExports, bar_1 as bar };');
     } finally {
       server.stop();
     }

packages/dev-server/package.json

@@ -56,7 +56,7 @@
   ],
   "dependencies": {
     "@babel/code-frame": "^7.12.11",
-    "@rollup/plugin-node-resolve": "^11.0.1",
+    "@rollup/plugin-node-resolve": "^13.0.4",
     "@types/command-line-args": "^5.0.0",
     "@web/config-loader": "^0.1.3",
     "@web/dev-server-core": "^0.3.14",

packages/rollup-plugin-workbox/package.json

@@ -31,7 +31,7 @@
     "workbox"
   ],
   "dependencies": {
-    "@rollup/plugin-node-resolve": "^11.0.1",
+    "@rollup/plugin-node-resolve": "^13.0.4",
     "@rollup/plugin-replace": "^3.0.0",
     "pretty-bytes": "^5.5.0",
     "rollup-plugin-terser": "^7.0.2",

yarn.lock

@@ -1625,10 +1625,10 @@
     "@babel/helper-module-imports" "^7.10.4"
     "@rollup/pluginutils" "^3.1.0"
 
-"@rollup/plugin-commonjs@^18.0.0":
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-18.1.0.tgz#5a760d757af168a50727c0ae080251fbfcc5eb02"
-  integrity sha512-h3e6T9rUxVMAQswpDIobfUHn/doMzM9sgkMrsMWCFLmB84PSoC8mV8tOloAJjSRwdqhXBqstlX2BwBpHJvbhxg==
+"@rollup/plugin-commonjs@^20.0.0":
+  version "20.0.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-20.0.0.tgz#3246872dcbcb18a54aaa6277a8c7d7f1b155b745"
+  integrity sha512-5K0g5W2Ol8hAcTHqcTBHiA7M58tfmYi1o9KxeJuuRNpGaTa5iLjcyemBitCBcKXaHamOBBEH2dGom6v6Unmqjg==
   dependencies:
     "@rollup/pluginutils" "^3.1.0"
     commondir "^1.0.1"