Merge pull request #525 from dmitry-stepanenko/ds/upgrade-qwik

Author: shairez

packages/bots/dangerfile.ts renamed to .dangerfile.ts

@@ -66,7 +66,6 @@ runs:
     - name: Lint PR
       if: github.event_name == 'pull_request'
       shell: bash
-      run: pnpm danger ci --use-github-checks --failOnErrors
-      working-directory: packages/bots
+      run: pnpm danger ci --use-github-checks --failOnErrors -d .dangerfile.ts
       env:
         DANGER_GITHUB_API_TOKEN: ${{ inputs.github_token }}

.github/actions/test/action.yml

@@ -27,8 +27,9 @@
   },
   "packageManager": "[email protected]",
   "devDependencies": {
-    "@builder.io/qwik": "^1.2.12",
-    "@builder.io/qwik-city": "^1.2.12",
+    "@builder.io/qwik": "^1.2.19",
+    "@builder.io/qwik-city": "^1.2.19",
+    "@builder.io/vite-plugin-macro": "~0.0.7",
     "@commitlint/cli": "^17.7.1",
     "@commitlint/config-angular": "^17.7.0",
     "@commitlint/config-conventional": "^17.7.0",
@@ -76,7 +77,7 @@
     "clipboard-copy": "4.0.1",
     "commitizen": "^4.3.0",
     "commitlint": "^17.7.1",
-    "country-list-json": "1.1.0",
+    "country-list-json": "^1.1.0",
     "cypress": "^13.0.0",
     "cypress-axe": "1.4.0",
     "cypress-ct-qwik": "0.3.0",
@@ -87,7 +88,7 @@
     "eslint": "^8.48.0",
     "eslint-config-prettier": "^8",
     "eslint-plugin-cypress": "^2.14.0",
-    "eslint-plugin-qwik": "^1.2.12",
+    "eslint-plugin-qwik": "^1.2.19",
     "eslint-plugin-storybook": "^0.6.13",
     "focus-trap": "7.5.3",
     "husky": "^8.0.3",
@@ -110,7 +111,7 @@
     "shiki": "0.14.5",
     "storybook": "^7.4.0",
     "storybook-framework-qwik": "^0.2.3",
-    "tailwind-merge": "1.14.0",
+    "tailwind-merge": "^1.14.0",
     "tailwindcss": "^3.3.3",
     "ts-node": "10.9.1",
     "typescript": "^5.2.2",
@@ -143,5 +144,10 @@
   ],
   "nx": {
     "includedScripts": []
+  },
+  "pnpm": {
+    "patchedDependencies": {
+      "@builder.io/[email protected]": "patches/@[email protected]"
+    }
   }
 }

package.json

@@ -35,7 +35,7 @@
     "qwik": "qwik"
   },
   "peerDependencies": {
-    "@builder.io/qwik": ">1.1.0"
+    "@builder.io/qwik": "^1.1.0"
   },
   "devDependencies": {
     "@builder.io/vite-plugin-macro": "~0.0.7"

packages/kit-fluffy/package.json

@@ -22,10 +22,10 @@
   "private": false,
   "scripts": {},
   "peerDependencies": {
-    "@builder.io/qwik": ">1.2.11"
+    "@builder.io/qwik": "^1.2.11"
   },
   "dependencies": {
-    "@floating-ui/dom": "1.0.10",
+    "@floating-ui/dom": "^1.0.10",
     "country-list-json": "^1.1.0",
     "libphonenumber-js": "^1.10.43"
   }

packages/kit-headless/package.json

@@ -33,9 +33,9 @@
     "qwik": "qwik"
   },
   "dependencies": {
-    "daisyui": "^2.50.1"
+    "daisyui": "^3.6.4"
   },
   "peerDependencies": {
-    "@builder.io/qwik": ">1.2.11"
+    "@builder.io/qwik": "^1.2.11"
   }
 }

packages/kit-tailwind/package.json

@@ -0,0 +1,26 @@
+diff --git a/optimizer.cjs b/optimizer.cjs
+index add5bb6089e10e3c41de62ce9cc012aec5ded67f..32dfc0dbdcb21a85539602b447117ffa50475ce2 100644
+--- a/optimizer.cjs
++++ b/optimizer.cjs
+@@ -2978,7 +2978,7 @@ globalThis.qwikOptimizer = function(module) {
+   var VALID_ID_PREFIX = "/@id/";
+   var VITE_PUBLIC_PATH = "/@vite/";
+   var internalPrefixes = [ FS_PREFIX, VALID_ID_PREFIX, VITE_PUBLIC_PATH ];
+-  var InternalPrefixRE = new RegExp(`^(?:${internalPrefixes.join("|")})`);
++  var InternalPrefixRE = new RegExp(`(?:${internalPrefixes.join("|")})`);
+   var shouldSsrRender = (req, url) => {
+     const pathname = url.pathname;
+     if (/\.[\w?=&]+$/.test(pathname) && !pathname.endsWith(".html")) {
+diff --git a/optimizer.mjs b/optimizer.mjs
+index 49de5cc48e365a2935e98aedbb17a8eb26fb570c..8ffbbd31913860ec0762cc6d87cb3f91083e6865 100644
+--- a/optimizer.mjs
++++ b/optimizer.mjs
+@@ -3086,7 +3086,7 @@ var VITE_PUBLIC_PATH = "/@vite/";
+ 
+ var internalPrefixes = [ FS_PREFIX, VALID_ID_PREFIX, VITE_PUBLIC_PATH ];
+ 
+-var InternalPrefixRE = new RegExp(`^(?:${internalPrefixes.join("|")})`);
++var InternalPrefixRE = new RegExp(`(?:${internalPrefixes.join("|")})`);
+ 
+ var shouldSsrRender = (req, url) => {
+   const pathname = url.pathname;