Skip to content

Commit

Permalink
Fix/various fixes (Stadt-Geschichte-Basel#40)
Browse files Browse the repository at this point in the history
* ci: only publish to CF with sgb

* fix: fix a bad url in archive

* fix: formatting

* fix: better JSDoc support

* chore: deps updated, npm run build locally working

* ci: remove nasty hack to bypass pnpm run build loop

* chore: tests added

* chore: dependencies updated

* ci: tests enabled

* chore: formatting fixed

* ci: fix execution order of ci

* ci: install playwright

* test: config and tests fixed

* test: fix tests
  • Loading branch information
maehr authored Nov 30, 2023
1 parent b6233d0 commit ee71796
Show file tree
Hide file tree
Showing 7 changed files with 643 additions and 600 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/sveltekitci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,25 +59,27 @@ jobs:
- name: Install dependencies
run: pnpm install

- name: Install playwright
run: pnpm exec playwright install

- name: Lint
run: pnpm run lint

# - name: Test
# run: pnpm run test

- name: Prebuild
run: pnpm run prebuild

# FIXME: NASTY HACK!
- name: Build
run: timeout 60 pnpm run build || true
run: pnpm run build

- name: Postbuild
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
run: pnpm run postbuild

- name: Test
run: pnpm run test

- name: Publish to Cloudflare Pages
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' && github.repository == 'Stadt-Geschichte-Basel/stadtgeschichtebasel.ch'
uses: cloudflare/pages-action@v1
with:
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"pnpm": ">=8"
},
"private": true,
"packageManager": "pnpm@8.7.5",
"packageManager": "pnpm@8.10.5",
"scripts": {
"dev": "vite dev",
"build": "vite build",
Expand All @@ -28,8 +28,8 @@
},
"devDependencies": {
"@divriots/jampack": "^0.22.1",
"@playwright/test": "^1.40.0",
"@skeletonlabs/skeleton": "^2.5.0",
"@playwright/test": "^1.40.1",
"@skeletonlabs/skeleton": "^2.5.1",
"@skeletonlabs/tw-plugin": "^0.2.4",
"@sveltejs/adapter-static": "^2.0.3",
"@sveltejs/kit": "^1.27.6",
Expand All @@ -39,31 +39,31 @@
"dompurify": "^3.0.6",
"eslint": "^8.54.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-svelte": "^2.35.0",
"eslint-plugin-svelte": "^2.35.1",
"husky": "^8.0.3",
"js-yaml": "^4.1.0",
"jsdom": "^22.1.0",
"jsdom": "^23.0.0",
"mdsvex": "^0.11.0",
"node-fetch": "^3.3.2",
"postcss": "^8.4.31",
"prettier": "^3.1.0",
"prettier-plugin-svelte": "^3.1.0",
"prettier-plugin-svelte": "^3.1.2",
"prettier-plugin-tailwindcss": "^0.5.7",
"rehype-autolink-headings": "^7.1.0",
"rehype-external-links": "^3.0.0",
"rehype-mdsvex-image-autoimport": "^1.1.0",
"rehype-slug": "^6.0.0",
"remark-captions": "^2.2.3",
"remark-unwrap-images": "^4.0.0",
"svelte": "^4.2.5",
"svelte-check": "^3.6.0",
"svelte-maplibre": "^0.7.2",
"svelte": "^4.2.7",
"svelte-check": "^3.6.2",
"svelte-maplibre": "^0.7.3",
"svelte-sitemap": "^2.6.0",
"tailwindcss": "^3.3.5",
"turndown": "^7.1.2",
"typescript": "^5.2.2",
"vite": "^4.5.0",
"vite-plugin-tailwind-purgecss": "^0.1.3",
"typescript": "^5.3.2",
"vite": "^5.0.3",
"vite-plugin-tailwind-purgecss": "^0.1.4",
"vitest": "^0.34.6",
"xml2js": "^0.6.2"
},
Expand Down
4 changes: 2 additions & 2 deletions playwright.config.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/** @type {import('@playwright/test').PlaywrightTestConfig} */
const config = {
webServer: {
command: 'npm run build && npm run preview',
command: 'npm run preview',
port: 4173
},
testDir: 'tests',
testMatch: /(.+\.)?(test|spec)\.[jt]s/,
timeout: 120000
timeout: 5 * 60 * 1000
};

export default config;
Loading

0 comments on commit ee71796

Please sign in to comment.