Skip to content

Commit

Permalink
Merge branch 'dev' into yash/k8s-worker
Browse files Browse the repository at this point in the history
  • Loading branch information
rasswanth-s authored Jan 30, 2024
2 parents 5bfcc3b + 6c367c5 commit e1c14e4
Show file tree
Hide file tree
Showing 104 changed files with 4,093 additions and 3,537 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ repos:
rev: "v3.0.0-alpha.9-for-vscode"
hooks:
- id: prettier
exclude: ^(packages/grid/helm|packages/hagrid/hagrid/manifest_template.yml)
exclude: ^(packages/grid/helm|packages/grid/frontend/pnpm-lock.yaml|packages/hagrid/hagrid/manifest_template.yml)

# - repo: meta
# hooks:
Expand Down
26 changes: 15 additions & 11 deletions packages/grid/frontend/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
module.exports = {
root: true,
parser: '@typescript-eslint/parser',
extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'prettier'],
plugins: ['svelte3', '@typescript-eslint'],
ignorePatterns: ['*.cjs'],
overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }],
parser: "@typescript-eslint/parser",
extends: [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"prettier",
],
plugins: ["svelte3", "@typescript-eslint"],
ignorePatterns: ["*.cjs"],
overrides: [{ files: ["*.svelte"], processor: "svelte3/svelte3" }],
settings: {
'svelte3/typescript': () => require('typescript')
"svelte3/typescript": () => require("typescript"),
},
parserOptions: {
sourceType: 'module',
ecmaVersion: 2020
sourceType: "module",
ecmaVersion: 2020,
},
env: {
browser: true,
es2017: true,
node: true
}
};
node: true,
},
}
7 changes: 3 additions & 4 deletions packages/grid/frontend/.prettierrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"useTabs": false,
"singleQuote": true,
"trailingComma": "none",
"printWidth": 100,
"semi": false,
"singleQuote": false,
"trailingComma": "es5",
"htmlWhitespaceSensitivity": "ignore"
}
9 changes: 6 additions & 3 deletions packages/grid/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
"devDependencies": {
"@playwright/test": "^1.36.1",
"@sveltejs/adapter-node": "^1.3.1",
"@sveltejs/kit": "^1.25.2",
"@sveltejs/kit": "1.25.2",
"@types/cookie": "^0.5.3",
"@types/libsodium-wrappers": "0.7.11",
"@types/prismjs": "^1.26.0",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
Expand All @@ -33,6 +35,7 @@
"svelte-search": "^2.0.1",
"tailwindcss": "3.3.1",
"typescript": "^4.9.5",
"typescript-svelte-plugin": "^0.3.34",
"vite": "^4.5.2",
"vitest": "^0.33.0"
},
Expand All @@ -41,8 +44,8 @@
"capnp-ts": "^0.7.0",
"just-debounce-it": "^3.2.0",
"ky": "^0.33.3",
"libsodium": "^0.7.11",
"libsodium-wrappers": "^0.7.11",
"libsodium": "0.7.11",
"libsodium-wrappers": "0.7.11",
"prismjs": "^1.29.0",
"semver": "^7.5.4",
"uuid": "^9.0.0"
Expand Down
22 changes: 11 additions & 11 deletions packages/grid/frontend/playwright.config.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import { defineConfig, devices } from '@playwright/test';
import * as dotenv from 'dotenv';
import { defineConfig, devices } from "@playwright/test"
import * as dotenv from "dotenv"

dotenv.config();
dotenv.config()

export default defineConfig({
testDir: 'tests/e2e',
testDir: "tests/e2e",
fullyParallel: true,
forbidOnly: !!process.env.CI,
retries: process.env.CI ? 2 : 0,
workers: process.env.CI ? 1 : undefined,
reporter: 'dot',
reporter: "dot",
use: {
baseURL: process.env.TEST_API_URL || 'http://localhost:9081'
baseURL: process.env.TEST_API_URL || "http://localhost:9081",
},
projects: [
{
name: 'chromium',
use: { ...devices['Desktop Chrome'] }
}
]
});
name: "chromium",
use: { ...devices["Desktop Chrome"] },
},
],
})
Loading

0 comments on commit e1c14e4

Please sign in to comment.