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.

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

Rubenr/upgrade helsenorge packages #441

Merged
merged 15 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
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
7 changes: 0 additions & 7 deletions .eslintignore

This file was deleted.

37 changes: 0 additions & 37 deletions .eslintrc.json

This file was deleted.

16 changes: 6 additions & 10 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ name: ESLint

on:
push:
branches: [ "master" ]
branches: ['master']
pull_request:
# The branches below must be a subset of the branches above
branches: [ "master" ]
branches: ['master']
schedule:
- cron: '16 19 * * 2'

Expand All @@ -32,17 +32,13 @@ jobs:

- name: Install ESLint
run: |
npm install [email protected]
npm install @helsenorge/eslint-config
npm install [email protected]
npm install @microsoft/[email protected]
- name: Run ESLint
env:
SARIF_ESLINT_IGNORE_SUPPRESSED: "true"
run: npx eslint .
--ignore-path .eslintignore
--config .eslintrc.json
--ext .js,.jsx,.ts,.tsx
--format @microsoft/eslint-formatter-sarif
--output-file eslint-results.sarif
SARIF_ESLINT_IGNORE_SUPPRESSED: 'true'
run: npx eslint "**/*.{js,jsx,ts,tsx}" --fix --format @microsoft/eslint-formatter-sarif --output-file eslint-results.sarif
continue-on-error: true

- name: Upload analysis results to GitHub
Expand Down
47 changes: 7 additions & 40 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,8 @@
{
"window.title": "${activeEditorShort}${separator}refero",
"typescript.tsdk": "./node_modules/typescript/lib",
"editor.tabSize": 2,
"eslint.lintTask.enable": true,
"eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
"prettier.singleQuote": true,
"prettier.printWidth": 140,
"prettier.trailingComma": "es5",
"prettier.proseWrap": "always",
"workbench.colorCustomizations": {
"activityBar.background": "#88d7ea",
"activityBar.activeBorder": "#de41bf",
"activityBar.foreground": "#15202b",
"activityBar.inactiveForeground": "#15202b99",
"activityBarBadge.background": "#de41bf",
"activityBarBadge.foreground": "#e7e7e7",
"titleBar.activeBackground": "#5dc9e2",
"titleBar.inactiveBackground": "#5dc9e299",
"titleBar.activeForeground": "#15202b",
"titleBar.inactiveForeground": "#15202b99",
"statusBar.background": "#5dc9e2",
"statusBarItem.hoverBackground": "#32bbda",
"statusBar.foreground": "#15202b",
"activityBar.activeBackground": "#88d7ea",
"commandCenter.border": "#15202b99",
"sash.hoverBorder": "#88d7ea",
"statusBarItem.remoteBackground": "#5dc9e2",
"statusBarItem.remoteForeground": "#15202b"
},
"peacock.color": "#5dc9e2",
"eslint.runtime": "node",
"typescript.experimental.updateImportsOnPaste": true,
"editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
"editor.formatOnType": false, // required
"editor.formatOnPaste": true, // optional
"editor.formatOnSave": true, // optional
"editor.formatOnSaveMode": "file", // required to format on save
"files.autoSave": "onFocusChange", // optional but recommended
"vs-code-prettier-eslint.prettierLast": false // set as "true" to run 'prettier' last not first
}
"eslint.run": "onSave",
"vs-code-prettier-eslint.prettierLast": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "always"
},
}
3 changes: 3 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import config from '@helsenorge/eslint-config';

export default config;
Loading
Loading