Merge branch 'master' into chore/clear-warns

.github/pull_request_template.md

@@ -14,6 +14,6 @@ Describe the fix you have made as succinctly as possible.
 I hereby swear that:
 
 - [ ] I opened a hydrogen project and it loaded
-- [ ] I could navigate to various routes in Preview mode
+- [ ] I could navigate to various routes in Play mode
 
 Fixes #[ticket_number] (<< pls delete this line if it's not relevant)

.github/workflows/pull-requests.yml

@@ -255,7 +255,7 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           edit-mode: replace
           body: |
-            ## [Try me](https://${{ secrets.STAGING_SERVER }}/p/?accessLevel=public&branch_name=${{ steps.extract_branch.outputs.branch }})
+            ## [Try me](https://${{ secrets.STAGING_SERVER }}/p/?accessLevel=public&clone=concrete-utopia/hydrogen-editions-24&branch_name=${{ steps.extract_branch.outputs.branch }})
 
   performance-test:
     name: Run Performance Tests

editor/jest.config.js

@@ -112,6 +112,8 @@ module.exports = {
         'react-dnd-html5-backend': '<rootDir>/test/jest/__mocks__/react-dnd-html5-backend.js',
         '^react$': '<rootDir>/node_modules/react/index.js',
         '^react-dom$': '<rootDir>/node_modules/react-dom/index.js',
+        '^@mhsdesign/jit-browser-tailwindcss$':
+          '<rootDir>/src/utils/__mocks__/jit-browser-tailwindcss.js',
         '\\.(jpg|ico|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
           '<rootDir>/test/jest/__mocks__/styleMock.js',
       },

editor/package.json

@@ -152,6 +152,7 @@
     "@liveblocks/react": "1.10.0",
     "@liveblocks/react-comments": "1.10.0",
     "@liveblocks/yjs": "1.10.0",
+    "@mhsdesign/jit-browser-tailwindcss": "0.4.1",
     "@popperjs/core": "2.4.4",
     "@radix-ui/react-dropdown-menu": "2.1.1",
     "@radix-ui/react-select": "2.1.1",
@@ -164,15 +165,13 @@
     "@svgr/plugin-jsx": "5.5.0",
     "@testing-library/user-event": "14.5.2",
     "@tippyjs/react": "4.1.0",
-    "@twind/core": "1.1.3",
-    "@twind/preset-autoprefix": "1.0.7",
-    "@twind/preset-tailwind": "1.1.4",
     "@types/fontfaceobserver": "0.0.6",
     "@types/lodash.findlastindex": "4.6.7",
     "@types/react-syntax-highlighter": "11.0.4",
     "@types/w3c-css-typed-object-model-level-1": "20180410.0.5",
     "@use-it/interval": "0.1.3",
     "@vercel/stega": "0.1.0",
+    "@xengine/tailwindcss-class-parser": "1.1.19",
     "ajv": "6.4.0",
     "anser": "2.1.0",
     "antd": "4.3.5",
@@ -185,12 +184,13 @@
     "classnames": "2.2.6",
     "clipboard-polyfill": "2.4.6",
     "create-react-class": "15.6.3",
-    "css-tree": "2.3.1",
+    "css-tree": "3.0.1",
     "eslint-config-utopia": "link:../eslint-config-utopia",
     "eslint-plugin-import": "2.25.3",
     "eslint-plugin-jsx-a11y": "6.5.1",
     "eslint-plugin-react": "7.23.2",
     "eslint-plugin-react-hooks": "4.2.0",
+    "eslint-plugin-react-refresh": "0.4.12",
     "eslint4b": "6.6.0",
     "fast-deep-equal": "2.0.1",
     "fontfaceobserver": "2.1.0",
@@ -309,7 +309,7 @@
     "@types/classnames": "2.2.4",
     "@types/codemirror": "0.0.40",
     "@types/create-react-class": "15.6.2",
-    "@types/css-tree": "2.3.4",
+    "@types/css-tree": "2.3.9",
     "@types/diff": "4.0.2",
     "@types/enzyme": "3.1.9",
     "@types/eslint": "7.2.2",
@@ -371,7 +371,7 @@
     "clean-webpack-plugin": "4.0.0",
     "concurrently": "3.5.1",
     "css-loader": "0.28.4",
-    "csstype": "3.0.3",
+    "csstype": "3.1.3",
     "dependency-cruiser": "13.1.5",
     "diff": "5.0.0",
     "enzyme": "3.3.0",
@@ -426,6 +426,7 @@
     "source-map-loader": "0.2.3",
     "string-replace-loader": "2.2.0",
     "style-loader": "0.18.2",
+    "tailwindcss": "^3.4.13",
     "tar": "6.0.5",
     "terser-webpack-plugin": "5.3.9",
     "three": "0.140.2",