Merge pull request #1072 from maiieul/update-1.14.0

Update-1.14.0

Author: maiieul

apps/website/recma-provide-components.ts

@@ -86,6 +86,13 @@ export const recmaProvideComponents: Plugin<any, Program> = () => {
 
     tree.body.unshift({
       type: 'ImportDeclaration',
+      attributes: [
+        {
+          type: 'ImportAttribute',
+          key: { type: 'Identifier', name: 'type' },
+          value: { type: 'Literal', value: 'module' },
+        },
+      ],
       specifiers: [
         {
           type: 'ImportSpecifier',

apps/website/src/components/navigation-docs/navigation-docs.tsx

@@ -1,5 +1,5 @@
 import { PropsOf, component$ } from '@builder.io/qwik';
-import { useLocation } from '@builder.io/qwik-city';
+import { Link, useLocation } from '@builder.io/qwik-city';
 import { ComponentStatus } from '~/_state/component-status.type';
 import { StatusBadge } from '../component-status-badge/component-status-badge';
 import { cn } from '@qwik-ui/utils';
@@ -60,7 +60,7 @@ export const DocsNavigation = component$(
                   const isLinkActive = location.url.pathname === link.href;
                   return (
                     <li key={link.name + link.href}>
-                      <a
+                      <Link
                         class={cn(
                           buttonVariants({ look: 'ghost' }),
                           'flex h-10 items-center rounded-base font-sans',
@@ -78,7 +78,7 @@ export const DocsNavigation = component$(
                           <div>{link.name}</div>
                           {link.status && <StatusBadge status={link.status} />}
                         </div>
-                      </a>
+                      </Link>
                     </li>
                   );
                 })}

apps/website/vite.config.ts

@@ -77,6 +77,7 @@ export default defineConfig(async () => {
       }),
       qwikVite({
         lint: false,
+        debug: true,
         tsconfigFileNames: ['tsconfig.app.json'],
         client: {
           outDir: '../../dist/apps/website/client',
@@ -97,7 +98,19 @@ export default defineConfig(async () => {
     build: {
       target: 'es2022',
       rollupOptions: {
-        // output,
+        output: {
+          manualChunks: (id: string) => {
+            if (id.includes('node-modules') && id.includes('css-tree')) {
+              return 'css-tree';
+            }
+            if (
+              id.includes('node-modules') &&
+              (id.includes('tailwind-merge') || id.includes('clsx'))
+            ) {
+              return 'cn';
+            }
+          },
+        },
       },
     },
     preview: {

package.json

@@ -49,8 +49,8 @@
   "packageManager": "[email protected]",
   "devDependencies": {
     "@axe-core/playwright": "^4.9.1",
-    "@builder.io/qwik": "^1.9",
-    "@builder.io/qwik-city": "^1.9",
+    "@builder.io/qwik": "1.14.0",
+    "@builder.io/qwik-city": "1.14.0",
     "@changesets/cli": "^2.27.3",
     "@changesets/get-github-info": "^0.6.0",
     "@changesets/types": "^6.0.0",
@@ -97,7 +97,7 @@
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-playwright": "^1.6.2",
-    "eslint-plugin-qwik": "^1.9",
+    "eslint-plugin-qwik": "1.14.0",
     "focus-trap": "7.5.4",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",

packages/cli/jest.config.ts

@@ -1,5 +1,6 @@
-/* eslint-disable */
-export default {
+import type { Config } from 'jest';
+
+const config: Config = {
   displayName: 'qwikui-cli',
   preset: '../../jest.preset.cjs',
   globals: {},
@@ -15,4 +16,8 @@ export default {
   testEnvironment: 'node',
   moduleFileExtensions: ['ts', 'js', 'html'],
   coverageDirectory: '../../coverage/packages/cli',
+  // @ts-expect-error declaration file
+  prettierPath: import('prettier-2').path,
 };
+
+export default config;

packages/cli/package.json

@@ -19,7 +19,8 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@qwik-ui/styled": "0.3.1"
+    "@qwik-ui/styled": "0.3.1",
+    "prettier-2": "npm:prettier@^2"
   },
   "type": "commonjs",
   "main": "./src/index.js",

packages/cli/src/generators/init/init-generator.spec.ts

@@ -24,9 +24,9 @@ describe('init generator', () => {
     const expectedContents = tree.read(QWIK_UI_CONFIG_FILENAME, 'utf-8');
 
     expect(expectedContents).toMatchInlineSnapshot(`
-      "{ "componentsRoot": "src/components/ui" }
-      "
-    `);
+"{ "componentsRoot": "src/components/ui" }
+"
+`);
   });
 
   test(`
@@ -43,8 +43,8 @@ describe('init generator', () => {
     const expectedContents = tree.read(QWIK_UI_CONFIG_FILENAME, 'utf-8');
 
     expect(expectedContents).toMatchInlineSnapshot(`
-      "{ "componentsRoot": "/my-project/src/components/ui" }
-      "
-    `);
+"{ "componentsRoot": "/my-project/src/components/ui" }
+"
+`);
   });
 });