From 2823a366b6e60e04728e2530e186505756f765bd Mon Sep 17 00:00:00 2001 From: Adam Skoufis Date: Sat, 16 Sep 2023 18:49:16 +1000 Subject: [PATCH] Fix lint errors, update missed snapshot --- packages/rollup-plugin/src/index.ts | 2 +- .../test/__snapshots__/rollup-plugin.test.ts.snap | 2 +- packages/webpack-plugin/src/compiler.ts | 2 +- tests/sprinkles/sprinkles-type-tests.ts | 11 ++--------- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/packages/rollup-plugin/src/index.ts b/packages/rollup-plugin/src/index.ts index a35bc318..66badebc 100644 --- a/packages/rollup-plugin/src/index.ts +++ b/packages/rollup-plugin/src/index.ts @@ -101,7 +101,7 @@ export function vanillaExtractPlugin({ return { code: output, - map: chunkInfo.map ?? null, + map: null, }; }, }; diff --git a/packages/rollup-plugin/test/__snapshots__/rollup-plugin.test.ts.snap b/packages/rollup-plugin/test/__snapshots__/rollup-plugin.test.ts.snap index ea159ed3..f938fc7c 100644 --- a/packages/rollup-plugin/test/__snapshots__/rollup-plugin.test.ts.snap +++ b/packages/rollup-plugin/test/__snapshots__/rollup-plugin.test.ts.snap @@ -520,7 +520,7 @@ exports[`rollup-plugin should build with sourcemaps 1`] = ` ], [ "src/index.js", - "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", ], [ "src/index.js.map", diff --git a/packages/webpack-plugin/src/compiler.ts b/packages/webpack-plugin/src/compiler.ts index 48e90a63..dd6e7c9e 100644 --- a/packages/webpack-plugin/src/compiler.ts +++ b/packages/webpack-plugin/src/compiler.ts @@ -81,7 +81,7 @@ function compileVanillaSource( ); const ExternalsPlugin = compat.getExternalsPlugin(loader._compiler); - new NodeTemplatePlugin(outputOptions).apply(childCompiler); + new NodeTemplatePlugin().apply(childCompiler); new NodeTargetPlugin().apply(childCompiler); if (compat.isWebpack5) { diff --git a/tests/sprinkles/sprinkles-type-tests.ts b/tests/sprinkles/sprinkles-type-tests.ts index f7fe450d..386d0c99 100644 --- a/tests/sprinkles/sprinkles-type-tests.ts +++ b/tests/sprinkles/sprinkles-type-tests.ts @@ -214,15 +214,8 @@ const noop = (...args: Array) => {}; responsiveValue = ['NOPE']; // @ts-expect-error responsiveValue = [123]; - responsiveValue = [ - 'row', - 'row', - 'row', - // @ts-expect-error - 'your', - // @ts-expect-error - 'boat', - ]; + // @ts-expect-error + responsiveValue = ['row', 'row', 'row', 'your', 'boat']; // @ts-expect-error responsiveValue = { mobile: 'nope' }; // @ts-expect-error