Merge branch 'dev' into fix-vite-consistent-Request-class

remix-run · Nov 20, 2023 · 4739128 · 4739128
2 parents 6209d37 + b6d7ee0
commit 4739128
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 19 deletions.
diff --git a/integration/package.json b/integration/package.json
@@ -10,7 +10,7 @@
     "@cloudflare/workers-types": "^4.20230518.0",
     "@playwright/test": "^1.33.0",
     "@vanilla-extract/css": "^1.10.0",
-    "@vanilla-extract/vite-plugin": "^3.9.1",
+    "@vanilla-extract/vite-plugin": "^3.9.2",
     "cheerio": "^1.0.0-rc.12",
     "cross-env": "^7.0.3",
     "cross-spawn": "^7.0.3",

diff --git a/integration/vite-css-build-test.ts b/integration/vite-css-build-test.ts
@@ -45,9 +45,7 @@ test.describe("Vite CSS build", () => {
 
           export default defineConfig({
             plugins: [
-              vanillaExtractPlugin({
-                emitCssInSsr: true,
-              }),
+              vanillaExtractPlugin(),
               remix(),
             ],
           });

diff --git a/integration/vite-css-dev-express-test.ts b/integration/vite-css-dev-express-test.ts
@@ -35,9 +35,7 @@ test.describe("Vite CSS dev (Express server)", () => {
               }
             },
             plugins: [
-              vanillaExtractPlugin({
-                emitCssInSsr: true,
-              }),
+              vanillaExtractPlugin(),
               remix(),
             ],
           });

diff --git a/integration/vite-css-dev-test.ts b/integration/vite-css-dev-test.ts
@@ -38,9 +38,7 @@ test.describe("Vite CSS dev", () => {
               strictPort: true,
             },
             plugins: [
-              vanillaExtractPlugin({
-                emitCssInSsr: true,
-              }),
+              vanillaExtractPlugin(),
               remix(),
             ],
           });

diff --git a/yarn.lock b/yarn.lock
@@ -3352,10 +3352,10 @@
     modern-ahocorasick "^1.0.0"
     outdent "^0.8.0"
 
-"@vanilla-extract/integration@^6.0.2", "@vanilla-extract/integration@^6.2.0":
-  version "6.2.3"
-  resolved "https://registry.npmjs.org/@vanilla-extract/integration/-/integration-6.2.3.tgz#fd6d4dcca4a52db9c1b2de26f7e524f8155f9b3a"
-  integrity sha512-Ix7xCClFlERl3ZwPuqHCOTyat8Wq5LQVRaGI+1i0HUagu+vtUvrDXUPLF0gCtdBGvnypD3QuYx6lLz3sV2H/ZA==
+"@vanilla-extract/integration@^6.2.0", "@vanilla-extract/integration@^6.2.4":
+  version "6.2.4"
+  resolved "https://registry.npmjs.org/@vanilla-extract/integration/-/integration-6.2.4.tgz#bd8a5ec0916051c1ef5fb66d8484a5cad8d8c58d"
+  integrity sha512-+AfymNMVq9sEUe0OJpdCokmPZg4Zi6CqKaW/PnUOfDwEn53ighHOMOBl5hAgxYR8Kiz9NG43Bn00mkjWlFi+ng==
   dependencies:
     "@babel/core" "^7.20.7"
     "@babel/plugin-syntax-typescript" "^7.20.0"
@@ -3376,12 +3376,12 @@
   resolved "https://registry.npmjs.org/@vanilla-extract/private/-/private-1.0.3.tgz"
   integrity sha512-17kVyLq3ePTKOkveHxXuIJZtGYs+cSoev7BlP+Lf4916qfDhk/HBjvlYDe8egrea7LNPHKwSZJK/bzZC+Q6AwQ==
 
-"@vanilla-extract/vite-plugin@^3.9.1":
-  version "3.9.1"
-  resolved "https://registry.npmjs.org/@vanilla-extract/vite-plugin/-/vite-plugin-3.9.1.tgz#28da454974d4dbc45871d715202dac8332d2d6ae"
-  integrity sha512-FI0Tzga+iuqPqFGms9qjeeb+PbdJdIGuG1Yc8gnzHSsRVy61u05wmfSbN9AN+FKzcvV/O1zAvRrusXCXi1oHYA==
+"@vanilla-extract/vite-plugin@^3.9.2":
+  version "3.9.2"
+  resolved "https://registry.npmjs.org/@vanilla-extract/vite-plugin/-/vite-plugin-3.9.2.tgz#5f4a8e884b768d5c9332931b69479295285064c8"
+  integrity sha512-WYgWiEs+nw+lNazyW0Ixp0MMgtNgPL+8fFKrol1V5XoNIzRrYPGfuLhRI7PwheSWQVGF7OOer0kUWQcLey1vOQ==
   dependencies:
-    "@vanilla-extract/integration" "^6.0.2"
+    "@vanilla-extract/integration" "^6.2.4"
     outdent "^0.8.0"
     postcss "^8.3.6"
     postcss-load-config "^4.0.1"