diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 668d2f2..19614b8 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,4 +11,4 @@ updates: groups: dependencies: patterns: - - "*" + - '*' diff --git a/.github/workflows/on-pull-request.yml b/.github/workflows/on-pull-request.yml new file mode 100644 index 0000000..7997f63 --- /dev/null +++ b/.github/workflows/on-pull-request.yml @@ -0,0 +1,8 @@ +name: on pull request + +on: + pull_request: + +jobs: + test-node: + uses: ./.github/workflows/wf-test-node.yml diff --git a/.github/workflows/on-push-main.yml b/.github/workflows/on-push-main.yml index 254786e..3e6bf03 100644 --- a/.github/workflows/on-push-main.yml +++ b/.github/workflows/on-push-main.yml @@ -6,6 +6,9 @@ on: - main jobs: + test-node: + uses: ./.github/workflows/wf-test-node.yml + deploy: uses: ./.github/workflows/wf-deploy.yml secrets: inherit diff --git a/.github/workflows/wf-deploy.yml b/.github/workflows/wf-deploy.yml index 12d83ed..2fac033 100644 --- a/.github/workflows/wf-deploy.yml +++ b/.github/workflows/wf-deploy.yml @@ -1,4 +1,4 @@ -name: Cloudflare Pages +name: deploy on: workflow_call: @@ -29,7 +29,7 @@ jobs: - name: install dependencies run: pnpm install --frozen-lockfile - name: build - run: pnpm build + run: pnpm build --site https://db.agricolajp.dev - name: Publish to Cloudflare Pages uses: cloudflare/pages-action@1 with: diff --git a/.github/workflows/wf-test-node.yml b/.github/workflows/wf-test-node.yml new file mode 100644 index 0000000..4c7b33f --- /dev/null +++ b/.github/workflows/wf-test-node.yml @@ -0,0 +1,34 @@ +name: test-node + +on: + workflow_call: + +jobs: + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v2 + with: + version: latest + - uses: actions/setup-node@v4 + with: + node-version-file: '.node-version' + cache: pnpm + - run: pnpm install --frozen-lockfile + - run: pnpm check + - run: pnpm eslint:check + + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v2 + with: + version: latest + - uses: actions/setup-node@v4 + with: + node-version-file: '.node-version' + cache: pnpm + - run: pnpm install --frozen-lockfile + - run: pnpm build diff --git a/.prettierignore b/.prettierignore index 8aa5ad6..1e7d6a2 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1 +1,4 @@ src/libs/api/generated.ts +pnpm-lock.yaml +dist/ +node_modules/ diff --git a/package.json b/package.json index c60fcfe..56a049e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,6 @@ { "name": "agricoladb-viewer", "version": "0.0.1", - "type": "module", "scripts": { "dev": "astro dev", "start": "astro dev", @@ -9,7 +8,9 @@ "build": "astro build", "preview": "astro preview", "astro": "astro", - "codegen": "graphql-codegen --config codegen.ts" + "codegen": "graphql-codegen --config codegen.ts", + "eslint:check": "eslint", + "prettier:check": "prettier --check ." }, "dependencies": { "@astrojs/check": "^0.3.4", diff --git a/tsconfig.json b/tsconfig.json index 46ec881..02d84dd 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,8 +4,11 @@ "baseUrl": ".", "jsx": "react-jsx", "jsxImportSource": "react", + "esModuleInterop": true, + "moduleResolution": "node", "paths": { "@/*": ["src/*"] } - } + }, + "exclude": ["dist"] }