fix: tailwind integration (#4640)

QwikDev · Jun 29, 2023 · 71edece · 71edece
1 parent 8ecf751
commit 71edece
Show file tree

Hide file tree

Showing 20 changed files with 284 additions and 383 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -2,7 +2,6 @@
 **/*.log
 **/.DS_Store
 *.
-.vscode/settings.json
 .history
 .yarn
 .yarnrc.yml
@@ -20,7 +19,6 @@ output
 rollup.config.js
 build
 .cache
-.vscode
 .rollup.cache
 tsconfig.tsbuildinfo
 packages/docs/api/**/*

diff --git a/.vscode/extenstions.json b/.vscode/extenstions.json
@@ -1,4 +1,13 @@
 {
-    "recommendations": ["dbaeumer.vscode-eslint", "unifiedjs.vscode-mdx", "esbenp.prettier-vscode", "ms-playwright.playwright", "rust-lang.rust-analyzer", "ms-azuretools.vscode-docker", "manucorporat.vermoji", "vadimcn.vscode-lldb"],
-    "unwantedRecommendations": []
+  "recommendations": [
+    "dbaeumer.vscode-eslint",
+    "unifiedjs.vscode-mdx",
+    "esbenp.prettier-vscode",
+    "ms-playwright.playwright",
+    "rust-lang.rust-analyzer",
+    "ms-azuretools.vscode-docker",
+    "manucorporat.vermoji",
+    "vadimcn.vscode-lldb"
+  ],
+  "unwantedRecommendations": []
 }
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -11,29 +11,29 @@
       "skipFiles": ["<node_internals>/**"],
       "cwd": "${workspaceFolder}/packages/docs",
       "program": "${workspaceFolder}/packages/docs/node_modules/vite/bin/vite.js",
-      "args": ["--mode", "ssr", "--force"],
+      "args": ["--mode", "ssr", "--force"]
     },
     {
       "type": "node",
       "name": "vscode-jest-tests",
       "request": "launch",
       "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen", 
+      "internalConsoleOptions": "neverOpen",
       "program": "${workspaceFolder}/node_modules/jest/bin/jest.js",
       "cwd": "${workspaceFolder}",
       "args": ["--runInBand", "--watchAll=false"]
-    },    
+    },
     {
       "name": "uvu Current File",
       "type": "node",
       "request": "launch",
       "skipFiles": ["<node_internals>/**"],
       "program": "${workspaceFolder}/node_modules/tsm/bin.js",
       "args": [
-        "${workspaceFolder}/node_modules/uvu/bin.js", 
-        "${fileDirname}", 
-        "${fileBasename}", 
-        "--tsmconfig", 
+        "${workspaceFolder}/node_modules/uvu/bin.js",
+        "${fileDirname}",
+        "${fileBasename}",
+        "--tsmconfig",
         "${workspaceFolder}/tsm.cjs"
       ],
       "console": "integratedTerminal"

diff --git a/.vscode/qwik.code-snippets b/.vscode/qwik.code-snippets
@@ -1,134 +1,98 @@
 {
-	"Qwik component": {
-		"scope": "typescriptreact",
-		"prefix": "q:component w/props",
-		"description": "Qwik component w/ props",
-		"body": [
-			"export interface ${1:${TM_FILENAME_BASE/(.*)/${1:/capitalize}/}}Props {",
-			"  $2",
-			"}",
-			"",
-			"export const $1 = component$((props: $1Props) => {",
-			"  const state = useStore({",
-			"    $3",
-			"  });",
-			"  ",
-			"  return <${4:button} on${5:Click}$={(${6:e}) => {$7}}>$8</${4}>",
-			"});"
-		]
-	},
-	"Qwik component (simple)": {
-		"scope": "javascriptreact,typescriptreact",
-		"prefix": "q:component simple",
-		"description": "Simple Qwik component",
-		"body": [
-			"export const ${1:${TM_FILENAME_BASE/(.*)/${1:/capitalize}/}} = component$(() => {",
-			"  return <${2:button}>$4</$2>",
-			"});"
-		]
-	},
-	"Qwik state": {
-		"scope": "javascriptreact,typescriptreact",
-		"prefix": "q:useStore$",
-		"description": "useStore() declaration",
-		"body": [
-			"const ${1:state} = useStore({",
-			"  $2",
-			"});",
-			"$0"
-		]
-	},
-	"Qwik signal": {
-		"scope": "javascriptreact,typescriptreact",
-		"prefix": "q:useSignal",
-		"description": "useSignal() declaration",
-		"body": [
-			"const ${1:signal} = useSignal($2);",
-			"$0"
-		]
-	},
-	"$ hook": {
-		"scope": "javascriptreact,typescriptreact",
-		"prefix": "q:$",
-		"description": "$() function hook",
-		"body": [
-			"$(() => {",
-			"  $0",
-			"});",
-			""
-		]
-	},
-	"useVisibleTask": {
-		"scope": "javascriptreact,typescriptreact",
-		"prefix": "q:useVisibleTask",
-		"description": "useVisibleTask$() function hook",
-		"body": [
-			"useVisibleTask$(({ track }) => {",
-			"  $0",
-			"});",
-			""
-		]
-	},
-	"useTask": {
-		"scope": "javascriptreact,typescriptreact",
-		"prefix": "q:useTask",
-		"description": "useTask$() function hook",
-		"body": [
-			"useTask$(({ track }) => {",
-			"  track(() => $1);",
-			"  $0",
-			"});",
-			""
-		]
-	},
-	"useResource": {
-		"scope": "javascriptreact,typescriptreact",
-		"prefix": "q:useResource$",
-		"description": "useResource$() declaration",
-		"body": [
-			"const $1 = useResource$(({ track, previous, cleanup }) => {",
-			"  $0",
-			"});",
-			""
-		]
-	},
-	"useOn": {
-		"scope": "javascriptreact,typescriptreact",
-		"prefix": "q:useOn",
-		"description": "useOn declaration",
-		"body": [
-			"useOn(",
-			"'$1',",
-			"$((event) => {",
-			"  const { $3 } = event as $2;",
-			"  })",
-			");"
-		]
-	},
-	"useOnDocument": {
-		"scope": "javascriptreact,typescriptreact",
-		"prefix": "q:useOnDocument",
-		"description": "useOnDocument declaration",
-		"body": [
-			"useOnDocument(",
-			"'$1',",
-			"$((event) => {",
-			"  const { $3 } = event as $2;",
-			"  })",
-			");"
-		]
-	},
-	"useOnWindow": {
-		"scope": "javascriptreact,typescriptreact",
-		"prefix": "q:useOnWindow",
-		"description": "useOnWindow declaration",
-		"body": [
-			"useOnWindow(",
-			"'$1',",
-			"$((event) => {",
-			"  const { $3 } = event as $2;",
-			"  })",
-			");"
-		]
-	}
-}
+  "Qwik component": {
+    "scope": "typescriptreact",
+    "prefix": "q:component w/props",
+    "description": "Qwik component w/ props",
+    "body": [
+      "export interface ${1:${TM_FILENAME_BASE/(.*)/${1:/capitalize}/}}Props {",
+      "  $2",
+      "}",
+      "",
+      "export const $1 = component$((props: $1Props) => {",
+      "  const state = useStore({",
+      "    $3",
+      "  });",
+      "  ",
+      "  return <${4:button} on${5:Click}$={(${6:e}) => {$7}}>$8</${4}>",
+      "});"
+    ]
+  },
+  "Qwik component (simple)": {
+    "scope": "javascriptreact,typescriptreact",
+    "prefix": "q:component simple",
+    "description": "Simple Qwik component",
+    "body": [
+      "export const ${1:${TM_FILENAME_BASE/(.*)/${1:/capitalize}/}} = component$(() => {",
+      "  return <${2:button}>$4</$2>",
+      "});"
+    ]
+  },
+  "Qwik state": {
+    "scope": "javascriptreact,typescriptreact",
+    "prefix": "q:useStore$",
+    "description": "useStore() declaration",
+    "body": ["const ${1:state} = useStore({", "  $2", "});", "$0"]
+  },
+  "Qwik signal": {
+    "scope": "javascriptreact,typescriptreact",
+    "prefix": "q:useSignal",
+    "description": "useSignal() declaration",
+    "body": ["const ${1:signal} = useSignal($2);", "$0"]
+  },
+  "$ hook": {
+    "scope": "javascriptreact,typescriptreact",
+    "prefix": "q:$",
+    "description": "$() function hook",
+    "body": ["$(() => {", "  $0", "});", ""]
+  },
+  "useVisibleTask": {
+    "scope": "javascriptreact,typescriptreact",
+    "prefix": "q:useVisibleTask",
+    "description": "useVisibleTask$() function hook",
+    "body": ["useVisibleTask$(({ track }) => {", "  $0", "});", ""]
+  },
+  "useTask": {
+    "scope": "javascriptreact,typescriptreact",
+    "prefix": "q:useTask",
+    "description": "useTask$() function hook",
+    "body": ["useTask$(({ track }) => {", "  track(() => $1);", "  $0", "});", ""]
+  },
+  "useResource": {
+    "scope": "javascriptreact,typescriptreact",
+    "prefix": "q:useResource$",
+    "description": "useResource$() declaration",
+    "body": ["const $1 = useResource$(({ track, previous, cleanup }) => {", "  $0", "});", ""]
+  },
+  "useOn": {
+    "scope": "javascriptreact,typescriptreact",
+    "prefix": "q:useOn",
+    "description": "useOn declaration",
+    "body": ["useOn(", "'$1',", "$((event) => {", "  const { $3 } = event as $2;", "  })", ");"]
+  },
+  "useOnDocument": {
+    "scope": "javascriptreact,typescriptreact",
+    "prefix": "q:useOnDocument",
+    "description": "useOnDocument declaration",
+    "body": [
+      "useOnDocument(",
+      "'$1',",
+      "$((event) => {",
+      "  const { $3 } = event as $2;",
+      "  })",
+      ");"
+    ]
+  },
+  "useOnWindow": {
+    "scope": "javascriptreact,typescriptreact",
+    "prefix": "q:useOnWindow",
+    "description": "useOnWindow declaration",
+    "body": [
+      "useOnWindow(",
+      "'$1',",
+      "$((event) => {",
+      "  const { $3 } = event as $2;",
+      "  })",
+      ");"
+    ]
+  }
+}
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "qwik-monorepo",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "scripts": {
     "build": "tsm scripts/index.ts --tsc --build --qwikcity --qwiklabs --api --platform-binding-wasm-copy",
     "build.vite": "tsm scripts/index.ts --tsc --build --qwikcity --qwiklabs --platform-binding-wasm-copy",

diff --git a/packages/create-qwik/package.json b/packages/create-qwik/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-qwik",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Interactive CLI for create Qwik projects and adding features.",
   "bin": "./create-qwik.cjs",
   "main": "./index.cjs",

diff --git a/packages/eslint-plugin-qwik/package.json b/packages/eslint-plugin-qwik/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-qwik",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "An Open-Source sub-framework designed with a focus on server-side-rendering, lazy-loading, and styling/animation.",
   "main": "index.js",
   "author": "Builder Team",

diff --git a/packages/insights/.vscode/launch.json b/packages/insights/.vscode/launch.json
@@ -11,7 +11,7 @@
       "skipFiles": ["<node_internals>/**"],
       "cwd": "${workspaceFolder}",
       "program": "${workspaceFolder}/node_modules/vite/bin/vite.js",
-      "args": ["--mode", "ssr", "--force"],
-    },
+      "args": ["--mode", "ssr", "--force"]
+    }
   ]
 }
diff --git a/packages/insights/.vscode/qwik-city.code-snippets b/packages/insights/.vscode/qwik-city.code-snippets
@@ -3,31 +3,19 @@
     "scope": "javascriptreact,typescriptreact",
     "prefix": "qonRequest",
     "description": "onRequest function for a route index",
-    "body": [
-      "export const onRequest: RequestHandler = (request) => {",
-      "  $0",
-      "};"
-    ]
+    "body": ["export const onRequest: RequestHandler = (request) => {", "  $0", "};"]
   },
   "loader$": {
     "scope": "javascriptreact,typescriptreact",
     "prefix": "qloader$",
     "description": "loader$()",
-    "body": [
-			"export const $1 = routeLoader$(() => {",
-			"  $0",
-			"});"
-    ]
+    "body": ["export const $1 = routeLoader$(() => {", "  $0", "});"]
   },
   "action$": {
     "scope": "javascriptreact,typescriptreact",
     "prefix": "qaction$",
     "description": "action$()",
-    "body": [
-			"export const $1 = routeAction$((data) => {",
-			"  $0",
-			"});"
-    ]
+    "body": ["export const $1 = routeAction$((data) => {", "  $0", "});"]
   },
   "Full Page": {
     "scope": "javascriptreact,typescriptreact",
@@ -36,9 +24,9 @@
     "body": [
       "import { component$ } from '@builder.io/qwik';",
       "",
-			"export default component$(() => {",
-			"  $0",
-			"});"
+      "export default component$(() => {",
+      "  $0",
+      "});"
     ]
   }
 }