Skip to content

Commit

Permalink
style: fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
xmlking committed May 19, 2024
1 parent 02072f0 commit c01cdb1
Show file tree
Hide file tree
Showing 55 changed files with 627 additions and 596 deletions.
38 changes: 19 additions & 19 deletions .github/playwright.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
name: Playwright Tests
on:
push:
branches: [ main, master ]
branches: [main, master]
pull_request:
branches: [ main, master ]
branches: [main, master]
jobs:
test:
timeout-minutes: 60
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: lts/*
cache: 'pnpm'
- name: Install dependencies
run: npm install -g pnpm && pnpm install
- name: Install Playwright Browsers
run: pnpm exec playwright install --with-deps
- name: Run Playwright tests
run: pnpm exec playwright test
- uses: actions/upload-artifact@v4
if: always()
with:
name: playwright-report
path: playwright-report/
retention-days: 30
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: lts/*
cache: 'pnpm'
- name: Install dependencies
run: npm install -g pnpm && pnpm install
- name: Install Playwright Browsers
run: pnpm exec playwright install --with-deps
- name: Run Playwright tests
run: pnpm exec playwright test
- uses: actions/upload-artifact@v4
if: always()
with:
name: playwright-report
path: playwright-report/
retention-days: 30
11 changes: 6 additions & 5 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
- 'README.md'
- 'docs'
- 'infra'
- 'nhost'
pull_request:
branches: [main]
types: [opened, synchronize]
Expand All @@ -25,7 +26,7 @@ jobs:
fetch-depth: 0

- name: Conventional commits check
uses: cocogitto/cocogitto-action@v3.7
uses: cocogitto/cocogitto-action@v3
with:
check-latest-tag-only: true
# linter:
Expand Down Expand Up @@ -58,15 +59,15 @@ jobs:
- name: Check out code
uses: actions/checkout@v4
with:
fetch-depth: 2
fetch-depth: 2 # for turbo only run tasks for changed workspaces.
- uses: pnpm/action-setup@v3
- uses: actions/setup-node@v4
with:
node-version: lts/*
cache: 'pnpm'
- run: pnpm install
# - run: pnpm run --filter=docs build
- run: pnpm run --filter=docs test:unit:coverage
- name: Test with coverage
run: pnpm run test:unit:coverage
# steps:
# - name: Check out code
# uses: actions/checkout@v4
Expand All @@ -80,4 +81,4 @@ jobs:
# # - run: bun run check --filter=docs
# # - run: bun run lint --filter=docs
# - run: bun run build --filter=docs
# - run: bun run test:unit:coverage --filter=docs
# - run: bun run --filter=docs test:unit:coverage
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
build-and-push-image:
runs-on: ubuntu-latest
env:
COREPACK_ENABLE_STRICT: 0
COREPACK_ENABLE_STRICT: 0
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -107,6 +107,7 @@ jobs:
BUILD_VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
BUILD_REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
SCOPE=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.title'] }}
# TODO: https://github.blog/2024-05-02-introducing-artifact-attestations-now-in-public-beta/
# - name: Attest Build Provenance
# uses: actions/attest-build-provenance@897ed5eab6ed058a474202017ada7f40bfa52940 # v1.0.0
Expand Down
19 changes: 3 additions & 16 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,7 @@
"proto3",
"svelte"
],
"dictionaries": [
"html",
"css",
"typescript",
"node",
"softwareTerms",
"companies"
],
"dictionaries": ["html", "css", "typescript", "node", "softwareTerms", "companies"],
"words": [
"astro",
"astrojs",
Expand Down Expand Up @@ -88,14 +81,8 @@
// This makes the spell checker more lenient when two words are jammed together.
"allowCompoundWords": true,
"useGitignore": true,
"files": [
"**/*.md"
],
"ignoreRegExpList": [
"Email",
"\\_\\w+",
"\\#\\w+"
],
"files": ["**/*.md"],
"ignoreRegExpList": ["Email", "\\_\\w+", "\\#\\w+"],
"ignorePaths": [
".git",
"**/build/**",
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Once you've cloned the project and installed dependencies with `pnpm i`, start a
# stat all services in background and show logs
make up # for first time use `make boot` then `make up`
# this will start all services with default profile + services with `all` profile.
make up PROFILES=all
make up PROFILES=all
# verify status/health of services
make ps
# shotdown all services
Expand Down
3 changes: 3 additions & 0 deletions apps/console-fb/turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@
]
},
"preview": {},
"test:unit:coverage": {
"dependsOn": ["sync", "^test:unit:coverage"]
},
"test:integration": {
"dependsOn": ["build"]
}
Expand Down
11 changes: 10 additions & 1 deletion apps/console-sc/turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,13 @@
},
"build": {
"dependsOn": ["generate"],
"outputs": [".svelte-kit/**", ".vercel/**", "$houdini/**", "schema.graphql", "src/i18n"],
"outputs": [
".svelte-kit/**",
".vercel/**",
"$houdini/**",
"schema.graphql",
"src/i18n"
],
"env": [
"VERCEL",
"VERCEL_URL",
Expand All @@ -37,6 +43,9 @@
]
},
"preview": {},
"test:unit:coverage": {
"dependsOn": ["sync", "^test:unit:coverage"]
},
"test:integration": {
"dependsOn": ["build"]
}
Expand Down
2 changes: 1 addition & 1 deletion apps/console/src/routes/(auth)/signin/signin.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// TODO https://testing-library.com/docs/svelte-testing-library/setup/
// TODO https://www.freecodecamp.org/news/how-to-do-test-driven-development-with-svelte-and-vitest/

import { describe, it, expect } from 'vitest';
import { describe, it, beforeEach } from 'vitest';
// import { render, screen, fireEvent } from '@testing-library/svelte';
import Signin from './+page.svelte';

Expand Down
3 changes: 3 additions & 0 deletions apps/console/turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@
]
},
"preview": {},
"test:unit:coverage": {
"dependsOn": ["sync", "^test:unit:coverage"]
},
"test:integration": {
"dependsOn": ["build"]
},
Expand Down
6 changes: 6 additions & 0 deletions apps/playground/turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
"check": {
"outputs": [".svelte-kit/**"]
},
"sync": {
"outputs": [".svelte-kit/**"]
},
"dev": {
"cache": false,
"persistent": true,
Expand Down Expand Up @@ -38,6 +41,9 @@
]
},
"preview": {},
"test:unit:coverage": {
"dependsOn": ["sync", "^test:unit:coverage"]
},
"test:integration": {
"dependsOn": ["build"]
},
Expand Down
4 changes: 3 additions & 1 deletion apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"lint:prettier": "prettier --check --plugin=prettier-plugin-astro --plugin=prettier-plugin-svelte .",
"preview": "astro preview",
"start": "astro dev",
"test": "vitest"
"test": "vitest",
"test:unit:coverage": "vitest run --coverage"
},
"dependencies": {
"sharp": "0.33.3"
Expand All @@ -37,6 +38,7 @@
"@spectacular/typescript-config": "workspace:*",
"@spectacular/utils": "workspace:*",
"@tailwindcss/typography": "0.5.13",
"@vitest/coverage-v8": "1.6.0",
"astro": "4.8.2",
"astro-expressive-code": "0.35.3",
"astro-seo": "0.8.3",
Expand Down
14 changes: 7 additions & 7 deletions compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ services:
HASURA_GRAPHQL_JWT_SECRET: '{ "type": "HS256", "key": "${HASURA_GRAPHQL_JWT_SECRET_KEY}"}'
HASURA_GRAPHQL_ADMIN_SECRET: ${HASURA_GRAPHQL_ADMIN_SECRET:-hasura-admin-secret}
HASURA_GRAPHQL_ENABLE_CONSOLE: 'true'
HASURA_GRAPHQL_DEV_MODE: "true"
HASURA_GRAPHQL_DEV_MODE: 'true'
HASURA_GRAPHQL_LOG_LEVEL: warn
HASURA_GRAPHQL_ENABLED_LOG_TYPES: startup,http-log,webhook-log,websocket-log
HASURA_GRAPHQL_UNAUTHORIZED_ROLE: anonymous
Expand All @@ -44,7 +44,7 @@ services:
# HASURA_GRAPHQL_EXPERIMENTAL_FEATURES: naming_convention
# HASURA_GRAPHQL_DEFAULT_NAMING_CONVENTION: graphql-default
healthcheck:
test: ["CMD-SHELL", "timeout 1s bash -c ':> /dev/tcp/127.0.0.1/9695' || exit 1"]
test: ['CMD-SHELL', "timeout 1s bash -c ':> /dev/tcp/127.0.0.1/9695' || exit 1"]
interval: 60s
start_period: 1m
start_interval: 10s
Expand Down Expand Up @@ -73,17 +73,17 @@ services:
- storage${BASE_HOSTNAME}:host-gateway
- traefik${BASE_HOSTNAME}:host-gateway
labels:
traefik.enable: "true"
traefik.enable: 'true'
traefik.http.routers.console.entrypoints: websecure
traefik.http.routers.console.rule: Host(`hasura${BASE_HOSTNAME}`)
traefik.http.routers.console.service: console
traefik.http.routers.console.tls: "true"
traefik.http.services.console.loadbalancer.server.port: "9695"
traefik.http.routers.console.tls: 'true'
traefik.http.services.console.loadbalancer.server.port: '9695'
traefik.http.routers.migrate.entrypoints: websecure
traefik.http.routers.migrate.rule: PathPrefix(`/apis/`) && Host(`hasura${BASE_HOSTNAME}`)
traefik.http.routers.migrate.service: migrate
traefik.http.routers.migrate.tls: "true"
traefik.http.services.migrate.loadbalancer.server.port: "443"
traefik.http.routers.migrate.tls: 'true'
traefik.http.services.migrate.loadbalancer.server.port: '443'
###########################################################################
# hasura service - dev mode
###########################################################################
Expand Down
Loading

0 comments on commit c01cdb1

Please sign in to comment.