Merge pull request #297 from shairez/pr-fix-cloudflare

Author: shairez

.eslintrc.json

@@ -1,12 +1,12 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nrwl/nx"],
+  "plugins": ["@nx"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/enforce-module-boundaries": [
           "error",
           {
             "enforceBuildableLibDependency": true,
@@ -23,12 +23,12 @@
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["plugin:@nrwl/nx/typescript"],
+      "extends": ["plugin:@nx/typescript"],
       "rules": {}
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/javascript"],
       "rules": {}
     },
     {

apps/website-e2e/cypress.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from 'cypress';
-import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
+import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
 
 export default defineConfig({
   e2e: nxE2EPreset(__dirname, {

apps/website-e2e/project.json

@@ -5,7 +5,7 @@
   "projectType": "application",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/website-e2e/cypress.config.ts",
         "devServerTarget": "website:serve",
@@ -18,7 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/website-e2e/**/*.{js,ts}"]

apps/website/adapters/cloudflare-pages/vite.config.ts

@@ -13,6 +13,12 @@ export default extendConfig(baseConfig, () => {
         ],
       },
     },
-    plugins: [cloudflarePagesAdapter({})],
+    plugins: [
+      cloudflarePagesAdapter({
+        // ssg: {
+        //   include: ['/*'],
+        // }
+      }),
+    ],
   };
 });

apps/website/functions/[[path]].ts

@@ -16,35 +16,35 @@
       }
     },
     "preview": {
-      "executor": "@nrwl/vite:preview-server",
+      "executor": "@nx/vite:preview-server",
       "options": {
         "buildTarget": "website:build"
       }
     },
     "test": {
-      "executor": "@nrwl/vite:test",
+      "executor": "@nx/vite:test",
       "outputs": ["../../coverage/apps/website"],
       "options": {
         "passWithNoTests": true,
         "reportsDirectory": "../../coverage/apps/website"
       }
     },
     "serve": {
-      "executor": "@nrwl/vite:dev-server",
+      "executor": "@nx/vite:dev-server",
       "options": {
         "buildTarget": "website:build.client",
         "mode": "ssr"
       }
     },
     "build.client": {
-      "executor": "@nrwl/vite:build",
+      "executor": "@nx/vite:build",
       "options": {
         "outputPath": "dist/apps/website",
         "configFile": "apps/website/vite.config.ts"
       }
     },
     "build.ssr": {
-      "executor": "@nrwl/vite:build",
+      "executor": "@nx/vite:build",
       "defaultConfiguration": "preview",
       "options": {
         "outputPath": "dist/apps/website"

apps/website/project.json

@@ -1,4 +1,4 @@
-import { component$, $, QRL } from '@builder.io/qwik';
+import { component$ } from '@builder.io/qwik';
 
 type APITableProps = {
   propDescriptors: {
@@ -44,22 +44,3 @@ export const APITable = component$(({ propDescriptors }: APITableProps) => {
     </table>
   );
 });
-
-export const TableRow = component$(({ keyboard, deck }: TableRowProps) => {
-  const Description: any = deck;
-
-  return (
-    <tr class="border-b-2 border-gray-700">
-      <td class="py-4">
-        <kbd class="border w-max shadow-lg rounded-md px-2 capitalize text-sm inline-block">
-          {keyboard}
-        </kbd>
-      </td>
-      <td>
-        <article class="ml-6">
-          <Description />
-        </article>
-      </td>
-    </tr>
-  );
-});

apps/website/src/components/api-table/api-table.tsx

@@ -6,9 +6,9 @@ import {
   useSignal,
 } from '@builder.io/qwik';
 import { Link, useLocation } from '@builder.io/qwik-city';
-// eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
+// eslint-disable-next-line @nx/enforce-module-boundaries
 import { version as headlessVersion } from '../../../../../packages/kit-headless/package.json';
-// eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
+// eslint-disable-next-line @nx/enforce-module-boundaries
 import { version as tailwindVersion } from '../../../../../packages/kit-tailwind/package.json';
 import { CloseIcon } from '../icons/CloseIcon';
 import { GitHubIcon } from '../icons/GitHubIcon';

apps/website/src/components/header/header.tsx

@@ -1,72 +1,10 @@
-import { component$, $ } from '@builder.io/qwik';
+import { component$ } from '@builder.io/qwik';
 
 type KBInteractionTableRowProps = {
   keyTitle: string;
   description: string;
 };
 
-const SAMPLE_DATA = {
-  title: { key: 'Key', deck: 'Description' },
-  keys: [
-    {
-      id: crypto.randomUUID(),
-      title: 'Space',
-      description: $(() => <>Close a dialog or cancel an action.</>),
-    },
-    {
-      id: crypto.randomUUID(),
-      title: 'Enter',
-      description: $(() => (
-        <>
-          Moves focus to the next{' '}
-          <b class="text-[var(--qwik-light-purple)]">AccordionItem</b> when
-          orientation is vertical.
-        </>
-      )),
-    },
-    {
-      id: crypto.randomUUID(),
-      title: 'Tab',
-      description: $(() => <>Moves focus to the next focusable element.</>),
-    },
-    {
-      id: crypto.randomUUID(),
-      title: 'Shift + Tab',
-      description: $(() => (
-        <>
-          Moves focus to the next{' '}
-          <b class="text-[var(--qwik-light-purple)]">AccordionItem</b> when
-          orientation is vertical.
-        </>
-      )),
-    },
-    {
-      id: crypto.randomUUID(),
-      title: 'Home',
-      description: $(() => (
-        <>
-          When focus is on an{' '}
-          <b class="text-[var(--qwik-light-purple)]">AccordionItem</b>, moves
-          focus to the first{' '}
-          <b class="text-[var(--qwik-light-purple)]">AccordionItem</b>.
-        </>
-      )),
-    },
-    {
-      id: crypto.randomUUID(),
-      title: 'End',
-      description: $(() => (
-        <>
-          When focus is on an{' '}
-          <b class="text-[var(--qwik-light-purple)]">AccordionItem</b>, moves
-          focus to the last{' '}
-          <b class="text-[var(--qwik-light-purple)]">AccordionItem</b>.
-        </>
-      )),
-    },
-  ],
-};
-
 export interface KeyboardInteractionTableProps {
   keyDescriptors: KBInteractionTableRowProps[];
 }

apps/website/src/components/keyboard-interaction-table/keyboard-interaction-table.tsx

@@ -13,7 +13,7 @@ export const RouterHead = component$(() => {
     <>
       <title>{head.title}</title>
 
-      <link rel="canonical" href={loc.href} />
+      <link rel="canonical" href={loc.url.href} />
       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <link rel="icon" type="image/svg+xml" href="/favicon.svg" />