Skip to content

Commit e10fc9c

Browse files
authored
Merge pull request #55 from AegisJSProject/patch/updates
Update dependencies and config
2 parents b13a55c + adcb0d1 commit e10fc9c

File tree

8 files changed

+416
-305
lines changed

8 files changed

+416
-305
lines changed

.github/workflows/nodejs.yml

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,16 @@ on:
1010
- master
1111
- release/*
1212
jobs:
13-
npm-test:
14-
name: NPM Install and Test
13+
build:
14+
name: Node CI
1515
runs-on: ubuntu-latest
1616
steps:
17-
- name: Checkout
18-
uses: actions/checkout@v4
19-
with:
20-
lfs: true
21-
submodules: true
22-
- name: Setup Node
23-
uses: actions/setup-node@v4
24-
with:
25-
node-version-file: '.nvmrc'
26-
cache: npm
27-
- name: Get npm cache directory
28-
id: npm-cache-dir
29-
shell: bash
30-
run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
31-
- name: Restore cache
32-
uses: actions/cache@v4
33-
# use this to check for `cache-hit` ==> if: steps.npm-cache.outputs.cache-hit != 'true'
34-
id: npm-cache
35-
with:
36-
path: ${{ steps.npm-cache-dir.outputs.dir }}
37-
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
38-
restore-keys: ${{ runner.os }}-node-
39-
- name: Install dependencies
40-
run: npm ci --ignore-scripts --no-audit --no-fund
41-
- name: Run npm test
42-
run: npm test --if-present
17+
- uses: actions/checkout@v4
18+
- uses: actions/setup-node@v4
19+
with:
20+
node-version-file: '.nvmrc'
21+
# `cache: npm` seems to require a `package-lock.json` file
22+
# cache: npm
23+
- run: npm i
24+
- run: npm run build --if-present
25+
- run: npm test

.github/workflows/super-linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787

8888
# Valate Languages - Uncomment to Enable
8989
# JS/TS/JSON Disabled until ESLint in super-linter is updated
90-
VALIDATE_HTML: true
90+
# VALIDATE_HTML: true
9191
VALIDATE_CSS: true
9292
# VALIDATE_JAVASCRIPT_ES: true
9393
# VALIDATE_JAVASCRIPT_STANDARD: true

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*.gz
66
*.tgz
77
.env
8+
.DS_STORE
89
# Logs
910
logs
1011
*.log

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.3.1
1+
20.9.0

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [v0.2.14]
11+
12+
### Changed
13+
- Update dependencies and config
14+
1015
## [v0.2.13] - 2024-04-10
1116

1217
### Changed

eslint.config.js

Lines changed: 3 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,4 @@
1-
import js from '@eslint/js';
2-
import globals from 'globals';
1+
import { ignoreFile } from '@shgysk8zer0/eslint-config/ignoreFile.js';
2+
import browser from '@shgysk8zer0/eslint-config/browser.js';
33

4-
export default [
5-
// 'files': ['*.js', '**/*.js'],
6-
{
7-
'ignores': [
8-
'/node_modules/*',
9-
'/_site/*',
10-
'/img/*',
11-
'/css/*',
12-
'/fonts/*',
13-
'/js/std-js/*',
14-
'**/*.cjs',
15-
'./*.cjs',
16-
'./harden.cjs',
17-
'**/*.mjs',
18-
'./*.mjs',
19-
'**/*.min.js',
20-
'*.min.js',
21-
],
22-
}, {
23-
'rules': {
24-
...js.configs.recommended.rules,
25-
'indent': [2, 'tab', { 'SwitchCase': 1 }],
26-
'quotes': [2, 'single'],
27-
'semi': [2, 'always'],
28-
'no-console': 0,
29-
'no-async-promise-executor': 0,
30-
'no-prototype-builtins': 0,
31-
'no-unused-vars': 'error',
32-
},
33-
'languageOptions': {
34-
'ecmaVersion': 'latest',
35-
'sourceType': 'module',
36-
'globals': {
37-
'globalThis': 'readonly',
38-
'trustedTypes': 'readonly',
39-
'TrustedTypePolicy': 'readonly',
40-
...globals.browser,
41-
}
42-
}
43-
}
44-
];
4+
export default [ignoreFile, browser()];

0 commit comments

Comments
 (0)