fix: hmr and tests

10up · Oct 23, 2024 · 904e79c · 904e79c
1 parent 33d6181
commit 904e79c
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 18 deletions.
diff --git a/.changeset/light-mice-relate.md b/.changeset/light-mice-relate.md
@@ -0,0 +1,5 @@
+---
+"10up-toolkit": minor
+---
+
+Introducing Vanilla-extract support
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/toolkit/config/__tests__/__snapshots__/webpack-fast-refresh.js.snap b/packages/toolkit/config/__tests__/__snapshots__/webpack-fast-refresh.js.snap
@@ -55,7 +55,12 @@ exports[`webpack.config.js includes react-webpack-fast-refresh with the --hot op
               "cacheDirectory": true,
               "configFile": false,
               "plugins": [
-                "/node_modules/react-refresh/babel.js",
+                [
+                  "/node_modules/react-refresh/babel.js",
+                  {
+                    "skipEnvCheck": true,
+                  },
+                ],
               ],
               "presets": [
                 [
@@ -109,7 +114,12 @@ exports[`webpack.config.js includes react-webpack-fast-refresh with the --hot op
                 "babelrc": false,
                 "configFile": false,
                 "plugins": [
-                  "/node_modules/react-refresh/babel.js",
+                  [
+                    "/node_modules/react-refresh/babel.js",
+                    {
+                      "skipEnvCheck": true,
+                    },
+                  ],
                 ],
                 "presets": [
                   [

diff --git a/packages/toolkit/config/webpack/modules.js b/packages/toolkit/config/webpack/modules.js
@@ -72,9 +72,12 @@ module.exports = ({
 				babelrc: false,
 				configFile: false,
 				sourceType: 'unambiguous',
-				plugins: [hasReactFastRefresh && require.resolve('react-refresh/babel')].filter(
-					Boolean,
-				),
+				plugins: [
+					hasReactFastRefresh && [
+						require.resolve('react-refresh/babel'),
+						{ skipEnvCheck: true },
+					],
+				].filter(Boolean),
 				presets: [
 					[
 						require.resolve('@10up/babel-preset-default'),

diff --git a/projects/10up-theme/includes/blocks/example-vanilla-extract/styles.css.ts b/projects/10up-theme/includes/blocks/example-vanilla-extract/styles.css.ts
@@ -2,5 +2,5 @@ import { style } from '@vanilla-extract/css';
 
 export const container = style({
 	border: '2px dashed black',
-	backgroundColor: 'blue',
+	backgroundColor: 'red',
 });
diff --git a/projects/10up-theme/package.json b/projects/10up-theme/package.json
@@ -3,7 +3,7 @@
   "version": "1.1.5-next.7",
   "private": true,
   "scripts": {
-    "start": "10up-toolkit start",
+    "start": "10up-toolkit start --hot",
     "watch": "10up-toolkit start",
     "build": "10up-toolkit build",
     "format-js": "10up-toolkit format-js",
@@ -19,7 +19,7 @@
   "devDependencies": {
     "@linaria/babel-preset": "^5.0.3",
     "@linaria/webpack-loader": "^5.0.3",
-    "@wordpress/env": "^5.0.0",
+    "@wordpress/env": "^10.10.0",
     "10up-toolkit": "^6.3.0-next.0"
   },
   "dependencies": {
@@ -35,7 +35,7 @@
   },
   "10up-toolkit": {
     "useBlockAssets": true,
-    "useScriptModules": true,
+    "useScriptModules": false,
     "loadBlockSpecificStyles": true,
     "entry": {
       "admin": "./assets/js/admin/admin.js",
@@ -48,9 +48,6 @@
       "styleguide-style": "./assets/css/styleguide/styleguide.css",
       "core-block-overrides": "./includes/core-block-overrides.js",
       "test-style": "./assets/css/frontend/testing.scss"
-    },
-    "moduleEntry": {
-      "frontend-module": "./assets/js/frontend/frontend-module.js"
     }
   }
 }