From dab28f33aa3573afb0ab206decb7c12e35b13181 Mon Sep 17 00:00:00 2001 From: web-padawan Date: Sun, 5 Jun 2022 22:34:30 +0300 Subject: [PATCH 1/2] fix: update Rollup, use moduleSideEffects flag --- packages/dev-server-rollup/package.json | 2 +- .../src/createRollupPluginContextAdapter.ts | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/dev-server-rollup/package.json b/packages/dev-server-rollup/package.json index b290a4f47..ab3cb4512 100644 --- a/packages/dev-server-rollup/package.json +++ b/packages/dev-server-rollup/package.json @@ -51,7 +51,7 @@ "@web/dev-server-core": "^0.3.16", "nanocolors": "^0.2.1", "parse5": "^6.0.1", - "rollup": "^2.66.1", + "rollup": "^2.67.0", "whatwg-url": "^11.0.0" }, "devDependencies": { diff --git a/packages/dev-server-rollup/src/createRollupPluginContextAdapter.ts b/packages/dev-server-rollup/src/createRollupPluginContextAdapter.ts index fdf5b9cea..161d2f5f6 100644 --- a/packages/dev-server-rollup/src/createRollupPluginContextAdapter.ts +++ b/packages/dev-server-rollup/src/createRollupPluginContextAdapter.ts @@ -38,7 +38,7 @@ export function createRollupPluginContextAdapter< isEntry: false, isExternal: false, isIncluded: false, - hasModuleSideEffects: false, + moduleSideEffects: false, syntheticNamedExports: false, meta: pluginMetaPerModule.get(id) ?? {}, }; diff --git a/yarn.lock b/yarn.lock index e2192c046..3dfd67b6e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11213,10 +11213,10 @@ rollup-pluginutils@^2.8.2: dependencies: estree-walker "^0.6.1" -rollup@^2.43.1, rollup@^2.66.1: - version "2.66.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.66.1.tgz#366b0404de353c4331d538c3ad2963934fcb4937" - integrity sha512-crSgLhSkLMnKr4s9iZ/1qJCplgAgrRY+igWv8KhG/AjKOJ0YX/WpmANyn8oxrw+zenF3BXWDLa7Xl/QZISH+7w== +rollup@^2.43.1, rollup@^2.66.1, rollup@^2.67.0: + version "2.75.5" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.75.5.tgz#7985c1962483235dd07966f09fdad5c5f89f16d0" + integrity sha512-JzNlJZDison3o2mOxVmb44Oz7t74EfSd1SQrplQk0wSaXV7uLQXtVdHbxlcT3w+8tZ1TL4r/eLfc7nAbz38BBA== optionalDependencies: fsevents "~2.3.2" From d9487040cc267f06da797d9530896d50cd8a93fa Mon Sep 17 00:00:00 2001 From: web-padawan Date: Sun, 5 Jun 2022 22:48:04 +0300 Subject: [PATCH 2/2] chore: fix compilation errors --- .changeset/chatty-ghosts-argue.md | 6 ++++++ .../src/createRollupPluginContextAdapter.ts | 1 + packages/dev-server-rollup/src/rollupAdapter.ts | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .changeset/chatty-ghosts-argue.md diff --git a/.changeset/chatty-ghosts-argue.md b/.changeset/chatty-ghosts-argue.md new file mode 100644 index 000000000..6a6e15ecd --- /dev/null +++ b/.changeset/chatty-ghosts-argue.md @@ -0,0 +1,6 @@ +--- +'@web/dev-server-rollup': patch +'@web/dev-server': patch +--- + +Update Rollup, use moduleSideEffects flag diff --git a/packages/dev-server-rollup/src/createRollupPluginContextAdapter.ts b/packages/dev-server-rollup/src/createRollupPluginContextAdapter.ts index 161d2f5f6..f0936148e 100644 --- a/packages/dev-server-rollup/src/createRollupPluginContextAdapter.ts +++ b/packages/dev-server-rollup/src/createRollupPluginContextAdapter.ts @@ -38,6 +38,7 @@ export function createRollupPluginContextAdapter< isEntry: false, isExternal: false, isIncluded: false, + hasModuleSideEffects: false, moduleSideEffects: false, syntheticNamedExports: false, meta: pluginMetaPerModule.get(id) ?? {}, diff --git a/packages/dev-server-rollup/src/rollupAdapter.ts b/packages/dev-server-rollup/src/rollupAdapter.ts index c5b494dcb..fcac5f77e 100644 --- a/packages/dev-server-rollup/src/rollupAdapter.ts +++ b/packages/dev-server-rollup/src/rollupAdapter.ts @@ -295,7 +295,7 @@ export function rollupAdapter( if (typeof result === 'string') { return { body: result, type: 'js' }; } - if (typeof result?.code === 'string') { + if (result != null && typeof result?.code === 'string') { savePluginMeta(filePath, result); return { body: result.code, type: 'js' }; }