Merge branch 'main' into pr-tabs-pagination

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": {}
     },
     {

.github/actions/test/action.yml

@@ -19,7 +19,7 @@ runs:
       shell: bash
       run: npx nx affected:lint --base=last-release --exclude=website
 
-    - name: Build Headless
+    - name: Build Headless Kit
       shell: bash
       run: npx nx build headless
 

.github/workflows/website.yml

@@ -0,0 +1,20 @@
+name: Website Deploy
+
+on:
+  - workflow_dispatch
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    if: github.ref == 'refs/heads/main'
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup
+        uses: ./.github/actions/setup
+      - name: Deploy
+        env:
+          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+        shell: bash
+        run: CLOUDFLARE_API_TOKEN=${{ secrets.CLOUDFLARE_API_TOKEN }} npx nx deploy website

.gitignore

@@ -63,4 +63,7 @@ testem.log
 
 # System Files
 .DS_Store
-Thumbs.db
+Thumbs.db
+
+# Storybook
+**/storybook-static/*

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>
-  );
-});