Merge pull request #146 from qwikifiers/pr-fix-build

Author: shairez

.node-version

@@ -0,0 +1 @@
+16

package-lock.json

@@ -13,21 +13,21 @@
     "prepare": "husky install"
   },
   "devDependencies": {
-    "@builder.io/qwik": "0.16.2",
-    "@builder.io/qwik-city": "0.1.0-beta9",
+    "@builder.io/qwik": "0.17.4",
+    "@builder.io/qwik-city": "0.1.0-beta13",
     "@commitlint/cli": "^17.4.2",
     "@commitlint/config-angular": "^17.4.2",
     "@commitlint/config-conventional": "^17.4.2",
     "@cypress/code-coverage": "3.10.0",
     "@jscutlery/semver": "^2.29.3",
-    "@nrwl/cli": "15.5.2",
-    "@nrwl/cypress": "15.5.2",
-    "@nrwl/eslint-plugin-nx": "15.5.2",
-    "@nrwl/linter": "15.5.2",
-    "@nrwl/nx-cloud": "15.0.2",
-    "@nrwl/storybook": "15.5.2",
-    "@nrwl/vite": "15.5.2",
-    "@nrwl/workspace": "15.5.2",
+    "@nrwl/cli": "15.6.1",
+    "@nrwl/cypress": "15.6.1",
+    "@nrwl/eslint-plugin-nx": "15.6.1",
+    "@nrwl/linter": "15.6.1",
+    "@nrwl/nx-cloud": "15.0.3",
+    "@nrwl/storybook": "15.6.1",
+    "@nrwl/vite": "15.6.1",
+    "@nrwl/workspace": "15.6.1",
     "@storybook/addon-essentials": "7.0.0-beta.30",
     "@storybook/addon-interactions": "7.0.0-beta.30",
     "@storybook/addon-links": "7.0.0-beta.30",
@@ -36,10 +36,10 @@
     "@storybook/html": "7.0.0-beta.30",
     "@storybook/html-vite": "7.0.0-beta.30",
     "@storybook/testing-library": "0.0.13",
-    "@types/eslint": "8.4.10",
+    "@types/eslint": "8.21.0",
     "@types/node": "18.11.18",
-    "@typescript-eslint/eslint-plugin": "5.48.0",
-    "@typescript-eslint/parser": "5.48.0",
+    "@typescript-eslint/eslint-plugin": "5.50.0",
+    "@typescript-eslint/parser": "5.50.0",
     "@vitest/coverage-c8": "~0.25.8",
     "@vitest/ui": "^0.25.8",
     "all-contributors-cli": "^6.24.0",
@@ -48,28 +48,28 @@
     "commitlint": "^17.2.0",
     "cypress": "^10.7.0",
     "cz-conventional-changelog": "^3.3.0",
-    "eslint": "8.23.1",
+    "eslint": "8.33.0",
     "eslint-config-prettier": "8.1.0",
     "eslint-plugin-cypress": "^2.10.3",
-    "eslint-plugin-qwik": "0.16.2",
+    "eslint-plugin-qwik": "0.17.4",
     "html-webpack-plugin": "^5.5.0",
     "husky": "^8.0.1",
     "jsdom": "~20.0.3",
     "ngx-deploy-npm": "^4.3.2",
     "node-fetch": "3.3.0",
     "np": "7.6.1",
-    "nx": "15.5.2",
+    "nx": "15.6.1",
     "postcss": "^8.4.16",
-    "prettier": "2.8.2",
+    "prettier": "2.8.3",
     "pretty-quick": "^3.1.3",
-    "qwik-nx": "0.4.2",
+    "qwik-nx": "0.7.0",
     "storybook": "7.0.0-beta.30",
     "storybook-framework-qwik": "0.0.8",
     "tailwindcss": "^3.1.8",
     "ts-node": "10.9.1",
     "typescript": "4.9.4",
-    "undici": "5.14.0",
-    "vite": "4.0.1",
+    "undici": "5.16.0",
+    "vite": "4.0.4",
     "vite-plugin-dts": "~1.7.1",
     "vite-plugin-eslint": "^1.8.1",
     "vite-tsconfig-paths": "4.0.3",

package.json

@@ -10,6 +10,7 @@
       "defaultConfiguration": "production",
       "options": {
         "outputPath": "dist/packages/daisy",
+        "configFile": "packages/daisy/vite.config.ts",
         "mode": "lib"
       },
       "configurations": {
@@ -30,6 +31,32 @@
       "options": {
         "lintFilePatterns": ["packages/daisy/**/*.{ts,tsx,js,jsx}"]
       }
+    },
+    "version": {
+      "executor": "@jscutlery/semver:version",
+      "options": {}
+    },
+    "version-publish": {
+      "executor": "@jscutlery/semver:version",
+      "options": {
+        "noVerify": true,
+        "push": true,
+        "postTargets": ["daisy:publish", "daisy:push-to-github"]
+      }
+    },
+    "publish": {
+      "executor": "ngx-deploy-npm:deploy",
+      "options": {
+        "access": "public",
+        "distFolderPath": "packages/daisy"
+      }
+    },
+    "push-to-github": {
+      "executor": "@jscutlery/semver:github",
+      "options": {
+        "tag": "${tag}",
+        "notes": "${notes}"
+      }
     }
   },
   "tags": []

packages/daisy/project.json

@@ -8,7 +8,9 @@ import { join } from 'path';
 
 export default defineConfig({
   plugins: [
-    qwikVite(),
+    qwikVite({
+      vendorRoots: [join(__dirname, '../headless/src')],
+    }),
     tsconfigPaths(),
     dts({
       tsConfigFilePath: join(__dirname, 'tsconfig.lib.json'),
@@ -23,8 +25,8 @@ export default defineConfig({
     lib: {
       // Could also be a dictionary or array of multiple entry points.
       entry: 'src/index.ts',
-      name: 'limpy',
-      fileName: 'index',
+      name: 'daisy',
+      fileName: (format) => `index.qwik.${format === 'es' ? 'mjs' : 'cjs'}`,
       // Change this to the formats you want to support.
       // Don't forgot to update your package.json as well.
       formats: ['es', 'cjs'],

packages/daisy/vite.config.ts

@@ -8,7 +8,9 @@ import { join } from 'path';
 
 export default defineConfig({
   plugins: [
-    qwikVite(),
+    qwikVite({
+      vendorRoots: [join(__dirname, '../headless/src')],
+    }),
     tsconfigPaths(),
     dts({
       tsConfigFilePath: join(__dirname, 'tsconfig.lib.json'),

packages/material/vite.config.ts

@@ -15,7 +15,7 @@ export default component$(() => {
   const appState = useContext(APP_STATE);
   const menuOpenSignal = useSignal(false);
 
-  const toggleMenu = $(() => {
+  const toggleMenu$ = $(() => {
     menuOpenSignal.value = !menuOpenSignal.value;
   });
 
@@ -32,7 +32,7 @@ export default component$(() => {
         <button
           type="button"
           aria-label="Toggle navigation"
-          onClick$={toggleMenu}
+          onClick$={toggleMenu$}
           class="block lg:hidden"
         >
           {menuOpenSignal.value ? <CloseIcon /> : <MenuIcon />}
@@ -41,7 +41,7 @@ export default component$(() => {
           <aside class="fixed top-0 left-0">
             <div class="fixed h-screen w-screen bg-gray-900/20 backdrop-blur-sm"></div>
             <div class="fixed h-screen w-80 overflow-y-scroll bg-white dark:bg-slate-800">
-              <Menu onClose={toggleMenu} />
+              <Menu onClose$={toggleMenu$} />
             </div>
           </aside>
         )}

packages/website/src/components/header/header.tsx

@@ -4,10 +4,10 @@ import { APP_STATE } from '../../constants';
 import { CloseIcon } from '../icons/CloseIcon';
 
 type Props = {
-  onClose?: PropFunction<() => void>;
+  onClose$?: PropFunction<() => void>;
 };
 
-export const Menu = component$<Props>(({ onClose }) => {
+export const Menu = component$<Props>(({ onClose$ }) => {
   const appState = useContext(APP_STATE);
   const menu = [
     { label: 'Button', path: `/docs/${appState.theme.toLowerCase()}/button` },
@@ -28,17 +28,18 @@ export const Menu = component$<Props>(({ onClose }) => {
   ];
 
   const onChangePage = $(() => {
-    if (onClose) {
-      onClose();
+    if (onClose$) {
+      onClose$();
     }
   });
 
   return (
     <div class="px-4 py-4">
       <div class="flex items-center justify-between">
         <h4 class="text-2xl">Documentation</h4>
-        {onClose && (
-          <h5 onClick$={onClose}>
+        {onClose$ && (
+          // eslint-disable-next-line qwik/valid-lexical-scope
+          <h5 onClick$={onClose$}>
             <CloseIcon />
           </h5>
         )}

packages/website/src/components/menu/menu.tsx

@@ -2,9 +2,25 @@ import { defineConfig } from 'vite';
 import { qwikVite } from '@builder.io/qwik/optimizer';
 import { qwikCity } from '@builder.io/qwik-city/vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
+import { join } from 'path';
 
 export default defineConfig(() => {
   return {
-    plugins: [qwikCity(), qwikVite(), tsconfigPaths()],
+    plugins: [
+      qwikCity(),
+      qwikVite({
+        vendorRoots: [
+          join(__dirname, '../headless/src'),
+          join(__dirname, '../material/src'),
+          join(__dirname, '../daisy/src'),
+        ],
+      }),
+      tsconfigPaths(),
+    ],
+    preview: {
+      headers: {
+        'Cache-Control': 'public, max-age=600',
+      },
+    },
   };
 });