Skip to content
Closed
Show file tree
Hide file tree
Changes from all 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
4 changes: 2 additions & 2 deletions .github/actions/codeql/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ runs:
using: "composite"
steps:
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
uses: github/codeql-action/init@v4
with:
languages: ${{ inputs.language }}
source-root: ${{ inputs.working_directory }}

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
uses: github/codeql-action/analyze@v4


4 changes: 2 additions & 2 deletions .github/actions/node_linter/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ inputs:


use_eslint:
description: Use eslint formatter
description: Use eslint linter
required: true

use_prettier:
Expand All @@ -28,7 +28,7 @@ runs:
- name: Lint with prettier
run: |
if [[ ${{ inputs.use_prettier }} != 'false' ]]; then
npm run formatter
npm run format
else
echo "Skipping prettier"
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/configurations/node_linters/.prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"printWidth": 120,
"tabWidth": 4,
"tabWidth": 2,
"singleQuote": true,
"endOfLine": "auto",
"trailingComma": "all"
Expand Down
9 changes: 2 additions & 7 deletions .github/configurations/node_linters/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ and add these scripts to `package.json`:
"lint-fix": "npm run lint -- --fix",
"lint-scss": "stylelint --config $npm_package_config_stylelint '**/*.{css,scss}'",
"lint-scss-fix": "npm run lint-scss -- --fix",
"formatter": "prettier --config $npm_package_config_prettier --check",
"formatter-fix": "npm run formatter -- --write"
"format": "prettier --config $npm_package_config_prettier --check",
"format-fix": "npm run format -- --write"
},
```

Expand All @@ -39,14 +39,9 @@ In `.vscode/settings.json`
{
"stylelint.validate": ["css", "less", "postcss", "scss"],
"stylelint.snippet": ["css", "less", "postcss", "scss"],
"eslint.format.enable": true,
"eslint.workingDirectories": ["./", "./functions"],
"editor.defaultFormatter": "esbenp.prettier-vscode",
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.formatOnSave": true,
"editor.semanticHighlighting.enabled": true,
"eslint.options": {
"overrideConfigFile": ".github/configurations/node_linters/eslint.config.mjs"
},
Expand Down
2 changes: 1 addition & 1 deletion .github/test/node_test/app/source.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function sum(a, b) {
return a + b;
return a + b;
}

module.exports = sum;
2 changes: 1 addition & 1 deletion .github/test/node_test/app/source.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.test {
color: red;
color: red;
}
2 changes: 1 addition & 1 deletion .github/test/node_test/app/source.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const sum = require('./source');

test('adds 1 + 2 to equal 3', () => {
expect(sum(1, 2)).toBe(3);
expect(sum(1, 2)).toBe(3);
});
Loading
Loading