Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: refactor ci config #207

Merged
merged 1 commit into from
Dec 1, 2023
Merged

chore: refactor ci config #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .eslintignore
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions .eslintrc.yml
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions .prettierrc
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion demo/.eslintignore
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions demo/.eslintrc.yml
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions demo/eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { svelteTsConfig } from '@jill64/eslint-config-svelte'

/** @type {import('@jill64/eslint-config-svelte').FlatConfig[]} */
export default svelteTsConfig()
7 changes: 3 additions & 4 deletions demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@
"build": "vite build",
"preview": "npm run build && vite preview",
"lint": "npm run check && npx eslint .",
"format": "npx prettier --write . --plugin prettier-plugin-svelte .",
"format": "npx @jill64/psx",
"check": "svelte-kit sync && npx svelte-check"
},
"prettier": "@jill64/prettier-config",
"devDependencies": {
"@jill64/eslint-config-svelte": "0.0.3",
"@jill64/svelte-toast": "1.2.1",
"@sentry/vite-plugin": "2.10.2",
"@sveltejs/adapter-cloudflare": "2.3.3",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-svelte": "2.35.1",
"prettier-plugin-svelte": "3.1.2",
"svelte": "4.2.8",
"vite": "5.0.4"
}
Expand Down
9 changes: 9 additions & 0 deletions eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { tsConfig } from '@jill64/eslint-config-ts'

/** @type {import('@jill64/eslint-config-ts').FlatConfig[]} */
export default [
...tsConfig(),
{
ignores: ['tests', 'demo', 'scripts']
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ESLint configuration property for specifying patterns to ignore should be ignorePatterns, not ignores.

-    ignores: ['tests', 'demo', 'scripts']
+    ignorePatterns: ['tests', 'demo', 'scripts']
Committable suggestion

❗ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
ignores: ['tests', 'demo', 'scripts']
ignorePatterns: ['tests', 'demo', 'scripts']

}
]
9 changes: 5 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"publishConfig": {
"access": "public"
},
"prettier": "@jill64/prettier-config",
"scripts": {
"dev": "cd demo && npm run dev",
"build": "npm run build:lib && npm run build:demo && npx publint",
Expand All @@ -53,21 +54,21 @@
"lint:lib": "npx eslint .",
"lint:demo": "cd demo && npm run lint",
"format": "npm run format:lib && npm run format:demo",
"format:lib": "npx prettier --write .",
"format:lib": "npx prettier -w .",
"format:demo": "cd demo && npm run format"
},
"peerDependencies": {
"@sveltejs/kit": "^1.0.0"
},
"devDependencies": {
"@jill64/eslint-config-ts": "0.1.2",
"@jill64/prettier-config": "0.0.1",
"@jill64/playwright-config": "0.0.1",
"@playwright/test": "1.40.1",
"@sentry/core": "7.84.0",
"@sentry/utils": "7.84.0",
"@sveltejs/kit": "1.27.6",
"@typescript-eslint/eslint-plugin": "6.13.1",
"@typescript-eslint/parser": "6.13.1",
"esbuild": "0.19.8",
"eslint-plugin-deprecation": "2.0.0",
"typescript": "5.3.2"
},
"dependencies": {
Expand Down
32 changes: 3 additions & 29 deletions playwright.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,12 @@
import { defineConfig, devices } from '@playwright/test'
import { extendsConfig } from '@jill64/playwright-config'

const ref_name = process.env.GITHUB_REF_NAME

export default defineConfig({
export default extendsConfig({
use: {
baseURL:
ref_name === 'main'
? 'https://sentry-sveltekit-cloudflare.pages.dev'
: `https://${ref_name}.sentry-sveltekit-cloudflare.pages.dev`
},
testDir: 'tests',
fullyParallel: true,
workers: '100%',
retries: process.env.CI ? 2 : 0,
projects: [
{
name: 'chromium',
use: devices['Desktop Chrome']
},
{
name: 'firefox',
use: devices['Desktop Firefox']
},
{
name: 'webkit',
use: devices['Desktop Safari']
},
{
name: 'Mobile Chrome',
use: devices['Pixel 5']
},
{
name: 'Mobile Safari',
use: devices['iPhone 12']
}
]
}
})
Loading
Loading