Skip to content

Commit

Permalink
Merge pull request #65 from AegisJSProject/dependabot/npm_and_yarn/es…
Browse files Browse the repository at this point in the history
…lint-9.10.0

Bump eslint from 8.57.0 to 9.10.0
  • Loading branch information
shgysk8zer0 authored Sep 17, 2024
2 parents 5a563af + fa33de6 commit 1bc114a
Show file tree
Hide file tree
Showing 11 changed files with 381 additions and 481 deletions.
9 changes: 0 additions & 9 deletions .eslintignore

This file was deleted.

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

This file was deleted.

38 changes: 10 additions & 28 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,15 @@ on:
- master
- release/*
jobs:
npm-test:
name: NPM Install and Test
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
lfs: true
submodules: true
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: npm
- name: Get npm cache directory
id: npm-cache-dir
shell: bash
run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
- name: Restore cache
uses: actions/cache@v4
# use this to check for `cache-hit` ==> if: steps.npm-cache.outputs.cache-hit != 'true'
id: npm-cache
with:
path: ${{ steps.npm-cache-dir.outputs.dir }}
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: ${{ runner.os }}-node-
- name: Install dependencies
run: npm ci --ignore-scripts --no-audit --no-fund
- name: Run npm test
run: npm test --if-present
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
# `cache: npm` seems to require a `package-lock.json` file
# cache: npm
- run: npm i
- run: npm run build --if-present
- run: npm test
63 changes: 48 additions & 15 deletions .github/workflows/super-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,33 @@ on:
branches:
- master
- release/*
paths-ignore:
- '**/*.js' # Disable since ESLint is used and v9 config is incompatible
- '**/*.mjs'
- '**/*.cjs'
- '**/*.min.js'

###############
# Set the Job #
###############
jobs:
build:
strategy:
fail-fast: false
# matrix:
# language:
# Name the Job
name: Lint Code Base
# Set the agent to run on
runs-on: ubuntu-latest

permissions:
contents: read
packages: read
# To report GitHub Actions status checks
statuses: write


##################
# Load all steps #
##################
Expand All @@ -43,36 +59,53 @@ jobs:
##########################
- name: Checkout Code
uses: actions/checkout@v4
with:
# super-linter needs the full git history to get the
# list of files that changed across commits
fetch-depth: 0

################################
# Run Linter against code base #
################################
- name: Lint Code Base
uses: docker://github/super-linter:v4
uses: super-linter/super-linter@v7.1.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VALIDATE_ALL_CODEBASE: true
DEFAULT_BRANCH: master
VALIDATE_YAML: true
VALIDATE_JSON: true
# VALIDATE_XML: true
VALIDATE_MD: true
# DEFAULT_BRANCH: master
# DEFAULT_WORKSPACE:
# ANSIBLE_DIRECTORY:
# ACTIONS_RUNNER_DEBUG: true
VALIDATE_ALL_CODEBASE: false
IGNORE_GENERATED_FILES: true
IGNORE_GITIGNORED_FILES: true
SUPPRESS_POSSUM: true
LOG_LEVEL: ERROR
LINTER_RULES_PATH: './'
EDITORCONFIG_FILE_NAME: '.editorconfig'
# JAVASCRIPT_ES_CONFIG_FILE: 'eslint.config.js'
CSS_FILE_NAME: '.stylelintrc.json'

# Valate Languages - Uncomment to Enable
# JS/TS/JSON Disabled until ESLint in super-linter is updated
# VALIDATE_HTML: true
VALIDATE_CSS: true
# VALIDATE_JAVASCRIPT_ES: true
# VALIDATE_JAVASCRIPT_STANDARD: true
# VALIDATE_JSON: true
# VALIDATE_XML: true
VALIDATE_MARKDOWN: true
VALIDATE_YAML: true
# VALIDATE_TYPESCRIPT_ES: true
# VALIDATE_TYPESCRIPT_STANDARD: true
# VALIDATE_JSX: true
# VALIDATE_TSX: true
# VALIDATE_BASH: true
# VALIDATE_PERL: true
# VALIDATE_PHP_BUILTIN: true
# VALIDATE_PYTHON: true
# VALIDATE_RUBY: true
# VALIDATE_COFFEE: true
# VALIDATE_ANSIBLE: true
# VALIDATE_JAVASCRIPT_ES: true
# VALIDATE_JAVASCRIPT_STANDARD: true
# VALIDATE_TYPESCRIPT_ES: true
# VALIDATE_TYPESCRIPT_STANDARD: true
# VALIDATE_DOCKER: true
# VALIDATE_GO: true
# VALIDATE_TERRAFORM: true
# VALIDATE_CSS: true
# ANSIBLE_DIRECTORY:
# ACTIONS_RUNNER_DEBUG: true
# DEFAULT_WORKSPACE:
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.3.1
20.9.0
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<!-- markdownlint-disable -->
# Changelog
All notable changes to this project will be documented in this file.

Expand All @@ -6,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [v0.1.3] - 2024-09-17

### Changed
- Updates eslint and config (now uses `@shgysk8zer0/eslint-config`)
- Updates versions on testing scripts
- Updates GitHub Workflows

## [v0.1.2] - 2024-03-10

### Added
Expand Down
4 changes: 4 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { ignoreFile } from '@shgysk8zer0/eslint-config/ignoreFile.js';
import browser from '@shgysk8zer0/eslint-config/browser.js';

export default [ignoreFile, browser()];
Loading

0 comments on commit 1bc114a

Please sign in to comment.