diff --git a/.github/workflows/GHPages.yml b/.github/workflows/GHPages.yml index 9c570f8c..49f0713f 100644 --- a/.github/workflows/GHPages.yml +++ b/.github/workflows/GHPages.yml @@ -32,7 +32,6 @@ jobs: run: yarn - name: Build docs run: |+ - export NODE_OPTIONS=--openssl-legacy-provider yarn docs:build - name: Setup Pages uses: actions/configure-pages@v3 diff --git a/.github/workflows/NodeCI.yml b/.github/workflows/NodeCI.yml index 6f2a1cfa..c3f9ab97 100644 --- a/.github/workflows/NodeCI.yml +++ b/.github/workflows/NodeCI.yml @@ -52,8 +52,8 @@ jobs: node-version: 14.x - name: Install Target Packages run: |+ - yarn add -D eslint@6 - yarn + yarn add -D eslint@6 --ignore-engines + yarn --ignore-engines - name: Test run: yarn test test-with-eslint7: @@ -65,8 +65,8 @@ jobs: node-version: 14.x - name: Install Target Packages run: |+ - yarn add -D eslint@7 - yarn + yarn add -D eslint@7 --ignore-engines + yarn --ignore-engines - name: Test run: yarn test test-and-coverage: diff --git a/package.json b/package.json index e7f9b1f2..8b7eb084 100644 --- a/package.json +++ b/package.json @@ -28,8 +28,9 @@ "build:ts": "tsc --project ./tsconfig.build.json", "clean": "rimraf .nyc_output dist coverage", "cover": "nyc --reporter=lcov yarn test", - "docs:build": "yarn build:ts && vuepress build docs --no-cache", - "docs:watch": "vuepress dev --debug docs", + "docs:build": "yarn build:ts && npm run vuepress -- build docs --no-cache", + "docs:watch": "npm run vuepress -- dev --debug docs", + "vuepress": "node --openssl-legacy-provider ./node_modules/vuepress/cli.js", "lint": "eslint . --ext .js,.vue,.ts,.json,.md,.toml,.yaml,.yml", "lint-fix": "yarn lint --fix", "mocha": "yarn ts node_modules/mocha/bin/mocha", @@ -74,8 +75,8 @@ "@types/node": "^18.0.0", "@types/request": "^2.48.5", "@types/semver": "^7.3.1", - "@typescript-eslint/eslint-plugin": "^5.0.0", - "@typescript-eslint/parser": "^5.0.0", + "@typescript-eslint/eslint-plugin": "^6.0.0", + "@typescript-eslint/parser": "^6.0.0", "env-cmd": "^10.1.0", "esbuild-register": "^3.3.3", "eslint": "^8.0.0", diff --git a/src/utils/ast/js/index.ts b/src/utils/ast/js/index.ts index b01bca6e..37356901 100644 --- a/src/utils/ast/js/index.ts +++ b/src/utils/ast/js/index.ts @@ -119,7 +119,6 @@ const CALC_BINARY: Record< "<<": (v1, v2) => v1 << v2, ">>": (v1, v2) => v1 >> v2, ">>>": (v1, v2) => v1 >>> v2, - // eslint-disable-next-line @typescript-eslint/restrict-plus-operands -- ignore "+": (v1, v2) => v1 + v2, "-": (v1, v2) => v1 - v2, "*": (v1, v2) => v1 * v2, @@ -485,7 +484,7 @@ const VISITORS = { } let data = node.quasis[0].value.cooked ?? node.quasis[0].value.raw; for (let i = 0; i < expressions.length; ++i) { - data += expressions[i]; + data += String(expressions[i]); data += node.quasis[i + 1].value.cooked ?? node.quasis[i + 1].value.raw; } return { data, children: EMPTY_MAP }; diff --git a/tools/update-docs.ts b/tools/update-docs.ts index 78156726..fe80d949 100644 --- a/tools/update-docs.ts +++ b/tools/update-docs.ts @@ -96,7 +96,6 @@ class DocFile { } else { if (categories) { const presets = []; - // eslint-disable-next-line @typescript-eslint/require-array-sort-compare -- ignore for (const cat of categories.sort()) { presets.push(`\`"plugin:json-schema-validator/${cat}"\``); }