From 348c2e0ff2c5f7f91858320e2fd80b213863b726 Mon Sep 17 00:00:00 2001 From: Adam Skoufis Date: Mon, 22 Sep 2025 20:47:19 +1000 Subject: [PATCH 1/2] Test relative paths on windows --- fixtures/themed/src/nested/nested.ts | 3 ++ .../__snapshots__/rollup-plugin.test.ts.snap | 44 +++++++++++++++++-- .../rollup-plugin/test/rollup-plugin.test.ts | 5 ++- 3 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 fixtures/themed/src/nested/nested.ts diff --git a/fixtures/themed/src/nested/nested.ts b/fixtures/themed/src/nested/nested.ts new file mode 100644 index 000000000..3f2f896de --- /dev/null +++ b/fixtures/themed/src/nested/nested.ts @@ -0,0 +1,3 @@ +import { button } from '../styles.css'; + +export { button }; 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 72a411414..4bd4355c6 100644 --- a/packages/rollup-plugin/test/__snapshots__/rollup-plugin.test.ts.snap +++ b/packages/rollup-plugin/test/__snapshots__/rollup-plugin.test.ts.snap @@ -204,6 +204,11 @@ function render() { }); } render(); +", + ], + [ + "src/nested/nested.js", + "export { button } from '../styles.css.js'; ", ], [ @@ -361,6 +366,11 @@ function render() { }); } render(); +", + ], + [ + "nested/nested.js", + "export { button } from '../styles.css.js'; ", ], [ @@ -576,6 +586,14 @@ exports[`rollup-plugin Rollup settings should build with sourcemaps 1`] = ` "src/index.js.map", "", ], + [ + "src/nested/nested.js", + "", + ], + [ + "src/nested/nested.js.map", + "", + ], [ "src/shared.css.js", ";;;;;;", @@ -737,6 +755,7 @@ html .styles_opacity_1\\/4__jteyb17 { "index.js", "import { assignInlineVars, setElementVars } from '@vanilla-extract/dynamic'; import './assets/src/themes.css.ts.vanilla-s9rcEmBH.css'; +import { c as container, b as button, o as opacity } from './styles.css-oQ3WSjqO.js'; import './assets/src/shared.css.ts.vanilla-G_Gyt4-e.css'; import './assets/src/styles.css.ts.vanilla-BfisGtko.css'; @@ -745,10 +764,6 @@ var responsiveTheme = "themes_responsiveTheme__cvta17e"; var theme = "themes_theme__cvta170"; var vars = { colors: { backgroundColor: "var(--colors-backgroundColor__cvta171)", text: "var(--colors-text__cvta172)" }, space: { "1": "var(--space-1__cvta173)", "2": "var(--space-2__cvta174)", "3": "var(--space-3__cvta175)" } }; -var button = "styles_button__jteyb13 shared_shadow__4dtfen0 styles_iDunno__jteyb12"; -var container = "styles_container__jteyb11"; -var opacity = { "1/2": "styles_opacity_1/2__jteyb16", "1/4": "styles_opacity_1/4__jteyb17" }; - var shadow = "shared_shadow__4dtfen0"; var root = "root"; @@ -854,6 +869,27 @@ function render() { }); } render(); +", + ], + [ + "nested.js", + "export { b as button } from './styles.css-oQ3WSjqO.js'; +import './assets/src/shared.css.ts.vanilla-G_Gyt4-e.css'; +import './assets/src/themes.css.ts.vanilla-s9rcEmBH.css'; +import './assets/src/styles.css.ts.vanilla-BfisGtko.css'; +", + ], + [ + "styles.css-oQ3WSjqO.js", + "import './assets/src/shared.css.ts.vanilla-G_Gyt4-e.css'; +import './assets/src/themes.css.ts.vanilla-s9rcEmBH.css'; +import './assets/src/styles.css.ts.vanilla-BfisGtko.css'; + +var button = "styles_button__jteyb13 shared_shadow__4dtfen0 styles_iDunno__jteyb12"; +var container = "styles_container__jteyb11"; +var opacity = { "1/2": "styles_opacity_1/2__jteyb16", "1/4": "styles_opacity_1/4__jteyb17" }; + +export { button as b, container as c, opacity as o }; ", ], ] diff --git a/packages/rollup-plugin/test/rollup-plugin.test.ts b/packages/rollup-plugin/test/rollup-plugin.test.ts index 9daefcdea..65521be4e 100644 --- a/packages/rollup-plugin/test/rollup-plugin.test.ts +++ b/packages/rollup-plugin/test/rollup-plugin.test.ts @@ -25,7 +25,10 @@ async function build({ ...pluginOptions }: BuildOptions) { const bundle = await rollup({ - input: require.resolve('@fixtures/themed/src/index.ts'), + input: [ + require.resolve('@fixtures/themed/src/index.ts'), + require.resolve('@fixtures/themed/src/nested/nested.ts'), + ], external: ['@vanilla-extract/dynamic'], ...rollupOptions, plugins: [ From c09b99ee037f8f29174ad8165e9606cd8a8b42cc Mon Sep 17 00:00:00 2001 From: Adam Skoufis Date: Tue, 23 Sep 2025 19:26:24 +1000 Subject: [PATCH 2/2] Emit nested file in nested directory --- .../__snapshots__/rollup-plugin.test.ts.snap | 34 +++++++++---------- .../rollup-plugin/test/rollup-plugin.test.ts | 8 ++--- 2 files changed, 21 insertions(+), 21 deletions(-) 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 4bd4355c6..2a581da5e 100644 --- a/packages/rollup-plugin/test/__snapshots__/rollup-plugin.test.ts.snap +++ b/packages/rollup-plugin/test/__snapshots__/rollup-plugin.test.ts.snap @@ -123,12 +123,12 @@ html .styles_opacity_1\\/4__jteyb17 { }", ], [ - "src/index.js", + "index.js", "import { assignInlineVars, setElementVars } from '@vanilla-extract/dynamic'; -import { vars, altTheme, theme, responsiveTheme } from './themes.css.js'; -import { container, button, opacity } from './styles.css.js'; -import { shadow } from './shared.css.js'; -import testNodes from '../test-nodes.json.js'; +import { vars, altTheme, theme, responsiveTheme } from './src/themes.css.js'; +import { container, button, opacity } from './src/styles.css.js'; +import { shadow } from './src/shared.css.js'; +import testNodes from './test-nodes.json.js'; const inlineTheme = assignInlineVars(vars, { colors: { @@ -207,8 +207,8 @@ render(); ", ], [ - "src/nested/nested.js", - "export { button } from '../styles.css.js'; + "nested/index.js", + "export { button } from '../src/styles.css.js'; ", ], [ @@ -369,7 +369,7 @@ render(); ", ], [ - "nested/nested.js", + "nested/index.js", "export { button } from '../styles.css.js'; ", ], @@ -579,19 +579,19 @@ exports[`rollup-plugin Rollup settings should build with sourcemaps 1`] = ` "", ], [ - "src/index.js", + "index.js", ";;;;;;AAiBA,MAAM,WAAA,GAAc,iBAAiB,IAAA,EAAM;AAAA,EACzC,MAAA,EAAQ;AAAA,IACN,eAAA,EAAiB,QAAA;AAAA,IACjB,IAAA,EAAM;AAAA,GACR;AAAA,EACA,KAAA,EAAO;AAAA,IACL,CAAA,EAAG,KAAA;AAAA,IACH,CAAA,EAAG,KAAA;AAAA,IACH,CAAA,EAAG;AAAA;AAEP,CAAC,CAAA;AAED,SAAS,MAAA,GAAS;AAChB,EAAA,QAAA,CAAS,KAAK,SAAA,GAAY;AAAA,WAAA,EACf,SAAA,CAAU,IAAI,CAAA,SAAA,EAAY,MAAM,CAAA;AAAA;AAAA,aAAA,EAE9B,SAAA,CAAU,aAAa,CAAA,SAAA,EAAY,SAAS,CAAA;AAAA,kBAAA,EACvC,SAAA,CAAU,UAAU,CAAA,SAAA,EAAY,MAAM,CAAA;AAAA,kBAAA,EACtC,QAAQ,CAAA;AAAA;AAAA,iBAAA,EAET,SAAA,CAAU,YAAY,CAAA,SAAA,EAAY,SAAS,CAAA;AAAA,sBAAA,EACtC,SAAA,CAAU,SAAS,CAAA,SAAA,EAAY,MAAM,CAAA;AAAA,sBAAA,EACrC,KAAK,CAAA;AAAA;AAAA,qBAAA,EAEN,SAAA,CAAU,mBAAmB,CAAA,SAAA,EAAY,SAAS,CAAA;AAAA,0BAAA,EAC7C,SAAA,CAAU,gBAAgB,CAAA,SAAA,EAAY,MAAM,CAAA;AAAA,wBAAA,EAC9C,WAAW,CAAA;AAAA;AAAA,yBAAA,EAEV,SAAA,CAAU,oBAAoB,CAAA,SAAA,EAAY,SAAS,CAAA;AAAA,8BAAA,EAC9C,SAAA,CAAU,iBAAiB,CAAA,SAAA,EAAY,MAAM,CAAA,CAAA,EAAI,OAAA,CAAQ,KAAK,CAAC,CAAA,6BAAA,EAAgC,OAAA,CAAQ,KAAK,CAAC,CAAA;AAAA;AAAA;AAAA,6BAAA,EAG9G,SAAA,CAAU,oBAAoB,CAAA,SAAA,EAAY,SAAS,CAAA;AAAA,kCAAA,EAC9C,SAAA,CAAU,iBAAiB,CAAA,SAAA,EAAY,MAAM,CAAA;AAAA,8BAAA,EACjD,eAAe,CAAA;AAAA;AAAA,yBAAA,EAEpB,SAAA,CAAU,wBAAwB,CAAA,SAAA,EAAY,SAAS,CAAA;AAAA,8BAAA,EAClD,SAAA,CAAU,qBAAqB,CAAA,SAAA,EAAY,MAAM,CAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,CAAA;AAiB/E,EAAA,MAAM,uBAAuB,QAAA,CAAS,cAAA;AAAA,IACpC,SAAA,CAAU;AAAA,GACZ;AAEA,EAAA,IAAI,CAAC,oBAAA,EAAsB;AACzB,IAAA,MAAM,IAAI,MAAM,mCAAmC,CAAA;AAAA,EACrD;AAEA,EAAA,cAAA,CAAe,sBAAsB,IAAA,EAAM;AAAA,IACzC,MAAA,EAAQ;AAAA,MACN,eAAA,EAAiB,aAAA;AAAA,MACjB,IAAA,EAAM;AAAA,KACR;AAAA,IACA,KAAA,EAAO;AAAA,MACL,CAAA,EAAG,KAAA;AAAA,MACH,CAAA,EAAG,MAAA;AAAA,MACH,CAAA,EAAG;AAAA;AACL,GACD,CAAA;AAED,EAAA,cAAA,CAAe,oBAAA,EAAsB;AAAA,IACnC,CAAC,IAAA,CAAK,MAAA,CAAO,eAAe,GAAG;AAAA,GAChC,CAAA;AACH;AAEA,MAAA,EAAO", ], [ - "src/index.js.map", + "index.js.map", "", ], [ - "src/nested/nested.js", + "nested/index.js", "", ], [ - "src/nested/nested.js.map", + "nested/index.js.map", "", ], [ @@ -872,11 +872,11 @@ render(); ", ], [ - "nested.js", - "export { b as button } from './styles.css-oQ3WSjqO.js'; -import './assets/src/shared.css.ts.vanilla-G_Gyt4-e.css'; -import './assets/src/themes.css.ts.vanilla-s9rcEmBH.css'; -import './assets/src/styles.css.ts.vanilla-BfisGtko.css'; + "nested/index.js", + "export { b as button } from '../styles.css-oQ3WSjqO.js'; +import './../assets/src/shared.css.ts.vanilla-G_Gyt4-e.css'; +import './../assets/src/themes.css.ts.vanilla-s9rcEmBH.css'; +import './../assets/src/styles.css.ts.vanilla-BfisGtko.css'; ", ], [ diff --git a/packages/rollup-plugin/test/rollup-plugin.test.ts b/packages/rollup-plugin/test/rollup-plugin.test.ts index 65521be4e..6bbca97b7 100644 --- a/packages/rollup-plugin/test/rollup-plugin.test.ts +++ b/packages/rollup-plugin/test/rollup-plugin.test.ts @@ -25,10 +25,10 @@ async function build({ ...pluginOptions }: BuildOptions) { const bundle = await rollup({ - input: [ - require.resolve('@fixtures/themed/src/index.ts'), - require.resolve('@fixtures/themed/src/nested/nested.ts'), - ], + input: { + index: require.resolve('@fixtures/themed/src/index.ts'), + 'nested/index': require.resolve('@fixtures/themed/src/nested/nested.ts'), + }, external: ['@vanilla-extract/dynamic'], ...rollupOptions, plugins: [