Skip to content

Commit

Permalink
Update rollup and rollup plugins (#1463)
Browse files Browse the repository at this point in the history
  • Loading branch information
askoufis authored Aug 18, 2024
1 parent 6668e9e commit 61878f5
Show file tree
Hide file tree
Showing 7 changed files with 237 additions and 193 deletions.
9 changes: 9 additions & 0 deletions .changeset/twenty-bananas-relate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@vanilla-extract/css': patch
'@vanilla-extract/integration': patch
'@vanilla-extract/private': patch
'@vanilla-extract/recipes': patch
'@vanilla-extract/sprinkles': patch
---

Export types with `export { type T }` syntax
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
"jest-environment-jsdom": "^29.7.0",
"prettier": "^2.8.8",
"resolve.exports": "^2.0.2",
"rollup": "^2.7.0",
"rollup-plugin-dts": "^4.2.2",
"rollup-plugin-node-externals": "^5.0.0",
"rollup": "^4.20.0",
"rollup-plugin-dts": "^6.1.1",
"rollup-plugin-node-externals": "^7.1.3",
"tsx": "^4.17.0",
"typescript": "^5.5.4",
"vitest": "^1.5.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/rollup-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
},
"devDependencies": {
"@fixtures/themed": "workspace:*",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-json": "^6.1.0",
"@vanilla-extract/css": "workspace:^",
"esbuild": "~0.23.1",
"rollup": "^2.7.0",
"rollup-plugin-esbuild": "^4.9.1"
"rollup": "^4.20.0",
"rollup-plugin-esbuild": "^6.1.1"
},
"peerDependencies": {
"rollup": "^2.0.0 || ^3.0.0 || ^4.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/rollup-plugin/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export function vanillaExtractPlugin({

return {
code: output,
map: chunkInfo.map ?? null,
map: null,
};
},
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`rollup-plugin should build with preserveModules 1`] = `
[
[
"assets/src/shared.css.ts.vanilla-16598c42.css",
"assets/src/shared.css.ts.vanilla-G_Gyt4-e.css",
".shared_shadow__4dtfen0 {
box-shadow: 0 0 5px red;
}
Expand All @@ -15,7 +15,7 @@ body, button {
}",
],
[
"assets/src/styles.css.ts.vanilla-1b9864b6.css",
"assets/src/styles.css.ts.vanilla-C7NI1Ovc.css",
"@font-face {
src: local("Impact");
font-family: "styles_impact__jteyb10";
Expand Down Expand Up @@ -68,7 +68,7 @@ html .styles_opacity_1\\/4__jteyb17 {
}",
],
[
"assets/src/themes.css.ts.vanilla-3ad7ca47.css",
"assets/src/themes.css.ts.vanilla-DMMXGwB8.css",
":root, .themes_theme__cvta170 {
--colors-backgroundColor__cvta171: blue;
--colors-text__cvta172: white;
Expand Down Expand Up @@ -183,7 +183,7 @@ render();
],
[
"src/shared.css.js",
"import './../assets/src/shared.css.ts.vanilla-16598c42.css';
"import './../assets/src/shared.css.ts.vanilla-G_Gyt4-e.css';
var shadow = "shared_shadow__4dtfen0";
Expand All @@ -192,9 +192,9 @@ export { shadow };
],
[
"src/styles.css.js",
"import './../assets/src/shared.css.ts.vanilla-16598c42.css';
import './../assets/src/themes.css.ts.vanilla-3ad7ca47.css';
import './../assets/src/styles.css.ts.vanilla-1b9864b6.css';
"import './../assets/src/shared.css.ts.vanilla-G_Gyt4-e.css';
import './../assets/src/themes.css.ts.vanilla-DMMXGwB8.css';
import './../assets/src/styles.css.ts.vanilla-C7NI1Ovc.css';
var button = "styles_button__jteyb13 shared_shadow__4dtfen0 styles_iDunno__jteyb12";
var container = "styles_container__jteyb11";
Expand All @@ -205,7 +205,7 @@ export { button, container, opacity };
],
[
"src/themes.css.js",
"import './../assets/src/themes.css.ts.vanilla-3ad7ca47.css';
"import './../assets/src/themes.css.ts.vanilla-DMMXGwB8.css';
var altTheme = "themes_altTheme__cvta176";
var responsiveTheme = "themes_responsiveTheme__cvta177";
Expand Down Expand Up @@ -507,44 +507,64 @@ export { altTheme, responsiveTheme, theme, vars };
exports[`rollup-plugin should build with sourcemaps 1`] = `
[
[
"assets/src/shared.css.ts.vanilla-16598c42.css",
"assets/src/shared.css.ts.vanilla-G_Gyt4-e.css",
"",
],
[
"assets/src/styles.css.ts.vanilla-1b9864b6.css",
"assets/src/styles.css.ts.vanilla-C7NI1Ovc.css",
"",
],
[
"assets/src/themes.css.ts.vanilla-3ad7ca47.css",
"assets/src/themes.css.ts.vanilla-DMMXGwB8.css",
"",
],
[
"src/index.js",
";;;;;;AAKA,MAAM,WAAW,GAAG,gBAAgB,CAAC,IAAI,EAAE;AAC3C,EAAE,MAAM,EAAE;AACV,IAAI,eAAe,EAAE,QAAQ;AAC7B,IAAI,IAAI,EAAE,OAAO;AACjB,GAAG;AACH,EAAE,KAAK,EAAE;AACT,IAAI,CAAC,EAAE,KAAK;AACZ,IAAI,CAAC,EAAE,KAAK;AACZ,IAAI,CAAC,EAAE,MAAM;AACb,GAAG;AACH,CAAC,CAAC,CAAC;AACH,SAAS,MAAM,GAAG;AAClB,EAAE,QAAQ,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC;AAC7B,WAAW,EAAE,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC;AAC9C;AACA,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,SAAS,EAAE,SAAS,CAAC;AAC5D,kBAAkB,EAAE,SAAS,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC;AAC3D,kBAAkB,EAAE,QAAQ,CAAC;AAC7B;AACA,iBAAiB,EAAE,SAAS,CAAC,YAAY,CAAC,SAAS,EAAE,SAAS,CAAC;AAC/D,sBAAsB,EAAE,SAAS,CAAC,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC;AAC9D,sBAAsB,EAAE,KAAK,CAAC;AAC9B;AACA,qBAAqB,EAAE,SAAS,CAAC,mBAAmB,CAAC,SAAS,EAAE,SAAS,CAAC;AAC1E,0BAA0B,EAAE,SAAS,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,CAAC;AACzE,wBAAwB,EAAE,WAAW,CAAC;AACtC;AACA,yBAAyB,EAAE,SAAS,CAAC,oBAAoB,CAAC,SAAS,EAAE,SAAS,CAAC;AAC/E,8BAA8B,EAAE,SAAS,CAAC,iBAAiB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;AAChG;AACA;AACA,6BAA6B,EAAE,SAAS,CAAC,oBAAoB,CAAC,SAAS,EAAE,SAAS,CAAC;AACnF,kCAAkC,EAAE,SAAS,CAAC,iBAAiB,CAAC,SAAS,EAAE,MAAM,CAAC;AAClF,8BAA8B,EAAE,eAAe,CAAC;AAChD;AACA,yBAAyB,EAAE,SAAS,CAAC,wBAAwB,CAAC,SAAS,EAAE,SAAS,CAAC;AACnF,8BAA8B,EAAE,SAAS,CAAC,qBAAqB,CAAC,SAAS,EAAE,MAAM,CAAC;AAClF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,CAAC,CAAC;AACF,EAAE,MAAM,oBAAoB,GAAG,QAAQ,CAAC,cAAc;AACtD,IAAI,SAAS,CAAC,oBAAoB;AAClC,GAAG,CAAC;AACJ,EAAE,IAAI,CAAC,oBAAoB,EAAE;AAC7B,IAAI,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;AACzD,GAAG;AACH,EAAE,cAAc,CAAC,oBAAoB,EAAE,IAAI,EAAE;AAC7C,IAAI,MAAM,EAAE;AACZ,MAAM,eAAe,EAAE,aAAa;AACpC,MAAM,IAAI,EAAE,YAAY;AACxB,KAAK;AACL,IAAI,KAAK,EAAE;AACX,MAAM,CAAC,EAAE,KAAK;AACd,MAAM,CAAC,EAAE,MAAM;AACf,MAAM,CAAC,EAAE,MAAM;AACf,KAAK;AACL,GAAG,CAAC,CAAC;AACL,EAAE,cAAc,CAAC,oBAAoB,EAAE;AACvC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,GAAG,YAAY;AAC/C,GAAG,CAAC,CAAC;AACL,CAAC;AACD,MAAM,EAAE",
";;;;;;AAiBA,MAAM,WAAA,GAAc,iBAAiB,IAAM,EAAA;AAAA,EACzC,MAAQ,EAAA;AAAA,IACN,eAAiB,EAAA,QAAA;AAAA,IACjB,IAAM,EAAA,OAAA;AAAA,GACR;AAAA,EACA,KAAO,EAAA;AAAA,IACL,CAAG,EAAA,KAAA;AAAA,IACH,CAAG,EAAA,KAAA;AAAA,IACH,CAAG,EAAA,MAAA;AAAA,GACL;AACF,CAAC,CAAA,CAAA;AAED,SAAS,MAAS,GAAA;AAChB,EAAA,QAAA,CAAS,KAAK,SAAY,GAAA,CAAA;AAAA,WACf,EAAA,SAAA,CAAU,IAAI,CAAA,SAAA,EAAY,MAAM,CAAA;AAAA;AAAA,aAE9B,EAAA,SAAA,CAAU,aAAa,CAAA,SAAA,EAAY,SAAS,CAAA;AAAA,kBACvC,EAAA,SAAA,CAAU,UAAU,CAAA,SAAA,EAAY,MAAM,CAAA;AAAA,kBAAA,EACtC,QAAQ,CAAA;AAAA;AAAA,iBAET,EAAA,SAAA,CAAU,YAAY,CAAA,SAAA,EAAY,SAAS,CAAA;AAAA,sBACtC,EAAA,SAAA,CAAU,SAAS,CAAA,SAAA,EAAY,MAAM,CAAA;AAAA,sBAAA,EACrC,KAAK,CAAA;AAAA;AAAA,qBAEN,EAAA,SAAA,CAAU,mBAAmB,CAAA,SAAA,EAAY,SAAS,CAAA;AAAA,0BAC7C,EAAA,SAAA,CAAU,gBAAgB,CAAA,SAAA,EAAY,MAAM,CAAA;AAAA,wBAAA,EAC9C,WAAW,CAAA;AAAA;AAAA,yBAEV,EAAA,SAAA,CAAU,oBAAoB,CAAA,SAAA,EAAY,SAAS,CAAA;AAAA,8BAAA,EAC9C,UAAU,iBAAiB,CAAA,SAAA,EAAY,MAAM,CAAI,CAAA,EAAA,OAAA,CAAQ,KAAK,CAAC,CAAA;AAAA;AAAA;AAAA,6BAGhE,EAAA,SAAA,CAAU,oBAAoB,CAAA,SAAA,EAAY,SAAS,CAAA;AAAA,kCAC9C,EAAA,SAAA,CAAU,iBAAiB,CAAA,SAAA,EAAY,MAAM,CAAA;AAAA,8BAAA,EACjD,eAAe,CAAA;AAAA;AAAA,yBAEpB,EAAA,SAAA,CAAU,wBAAwB,CAAA,SAAA,EAAY,SAAS,CAAA;AAAA,8BAClD,EAAA,SAAA,CAAU,qBAAqB,CAAA,SAAA,EAAY,MAAM,CAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,CAAA,CAAA;AAiB/E,EAAA,MAAM,uBAAuB,QAAS,CAAA,cAAA;AAAA,IACpC,SAAU,CAAA,oBAAA;AAAA,GACZ,CAAA;AAEA,EAAA,IAAI,CAAC,oBAAsB,EAAA;AACzB,IAAM,MAAA,IAAI,MAAM,mCAAmC,CAAA,CAAA;AAAA,GACrD;AAEA,EAAA,cAAA,CAAe,sBAAsB,IAAM,EAAA;AAAA,IACzC,MAAQ,EAAA;AAAA,MACN,eAAiB,EAAA,aAAA;AAAA,MACjB,IAAM,EAAA,YAAA;AAAA,KACR;AAAA,IACA,KAAO,EAAA;AAAA,MACL,CAAG,EAAA,KAAA;AAAA,MACH,CAAG,EAAA,MAAA;AAAA,MACH,CAAG,EAAA,MAAA;AAAA,KACL;AAAA,GACD,CAAA,CAAA;AAED,EAAA,cAAA,CAAe,oBAAsB,EAAA;AAAA,IACnC,CAAC,IAAA,CAAK,MAAO,CAAA,eAAe,GAAG,YAAA;AAAA,GAChC,CAAA,CAAA;AACH,CAAA;AAEA,MAAO,EAAA",
],
[
"src/index.js.map",
"",
],
[
"src/shared.css.js",
";;;;;;",
],
[
"src/shared.css.js.map",
"",
],
[
"src/styles.css.js",
";;;;;;;;;;",
],
[
"src/styles.css.js.map",
"",
],
[
"src/themes.css.js",
";;;;;;;;;",
],
[
"src/themes.css.js.map",
"",
],
[
"test-nodes.json.js",
";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;",
],
[
"test-nodes.json.js.map",
"",
],
]
`;
exports[`rollup-plugin should build without preserveModules 1`] = `
[
[
"assets/src/shared.css.ts.vanilla-16598c42.css",
"assets/src/shared.css.ts.vanilla-G_Gyt4-e.css",
".shared_shadow__4dtfen0 {
box-shadow: 0 0 5px red;
}
Expand All @@ -556,7 +576,7 @@ body, button {
}",
],
[
"assets/src/styles.css.ts.vanilla-1b9864b6.css",
"assets/src/styles.css.ts.vanilla-C7NI1Ovc.css",
"@font-face {
src: local("Impact");
font-family: "styles_impact__jteyb10";
Expand Down Expand Up @@ -609,7 +629,7 @@ html .styles_opacity_1\\/4__jteyb17 {
}",
],
[
"assets/src/themes.css.ts.vanilla-3ad7ca47.css",
"assets/src/themes.css.ts.vanilla-DMMXGwB8.css",
":root, .themes_theme__cvta170 {
--colors-backgroundColor__cvta171: blue;
--colors-text__cvta172: white;
Expand Down Expand Up @@ -641,9 +661,9 @@ html .styles_opacity_1\\/4__jteyb17 {
[
"index.js",
"import { assignInlineVars, setElementVars } from '@vanilla-extract/dynamic';
import './assets/src/themes.css.ts.vanilla-3ad7ca47.css';
import './assets/src/shared.css.ts.vanilla-16598c42.css';
import './assets/src/styles.css.ts.vanilla-1b9864b6.css';
import './assets/src/themes.css.ts.vanilla-DMMXGwB8.css';
import './assets/src/shared.css.ts.vanilla-G_Gyt4-e.css';
import './assets/src/styles.css.ts.vanilla-C7NI1Ovc.css';
var altTheme = "themes_altTheme__cvta176";
var responsiveTheme = "themes_responsiveTheme__cvta177";
Expand Down
Loading

0 comments on commit 61878f5

Please sign in to comment.