Skip to content

Commit

Permalink
Merge pull request #894 from IATI/linting
Browse files Browse the repository at this point in the history
Upgrades and linting
  • Loading branch information
tillywoodfield authored Dec 10, 2024
2 parents 8a3d92e + ae0986b commit 639968a
Show file tree
Hide file tree
Showing 70 changed files with 2,675 additions and 1,549 deletions.
2 changes: 0 additions & 2 deletions .eslintignore

This file was deleted.

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

This file was deleted.

16 changes: 8 additions & 8 deletions .github/workflows/develop_CD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: Deploy_To_Azure_Blobs_Dev
on:
push:
paths-ignore: # https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
- '**/README.md' # don't run on README.md file updates anywhere in repo
- '**/dependabot.yml'
- "**/README.md" # don't run on README.md file updates anywhere in repo
- "**/dependabot.yml"
branches:
- develop
schedule:
- cron: '24 04 * * *' # 0424am daily
- cron: "24 04 * * *" # 0424am daily

env:
STORAGE_ACCOUNT_NAME: sadatastoresearchdev
Expand All @@ -28,8 +28,8 @@ jobs:
- name: Set up Node.js
uses: actions/[email protected]
with:
node-version-file: '.nvmrc'
cache: 'npm'
node-version-file: ".nvmrc"
cache: "npm"

- name: Install dependencies
run: |
Expand Down Expand Up @@ -69,13 +69,13 @@ jobs:
- name: Set up Node.js
uses: actions/[email protected]
with:
node-version-file: '.nvmrc'
cache: 'npm'
node-version-file: ".nvmrc"
cache: "npm"

- name: Cypress CI Run
uses: cypress-io/github-action@v6
with:
wait-on: 'https://dev-datastore.iatistandard.org'
wait-on: "https://dev-datastore.iatistandard.org"
config-file: cypress.config.dev.js

status_check_success:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/develop_CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ jobs:
with:
node-version-file: ".nvmrc"

- name: Install dependencies
run: npm ci

- name: Lint project
run: npm run lint

- name: Cypress CI Run
uses: cypress-io/github-action@v6
with:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/main_CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ jobs:
with:
node-version-file: ".nvmrc"

- name: Install dependencies
run: npm ci

- name: Lint project
run: npm run lint

- name: Cypress CI Run
uses: cypress-io/github-action@v6
with:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/gallium
lts/iron
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
index.html
index.prod.html
13 changes: 0 additions & 13 deletions .prettierrc.json

This file was deleted.

5 changes: 1 addition & 4 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"recommendations": [
"vue.volar",
"editorconfig.editorconfig"
]
"recommendations": ["vue.volar", "editorconfig.editorconfig"]
}
26 changes: 13 additions & 13 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "pwa-chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:3000",
"webRoot": "${workspaceFolder}/app"
}
]
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "pwa-chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:3000",
"webRoot": "${workspaceFolder}/app"
}
]
}
22 changes: 11 additions & 11 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"[vue]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"cSpell.words": ["axios"]
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"[vue]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"cSpell.words": ["axios"]
}
Loading

0 comments on commit 639968a

Please sign in to comment.