Skip to content

Commit c1d742e

Browse files
committed
Merge branches 'pr-tabs-pagination' and 'pr-tabs-pagination' of github.com:shairez/qwik-ui into pr-tabs-pagination
2 parents 7c46d5b + 4e7caf1 commit c1d742e

File tree

89 files changed

+8626
-3538
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+8626
-3538
lines changed

.eslintrc.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"root": true,
33
"ignorePatterns": ["**/*"],
4-
"plugins": ["@nrwl/nx"],
4+
"plugins": ["@nx"],
55
"overrides": [
66
{
77
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
88
"rules": {
9-
"@nrwl/nx/enforce-module-boundaries": [
9+
"@nx/enforce-module-boundaries": [
1010
"error",
1111
{
1212
"enforceBuildableLibDependency": true,
@@ -23,12 +23,12 @@
2323
},
2424
{
2525
"files": ["*.ts", "*.tsx"],
26-
"extends": ["plugin:@nrwl/nx/typescript"],
26+
"extends": ["plugin:@nx/typescript"],
2727
"rules": {}
2828
},
2929
{
3030
"files": ["*.js", "*.jsx"],
31-
"extends": ["plugin:@nrwl/nx/javascript"],
31+
"extends": ["plugin:@nx/javascript"],
3232
"rules": {}
3333
},
3434
{

.github/actions/test/action.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ inputs:
66
github_token:
77
description: GitHub token
88
required: true
9+
chromatic_token:
10+
description: Chromatic token
11+
required: true
912

1013
runs:
1114
using: composite
@@ -19,10 +22,23 @@ runs:
1922
shell: bash
2023
run: npx nx affected:lint --base=last-release --exclude=website
2124

22-
- name: Build Headless
25+
- name: Build Headless Kit
2326
shell: bash
2427
run: npx nx build headless
2528

29+
- name: Build storybook
30+
shell: bash
31+
run: npx nx build-storybook headless
32+
33+
- name: Publish to Chromatic
34+
uses: chromaui/action@v1
35+
# Chromatic GitHub Action options
36+
with:
37+
# 👇 Chromatic projectToken, refer to the manage page to obtain it.
38+
projectToken: ${{ inputs.chromatic_token }}
39+
storybookBuildDir: dist/storybook/headless
40+
zip: true
41+
2642
# - name: Build Tailwind Theme
2743
# shell: bash
2844
# run: npx nx build tailwind

.github/workflows/test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ jobs:
2828
uses: ./.github/actions/test
2929
with:
3030
github_token: ${{ secrets.GITHUB_TOKEN }}
31+
chromatic_token: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}

.github/workflows/website.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Website Deploy
2+
3+
on:
4+
- workflow_dispatch
5+
6+
jobs:
7+
deploy:
8+
runs-on: ubuntu-latest
9+
10+
if: github.ref == 'refs/heads/main'
11+
12+
steps:
13+
- uses: actions/checkout@v3
14+
- name: Setup
15+
uses: ./.github/actions/setup
16+
- name: Deploy
17+
env:
18+
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
19+
shell: bash
20+
run: CLOUDFLARE_API_TOKEN=${{ secrets.CLOUDFLARE_API_TOKEN }} npx nx deploy website

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,7 @@ testem.log
6363

6464
# System Files
6565
.DS_Store
66-
Thumbs.db
66+
Thumbs.db
67+
68+
# Storybook
69+
**/storybook-static/*

apps/website-e2e/cypress.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineConfig } from 'cypress';
2-
import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
2+
import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
33

44
export default defineConfig({
55
e2e: nxE2EPreset(__dirname, {

apps/website-e2e/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"projectType": "application",
66
"targets": {
77
"e2e": {
8-
"executor": "@nrwl/cypress:cypress",
8+
"executor": "@nx/cypress:cypress",
99
"options": {
1010
"cypressConfig": "apps/website-e2e/cypress.config.ts",
1111
"devServerTarget": "website:serve",
@@ -18,7 +18,7 @@
1818
}
1919
},
2020
"lint": {
21-
"executor": "@nrwl/linter:eslint",
21+
"executor": "@nx/linter:eslint",
2222
"outputs": ["{options.outputFile}"],
2323
"options": {
2424
"lintFilePatterns": ["apps/website-e2e/**/*.{js,ts}"]

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ export default extendConfig(baseConfig, () => {
1313
],
1414
},
1515
},
16-
plugins: [cloudflarePagesAdapter({})],
16+
plugins: [
17+
cloudflarePagesAdapter({
18+
// ssg: {
19+
// include: ['/*'],
20+
// }
21+
}),
22+
],
1723
};
1824
});

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

Lines changed: 0 additions & 6 deletions
This file was deleted.

apps/website/project.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,35 +16,35 @@
1616
}
1717
},
1818
"preview": {
19-
"executor": "@nrwl/vite:preview-server",
19+
"executor": "@nx/vite:preview-server",
2020
"options": {
2121
"buildTarget": "website:build"
2222
}
2323
},
2424
"test": {
25-
"executor": "@nrwl/vite:test",
25+
"executor": "@nx/vite:test",
2626
"outputs": ["../../coverage/apps/website"],
2727
"options": {
2828
"passWithNoTests": true,
2929
"reportsDirectory": "../../coverage/apps/website"
3030
}
3131
},
3232
"serve": {
33-
"executor": "@nrwl/vite:dev-server",
33+
"executor": "@nx/vite:dev-server",
3434
"options": {
3535
"buildTarget": "website:build.client",
3636
"mode": "ssr"
3737
}
3838
},
3939
"build.client": {
40-
"executor": "@nrwl/vite:build",
40+
"executor": "@nx/vite:build",
4141
"options": {
4242
"outputPath": "dist/apps/website",
4343
"configFile": "apps/website/vite.config.ts"
4444
}
4545
},
4646
"build.ssr": {
47-
"executor": "@nrwl/vite:build",
47+
"executor": "@nx/vite:build",
4848
"defaultConfiguration": "preview",
4949
"options": {
5050
"outputPath": "dist/apps/website"

0 commit comments

Comments
 (0)