Skip to content

Commit

Permalink
chore: sync updated config files
Browse files Browse the repository at this point in the history
Signed-off-by: Lexus Drumgold <unicornware@flexdevelopment.llc>
  • Loading branch information
unicornware committed Feb 22, 2023
1 parent e926435 commit 100af70
Show file tree
Hide file tree
Showing 16 changed files with 170 additions and 233 deletions.
4 changes: 1 addition & 3 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"yarn.lock"
],
"ignoreRegExpList": [
"/0x*/",
"/@flex-development\\/.*/",
"/from\\s+(['\"]).*\\1/",
"import\\(.*\\)"
Expand All @@ -39,6 +38,5 @@
"readonly": true,
"useGitignore": true,
"usePnP": false,
"version": "0.2",
"words": []
"version": "0.2"
}
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
**/.DS_Store
**/__tests__/report.json
**/coverage/
**/.temp/
**/dist/
**/node_modules/
**/tsconfig*temp.json
Expand Down
13 changes: 10 additions & 3 deletions .eslintrc.base.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
* @see https://eslint.org/docs/user-guide/configuring
*/

/**
* @type {typeof import('node:fs')}
* @const fs
*/
const fs = require('node:fs')

/**
* @type {typeof import('./tsconfig.json')}
* @const tsconfig - Tsconfig object
Expand Down Expand Up @@ -832,8 +838,9 @@ const config = {
chai: true,
describe: true,
expect: true,
faker: true,
faker: fs.existsSync('node_modules/@faker-js/faker/package.json'),
it: true,
pf: fs.existsSync('node_modules/pretty-format/package.json'),
suite: true,
test: true,
vi: true,
Expand Down Expand Up @@ -898,7 +905,7 @@ const config = {
}
},
{
files: '**/*.+(json|jsonc)',
files: '**/*.+(json|json5|jsonc)',
parser: 'jsonc-eslint-parser',
plugins: ['jsonc'],
rules: {
Expand Down Expand Up @@ -973,7 +980,7 @@ const config = {
}
},
{
files: ['**/*.jsonc', 'tsconfig*.json'],
files: ['**/*.+(json5|jsonc)', 'tsconfig*.json'],
rules: {
'jsonc/no-comments': 0
}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,9 @@ jobs:
name: Set env.TYPESCRIPT_VERSION
run: |
echo "TYPESCRIPT_VERSION=$(jq .devDependencies.typescript package.json -r)" >> $GITHUB_ENV
- id: debug
name: Print environment variables and event payload
uses: hmarr/debug-action@v2.1.0
- id: print-typescript-version
name: Print TypeScript version
run: echo $TYPESCRIPT_VERSION
- id: typecheck
name: Run typecheck
run: yarn typecheck
Expand Down
1 change: 1 addition & 0 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
#
# - https://typicode.github.io/husky/?id=husky_git_params-ie-commitlint-#/?id=husky_git_params-ie-commitlint-

yarn build
commitlint --edit $1
5 changes: 0 additions & 5 deletions .husky/pre-push

This file was deleted.

4 changes: 2 additions & 2 deletions .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"*": ["prettier --check", "cspell lint --color --no-progress --relative $@"],
"**/*.{cjs,gql,json,jsonc,md,mjs,mts,ts,yml}": [
"**/*.{cjs,cts,gql,js,json,json5,jsonc,md,mjs,mts,ts,yml}": [
"eslint --exit-on-fatal-error"
],
"**/*.{cjs,mjs,mts,ts}": "vitest typecheck --changed --run",
"**/*.{cts,mts,ts}": "vitest typecheck --changed --run",
"**/yarn.lock": "yarn dedupe --check",
"src/**/*.ts": "vitest --changed --coverage --run"
}
8 changes: 4 additions & 4 deletions .markdownlint.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -116,17 +116,17 @@
},
"MD045": true,
"MD046": {
"style": "consistent"
"style": "fenced"
},
"MD047": true,
"MD048": {
"style": "consistent"
"style": "backtick"
},
"MD049": {
"style": "consistent"
"style": "asterisk"
},
"MD050": {
"style": "consistent"
"style": "asterisk"
},
"default": true,
"extends": null
Expand Down
2 changes: 1 addition & 1 deletion __tests__/setup/chai.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @see https://chaijs.com
*/

import chai from 'chai'
import { chai } from 'vitest'

// configure chai
chai.config.includeStack = true
Expand Down
1 change: 1 addition & 0 deletions __tests__/ts/v4/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"compilerOptions": {
"declaration": true,
"noEmitOnError": true,
"skipLibCheck": false,
"target": "es2020"
Expand Down
4 changes: 2 additions & 2 deletions __tests__/ts/v4/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"alwaysStrict": false,
"baseUrl": "../../..",
"checkJs": false,
"declaration": true,
"declarationMap": true,
"declaration": false,
"declarationMap": false,
"emitDecoratorMetadata": false,
"esModuleInterop": true,
"exactOptionalPropertyTypes": true,
Expand Down
23 changes: 11 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"changelog": "node --loader=./loader.mjs ./config/changelog.config",
"check:ci": "yarn dedupe --check && yarn check:format && yarn check:lint && yarn check:spelling && yarn typecheck && yarn test:cov && NODE_ENV=production yarn pack -o %s-%v.tgz && yarn clean:pack && yarn check:types:build",
"check:format": "prettier --check .",
"check:lint": "eslint --exit-on-fatal-error --ext cjs,gql,json,jsonc,md,mjs,mts,ts,yml --max-warnings 0 .",
"check:lint": "eslint --exit-on-fatal-error --ext cjs,cts,gql,js,json,json5,jsonc,md,mjs,mts,ts,yml --max-warnings 0 .",
"check:spelling": "cspell lint --color --no-progress --relative $@ \"**\"",
"check:types": "tsc -p tsconfig.typecheck.json",
"check:types:build": "bash ./scripts/typecheck-build.sh",
Expand Down Expand Up @@ -84,7 +84,7 @@
},
"devDependencies": {
"@commitlint/cli": "17.4.4",
"@commitlint/config-conventional": "17.4.2",
"@commitlint/config-conventional": "17.4.4",
"@faker-js/faker": "8.0.0-alpha.0",
"@flex-development/mkbuild": "1.0.0-alpha.13",
"@graphql-eslint/eslint-plugin": "3.16.0",
Expand All @@ -96,17 +96,16 @@
"@types/conventional-recommended-bump": "6.1.0",
"@types/dateformat": "5.0.0",
"@types/eslint": "8.21.1",
"@types/fs-extra": "11.0.1",
"@types/git-raw-commits": "2.0.1",
"@types/is-ci": "3.0.0",
"@types/node": "18.13.0",
"@types/node-notifier": "8.0.2",
"@types/prettier": "2.7.2",
"@types/semver": "7.3.13",
"@typescript-eslint/eslint-plugin": "5.52.0",
"@typescript-eslint/parser": "5.51.0",
"@typescript-eslint/eslint-plugin": "5.53.0",
"@typescript-eslint/parser": "5.53.0",
"@vates/toggle-scripts": "1.0.0",
"@vitest/coverage-c8": "0.28.4",
"@vitest/coverage-c8": "0.28.5",
"@vitest/ui": "0.28.5",
"add-stream": "1.0.0",
"chai": "4.3.7",
Expand All @@ -124,7 +123,7 @@
"eslint-config-prettier": "8.6.0",
"eslint-plugin-chai-expect": "3.0.0",
"eslint-plugin-jest-formatting": "3.1.0",
"eslint-plugin-jsdoc": "39.8.0",
"eslint-plugin-jsdoc": "40.0.0",
"eslint-plugin-jsonc": "2.6.0",
"eslint-plugin-markdown": "3.0.0",
"eslint-plugin-markdownlint": "0.4.0",
Expand All @@ -139,7 +138,7 @@
"husky": "8.0.3",
"is-ci": "3.0.1",
"jsonc-eslint-parser": "2.1.0",
"lint-staged": "13.1.1",
"lint-staged": "13.1.2",
"mri": "1.2.0",
"node-fetch": "3.3.0",
"node-notifier": "10.0.1",
Expand All @@ -148,14 +147,14 @@
"sade": "1.8.1",
"semver": "7.3.8",
"serve": "14.2.0",
"tempfile": "4.0.0",
"tempfile": "5.0.0",
"trash-cli": "5.0.0",
"ts-dedent": "2.2.0",
"typescript": "5.0.0-dev.20230212",
"typescript": "5.0.0-dev.20230222",
"version-bump-prompt": "6.1.0",
"vite": "4.1.3",
"vite": "4.1.4",
"vite-tsconfig-paths": "4.0.5",
"vitest": "0.28.4",
"vitest": "0.28.5",
"vitest-github-actions-reporter": "0.9.0",
"yaml-eslint-parser": "1.1.0"
},
Expand Down
4 changes: 2 additions & 2 deletions src/utils/__snapshots__/load-tsconfig.snap
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ exports[`unit:utils/loadTsconfig > should return TSConfig object if tsconfig fil
"alwaysStrict": false,
"baseUrl": "..",
"checkJs": false,
"declaration": true,
"declarationMap": true,
"declaration": false,
"declarationMap": false,
"emitDecoratorMetadata": false,
"esModuleInterop": true,
"exactOptionalPropertyTypes": true,
Expand Down
1 change: 1 addition & 0 deletions tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"compilerOptions": {
"declaration": true,
"noEmitOnError": true,
"skipLibCheck": false,
"target": "es2020"
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"alwaysStrict": false,
"baseUrl": ".",
"checkJs": false,
"declaration": true,
"declarationMap": true,
"declaration": false,
"declarationMap": false,
"emitDecoratorMetadata": false,
"esModuleInterop": true,
"exactOptionalPropertyTypes": true,
Expand Down
Loading

0 comments on commit 100af70

Please sign in to comment.