Skip to content

Commit d2b7af1

Browse files
CSharperMantleCSharperMantle
committed
build: bump tools version
1 parent a6d8963 commit d2b7af1

16 files changed

+742
-2123
lines changed

‎.eslintrc.json

-25
This file was deleted.

‎.github/workflows/gatsby.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
run: |
4646
yarn install --immutable
4747
- name: Coverage
48-
uses: paambaati/codeclimate-action@v4.0.0
48+
uses: paambaati/codeclimate-action@v9.0.0
4949
env:
5050
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
5151
with:

‎.vscode/settings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"**/.pnp.*": true
7777
},
7878
"eslint.nodePath": ".yarn/sdks",
79-
"prettier.prettierPath": ".yarn/sdks/prettier/index.js",
79+
"prettier.prettierPath": ".yarn/sdks/prettier/index.cjs",
8080
"typescript.tsdk": ".yarn/sdks/typescript/lib",
8181
"typescript.enablePromptUseWorkspaceTsdk": true,
8282
"files.associations": {

‎.yarn/sdks/prettier/bin-prettier.js ‎.yarn/sdks/eslint/lib/types/index.d.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const {createRequire, register} = require(`module`);
55
const {resolve} = require(`path`);
66
const {pathToFileURL} = require(`url`);
77

8-
const relPnpApiPath = "../../../.pnp.cjs";
8+
const relPnpApiPath = "../../../../../.pnp.cjs";
99

1010
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
1111
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
@@ -16,7 +16,7 @@ const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
1616

1717
if (existsSync(absPnpApiPath)) {
1818
if (!process.versions.pnp) {
19-
// Setup the environment to be able to require prettier/bin-prettier.js
19+
// Setup the environment to be able to require eslint
2020
require(absPnpApiPath).setup();
2121
if (isPnpLoaderEnabled && register) {
2222
register(pathToFileURL(absPnpLoaderPath));
@@ -28,5 +28,5 @@ const wrapWithUserWrapper = existsSync(absUserWrapperPath)
2828
? exports => absRequire(absUserWrapperPath)(exports)
2929
: exports => exports;
3030

31-
// Defer to the real prettier/bin-prettier.js your application uses
32-
module.exports = wrapWithUserWrapper(absRequire(`prettier/bin-prettier.js`));
31+
// Defer to the real eslint your application uses
32+
module.exports = wrapWithUserWrapper(absRequire(`eslint`));

‎.yarn/sdks/eslint/lib/types/rules/index.d.ts

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/usr/bin/env node
2+
3+
const {existsSync} = require(`fs`);
4+
const {createRequire, register} = require(`module`);
5+
const {resolve} = require(`path`);
6+
const {pathToFileURL} = require(`url`);
7+
8+
const relPnpApiPath = "../../../../../../.pnp.cjs";
9+
10+
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
11+
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
12+
const absRequire = createRequire(absPnpApiPath);
13+
14+
const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
15+
const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
16+
17+
if (existsSync(absPnpApiPath)) {
18+
if (!process.versions.pnp) {
19+
// Setup the environment to be able to require eslint/rules
20+
require(absPnpApiPath).setup();
21+
if (isPnpLoaderEnabled && register) {
22+
register(pathToFileURL(absPnpLoaderPath));
23+
}
24+
}
25+
}
26+
27+
const wrapWithUserWrapper = existsSync(absUserWrapperPath)
28+
? exports => absRequire(absUserWrapperPath)(exports)
29+
: exports => exports;
30+
31+
// Defer to the real eslint/rules your application uses
32+
module.exports = wrapWithUserWrapper(absRequire(`eslint/rules`));

‎.yarn/sdks/eslint/lib/types/universal.d.ts

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/usr/bin/env node
2+
3+
const {existsSync} = require(`fs`);
4+
const {createRequire, register} = require(`module`);
5+
const {resolve} = require(`path`);
6+
const {pathToFileURL} = require(`url`);
7+
8+
const relPnpApiPath = "../../../../../.pnp.cjs";
9+
10+
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
11+
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
12+
const absRequire = createRequire(absPnpApiPath);
13+
14+
const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
15+
const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
16+
17+
if (existsSync(absPnpApiPath)) {
18+
if (!process.versions.pnp) {
19+
// Setup the environment to be able to require eslint/universal
20+
require(absPnpApiPath).setup();
21+
if (isPnpLoaderEnabled && register) {
22+
register(pathToFileURL(absPnpLoaderPath));
23+
}
24+
}
25+
}
26+
27+
const wrapWithUserWrapper = existsSync(absUserWrapperPath)
28+
? exports => absRequire(absUserWrapperPath)(exports)
29+
: exports => exports;
30+
31+
// Defer to the real eslint/universal your application uses
32+
module.exports = wrapWithUserWrapper(absRequire(`eslint/universal`));

‎.yarn/sdks/eslint/lib/types/use-at-your-own-risk.d.ts

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/usr/bin/env node
2+
3+
const {existsSync} = require(`fs`);
4+
const {createRequire, register} = require(`module`);
5+
const {resolve} = require(`path`);
6+
const {pathToFileURL} = require(`url`);
7+
8+
const relPnpApiPath = "../../../../../.pnp.cjs";
9+
10+
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
11+
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
12+
const absRequire = createRequire(absPnpApiPath);
13+
14+
const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
15+
const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
16+
17+
if (existsSync(absPnpApiPath)) {
18+
if (!process.versions.pnp) {
19+
// Setup the environment to be able to require eslint/use-at-your-own-risk
20+
require(absPnpApiPath).setup();
21+
if (isPnpLoaderEnabled && register) {
22+
register(pathToFileURL(absPnpLoaderPath));
23+
}
24+
}
25+
}
26+
27+
const wrapWithUserWrapper = existsSync(absUserWrapperPath)
28+
? exports => absRequire(absUserWrapperPath)(exports)
29+
: exports => exports;
30+
31+
// Defer to the real eslint/use-at-your-own-risk your application uses
32+
module.exports = wrapWithUserWrapper(absRequire(`eslint/use-at-your-own-risk`));

‎.yarn/sdks/eslint/lib/universal.js

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/usr/bin/env node
2+
3+
const {existsSync} = require(`fs`);
4+
const {createRequire, register} = require(`module`);
5+
const {resolve} = require(`path`);
6+
const {pathToFileURL} = require(`url`);
7+
8+
const relPnpApiPath = "../../../../.pnp.cjs";
9+
10+
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
11+
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
12+
const absRequire = createRequire(absPnpApiPath);
13+
14+
const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
15+
const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
16+
17+
if (existsSync(absPnpApiPath)) {
18+
if (!process.versions.pnp) {
19+
// Setup the environment to be able to require eslint/universal
20+
require(absPnpApiPath).setup();
21+
if (isPnpLoaderEnabled && register) {
22+
register(pathToFileURL(absPnpLoaderPath));
23+
}
24+
}
25+
}
26+
27+
const wrapWithUserWrapper = existsSync(absUserWrapperPath)
28+
? exports => absRequire(absUserWrapperPath)(exports)
29+
: exports => exports;
30+
31+
// Defer to the real eslint/universal your application uses
32+
module.exports = wrapWithUserWrapper(absRequire(`eslint/universal`));

‎.yarn/sdks/eslint/package.json

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,27 @@
11
{
22
"name": "eslint",
3-
"version": "8.57.1-sdk",
3+
"version": "9.17.0-sdk",
44
"main": "./lib/api.js",
55
"type": "commonjs",
66
"bin": {
77
"eslint": "./bin/eslint.js"
88
},
99
"exports": {
10+
".": {
11+
"types": "./lib/types/index.d.ts",
12+
"default": "./lib/api.js"
13+
},
1014
"./package.json": "./package.json",
11-
".": "./lib/api.js",
12-
"./use-at-your-own-risk": "./lib/unsupported-api.js"
15+
"./use-at-your-own-risk": {
16+
"types": "./lib/types/use-at-your-own-risk.d.ts",
17+
"default": "./lib/unsupported-api.js"
18+
},
19+
"./rules": {
20+
"types": "./lib/types/rules/index.d.ts"
21+
},
22+
"./universal": {
23+
"types": "./lib/types/universal.d.ts",
24+
"default": "./lib/universal.js"
25+
}
1326
}
1427
}

‎.yarn/sdks/prettier/bin/prettier.cjs

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/usr/bin/env node
2+
3+
const {existsSync} = require(`fs`);
4+
const {createRequire, register} = require(`module`);
5+
const {resolve} = require(`path`);
6+
const {pathToFileURL} = require(`url`);
7+
8+
const relPnpApiPath = "../../../../.pnp.cjs";
9+
10+
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
11+
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
12+
const absRequire = createRequire(absPnpApiPath);
13+
14+
const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
15+
const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
16+
17+
if (existsSync(absPnpApiPath)) {
18+
if (!process.versions.pnp) {
19+
// Setup the environment to be able to require prettier/bin/prettier.cjs
20+
require(absPnpApiPath).setup();
21+
if (isPnpLoaderEnabled && register) {
22+
register(pathToFileURL(absPnpLoaderPath));
23+
}
24+
}
25+
}
26+
27+
const wrapWithUserWrapper = existsSync(absUserWrapperPath)
28+
? exports => absRequire(absUserWrapperPath)(exports)
29+
: exports => exports;
30+
31+
// Defer to the real prettier/bin/prettier.cjs your application uses
32+
module.exports = wrapWithUserWrapper(absRequire(`prettier/bin/prettier.cjs`));

‎.yarn/sdks/prettier/index.js ‎.yarn/sdks/prettier/index.cjs

File renamed without changes.

‎.yarn/sdks/prettier/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "prettier",
3-
"version": "2.8.8-sdk",
4-
"main": "./index.js",
3+
"version": "3.4.2-sdk",
4+
"main": "./index.cjs",
55
"type": "commonjs",
6-
"bin": "./bin-prettier.js"
6+
"bin": "./bin/prettier.cjs"
77
}

‎.yarn/sdks/typescript/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "typescript",
3-
"version": "5.1.6-sdk",
3+
"version": "5.7.2-sdk",
44
"main": "./lib/typescript.js",
55
"type": "commonjs",
66
"bin": {

‎eslint.config.mjs

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
import { FlatCompat } from "@eslint/eslintrc"
2+
import js from "@eslint/js"
3+
import typescriptEslint from "@typescript-eslint/eslint-plugin"
4+
import tsParser from "@typescript-eslint/parser"
5+
import react from "eslint-plugin-react"
6+
import globals from "globals"
7+
import path from "node:path"
8+
import { fileURLToPath } from "node:url"
9+
10+
const __filename = fileURLToPath(import.meta.url)
11+
const __dirname = path.dirname(__filename)
12+
const compat = new FlatCompat({
13+
baseDirectory: __dirname,
14+
recommendedConfig: js.configs.recommended,
15+
allConfig: js.configs.all,
16+
})
17+
18+
export default [
19+
...compat.extends(
20+
"eslint:recommended",
21+
"plugin:react/recommended",
22+
"plugin:@typescript-eslint/recommended"
23+
),
24+
{
25+
plugins: {
26+
react,
27+
"@typescript-eslint": typescriptEslint,
28+
},
29+
30+
languageOptions: {
31+
globals: {
32+
...globals.browser,
33+
},
34+
35+
parser: tsParser,
36+
ecmaVersion: 12,
37+
sourceType: "module",
38+
39+
parserOptions: {
40+
ecmaFeatures: {
41+
jsx: true,
42+
},
43+
},
44+
},
45+
46+
settings: {
47+
react: {
48+
version: "detect",
49+
},
50+
},
51+
},
52+
]

‎package.json

+11-7
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,11 @@
5858
"devDependencies": {
5959
"@babel/core": "^7.26.0",
6060
"@babel/preset-react": "^7.26.3",
61-
"@testing-library/react": "^14.3.1",
61+
"@eslint/eslintrc": "^3.2.0",
62+
"@eslint/js": "^9.17.0",
63+
"@testing-library/react": "^16.1.0",
6264
"@types/canvas-confetti": "^1.9.0",
65+
"@types/eslint__eslintrc": "^2.1.2",
6366
"@types/events": "^3.0.3",
6467
"@types/file-saver": "^2.0.7",
6568
"@types/jest": "^29.5.14",
@@ -70,23 +73,24 @@
7073
"@types/react-redux": "^7.1.34",
7174
"@types/toposort": "^2.0.7",
7275
"@types/webpack-bundle-analyzer": "^4.7.0",
73-
"@typescript-eslint/eslint-plugin": "^5.62.0",
74-
"@typescript-eslint/parser": "^5.62.0",
76+
"@typescript-eslint/eslint-plugin": "^8.18.2",
77+
"@typescript-eslint/parser": "^8.18.2",
7578
"@yarnpkg/sdks": "^3.2.0",
7679
"ajv-json-loader": "^0.2.0",
7780
"babel-jest": "^29.7.0",
7881
"babel-preset-gatsby": "^3.14.0",
79-
"eslint": "^8.57.1",
82+
"eslint": "^9.17.0",
8083
"eslint-plugin-react": "^7.37.3",
8184
"gatsby-cli": "5.14.0",
85+
"globals": "^15.14.0",
8286
"identity-obj-proxy": "^3.0.0",
8387
"jest": "^29.7.0",
8488
"jest-environment-jsdom": "^29.7.0",
8589
"jsdom": "^22.1.0",
86-
"prettier": "^2.8.8",
87-
"rimraf": "^5.0.10",
90+
"prettier": "^3.4.2",
91+
"rimraf": "^6.0.1",
8892
"ts-jest": "^29.2.5",
89-
"typescript": "~5.1.6",
93+
"typescript": "~5.7.2",
9094
"webpack-bundle-analyzer": "^4.10.2"
9195
},
9296
"packageManager": "[email protected]"

0 commit comments

Comments
 (0)