diff --git a/package.json b/package.json index c09a76e7..a241757d 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,6 @@ "devDependencies": { "@types/node": "catalog:", "cspell-ban-words": "catalog:", - "globals": "catalog:", "heading-case": "catalog:", "prettier": "catalog:", "rstack": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 67eb963e..136751c0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -23,8 +23,8 @@ catalogs: specifier: ~1.0.0-beta.3 version: 1.0.0-beta.3 '@rslint/core': - specifier: ~0.8.0 - version: 0.8.0 + specifier: ~0.8.1 + version: 0.8.1 '@rspress/core': specifier: ^2.0.19 version: 2.0.19 @@ -85,9 +85,6 @@ catalogs: fast-json-stable-stringify: specifier: 2.1.0 version: 2.1.0 - globals: - specifier: ^17.11.0 - version: 17.11.0 happy-dom: specifier: ^20.11.2 version: 20.11.2 @@ -162,9 +159,6 @@ importers: cspell-ban-words: specifier: 'catalog:' version: 0.0.4 - globals: - specifier: 'catalog:' - version: 17.11.0 heading-case: specifier: 'catalog:' version: 1.1.5 @@ -372,7 +366,7 @@ importers: version: 1.0.0-beta.3(typescript@7.0.2) '@rslint/core': specifier: 'catalog:' - version: 0.8.0 + version: 0.8.1 '@rstest/core': specifier: 'catalog:' version: 0.11.8(happy-dom@20.11.2) @@ -1330,8 +1324,8 @@ packages: typescript: optional: true - '@rslint/core@0.8.0': - resolution: {integrity: sha512-MfMC6lxiXoKPWsYRu9fuAxWA9mCD/I4E5Aa6Sl20a6q5w8r2C12fJM+bceC01AMGYuvWygKHqS3QBJdJHjniRw==} + '@rslint/core@0.8.1': + resolution: {integrity: sha512-cqpDcgJ8TgBC+I/OZkICze0sSNcsdjtxNCv01fQTYvgIvBkwbhNlg4celD3XEPfA8B2B2H/woYgeaX0IPEeTMA==} hasBin: true peerDependencies: jiti: ^2.7.0 @@ -1339,47 +1333,47 @@ packages: jiti: optional: true - '@rslint/native-darwin-arm64@0.8.0': - resolution: {integrity: sha512-Bo6kXL1/TkjVUl6maZ3Sw+JEnZUkgpUD35v06jyBTcjpxlXE6yqFj66NAzB/G2CVu220ADp/FEE7l2Kocrefhg==} + '@rslint/native-darwin-arm64@0.8.1': + resolution: {integrity: sha512-HlucYn3RLELMHRjlvKcr0vPlE/2RUs6BVn5ClRKFcLShON4j+q8NWaIPHwY5zrQjqq7GJxX3b/7G9skU+TrQ2w==} cpu: [arm64] os: [darwin] - '@rslint/native-darwin-x64@0.8.0': - resolution: {integrity: sha512-F5pabdH7dluxoj7PGuQjPYuoNU+yxnctcJzqrb/CZ122FLP3uJPrbiLufh+ZF9e5ui700rNyb7macJqnHlBV2w==} + '@rslint/native-darwin-x64@0.8.1': + resolution: {integrity: sha512-HV4FOwq3ofuoMkUxjEyGvaOGyr79OzFhAIpMcT9uOO6BxEA/PndepwBAPmkBt33aewm2oPKM2khsC582XTsxew==} cpu: [x64] os: [darwin] - '@rslint/native-linux-arm64-gnu@0.8.0': - resolution: {integrity: sha512-SSgSjyaeXI032Wk8bq6VmkLQTWOEqHZH5MWAk3831pd/G2rWr2XcoDi5Wf6w0o2rSCeYzkYbIejOePYwIKT4Lg==} + '@rslint/native-linux-arm64-gnu@0.8.1': + resolution: {integrity: sha512-O9kvvw2O7WAzeBAp7KSfXVbyl4Q4hAY1rUSRpeJp9hOY3yQUipE98qF29QicbXTRsoZZooMTmrjV/0EiYGL8OA==} cpu: [arm64] os: [linux] libc: [glibc] - '@rslint/native-linux-arm64-musl@0.8.0': - resolution: {integrity: sha512-50VDZQFAc9kp6rbOUOjyppVjC3d3AdbOJyA6JxlhK3mp8a/8sPIqWG0BlfcN/7ZpwdZrFsQt2Ds+0yMXITfu5A==} + '@rslint/native-linux-arm64-musl@0.8.1': + resolution: {integrity: sha512-I92YjEMPcdeXz29rGuWR7kKjlek3LG/kcLHaBop6ucYkAXbuwdCwALM/JKxjcnRjoEZA3qR4QCRu92Llbzh+Ig==} cpu: [arm64] os: [linux] libc: [musl] - '@rslint/native-linux-x64-gnu@0.8.0': - resolution: {integrity: sha512-wfc/UfnuTBAofwLPK5MLB2Hus1YYnsxP2MVchp380fUvMfQuGFPzz1WOAUY66zqrsrDKpUJsh3V1bx7c8DTlJA==} + '@rslint/native-linux-x64-gnu@0.8.1': + resolution: {integrity: sha512-9uh4XygsKs2lj7JWM2yi92qjrgrXM7slppAgTQnFfkiRoKASVt4M2anSiJfs2v5hU3UhsmVotXAOYtWoV5Hd3g==} cpu: [x64] os: [linux] libc: [glibc] - '@rslint/native-linux-x64-musl@0.8.0': - resolution: {integrity: sha512-MTYcAMz6IZWb6ZmLo12pakCBA8mS3EW9cOI0jd3At6vs0Yia9YbeOAUiWbIC4Z9yyp75b8ZQCQMRSnY6rDnbaA==} + '@rslint/native-linux-x64-musl@0.8.1': + resolution: {integrity: sha512-pcWlxs9ZLaETAoDaYcO6f8jeuE+nZliIVrhCJ1eWX+aTB+WPKHVHK6dFMPjxqsvUtwbK1zfpTeo8rOaeGRrSfQ==} cpu: [x64] os: [linux] libc: [musl] - '@rslint/native-win32-arm64-msvc@0.8.0': - resolution: {integrity: sha512-hids2jgNWBxZf2mSBLZJxubWRLWlJapEfeJHVokzjpRpBZZNv7O06enoyXSb4Lswff9WaHssIqu1sfZIc9lC2g==} + '@rslint/native-win32-arm64-msvc@0.8.1': + resolution: {integrity: sha512-GGRcKGBOQs7WsxSfXWRQnY15nRyikaDajWoefhKnYVj+AMg6BEWWsdH3Q2xOOuVMGNCC/SoXUAGb9cGpV7Smdg==} cpu: [arm64] os: [win32] - '@rslint/native-win32-x64-msvc@0.8.0': - resolution: {integrity: sha512-bun7uURKl6NdChwmw/i2mk3Yj9klZQyh1uRbIQG0RDEJ9oTIbU5M3c7K5sd/Rukat0TVCGgbBAzR+YB0DAXPZQ==} + '@rslint/native-win32-x64-msvc@0.8.1': + resolution: {integrity: sha512-rokvuC3MKTNMbGU5eh/p6a715xzl1yZvjh9gQByNPKGHrF3OUmqN1c6QGCtlNU8HGHekvMS9dUNzjTCoMenZjQ==} cpu: [x64] os: [win32] @@ -2261,10 +2255,6 @@ packages: git-hooks-list@4.2.1: resolution: {integrity: sha512-WNvqJjOxxs/8ZP9+DWdwWJ7cDsd60NHf39XnD82pDVrKO5q7xfPqpkK6hwEAmBa/ZSEE4IOoR75EzbbIuwGlMw==} - globals@17.11.0: - resolution: {integrity: sha512-Z2I8hM+PbJDXQDq3Icgpzv+mPdwr68iZUU9d5WW4FuXfDUQfkZaZuvjMv42/5crNyw154+9+VWXbYrUgDXbxNw==} - engines: {node: '>=18'} - happy-dom@20.11.2: resolution: {integrity: sha512-7MB+bJLkxu3SowAfBJbjW+c55kNz5tkR45gu2qzrxznezhLeN5YIlJbwUgSzlGc+qWoZ8Ykg71H5ezz69xixrw==} engines: {node: '>=20.0.0'} @@ -3943,41 +3933,41 @@ snapshots: - '@module-federation/runtime-tools' - core-js - '@rslint/core@0.8.0': + '@rslint/core@0.8.1': dependencies: picomatch: 4.0.5 optionalDependencies: - '@rslint/native-darwin-arm64': 0.8.0 - '@rslint/native-darwin-x64': 0.8.0 - '@rslint/native-linux-arm64-gnu': 0.8.0 - '@rslint/native-linux-arm64-musl': 0.8.0 - '@rslint/native-linux-x64-gnu': 0.8.0 - '@rslint/native-linux-x64-musl': 0.8.0 - '@rslint/native-win32-arm64-msvc': 0.8.0 - '@rslint/native-win32-x64-msvc': 0.8.0 + '@rslint/native-darwin-arm64': 0.8.1 + '@rslint/native-darwin-x64': 0.8.1 + '@rslint/native-linux-arm64-gnu': 0.8.1 + '@rslint/native-linux-arm64-musl': 0.8.1 + '@rslint/native-linux-x64-gnu': 0.8.1 + '@rslint/native-linux-x64-musl': 0.8.1 + '@rslint/native-win32-arm64-msvc': 0.8.1 + '@rslint/native-win32-x64-msvc': 0.8.1 - '@rslint/native-darwin-arm64@0.8.0': + '@rslint/native-darwin-arm64@0.8.1': optional: true - '@rslint/native-darwin-x64@0.8.0': + '@rslint/native-darwin-x64@0.8.1': optional: true - '@rslint/native-linux-arm64-gnu@0.8.0': + '@rslint/native-linux-arm64-gnu@0.8.1': optional: true - '@rslint/native-linux-arm64-musl@0.8.0': + '@rslint/native-linux-arm64-musl@0.8.1': optional: true - '@rslint/native-linux-x64-gnu@0.8.0': + '@rslint/native-linux-x64-gnu@0.8.1': optional: true - '@rslint/native-linux-x64-musl@0.8.0': + '@rslint/native-linux-x64-musl@0.8.1': optional: true - '@rslint/native-win32-arm64-msvc@0.8.0': + '@rslint/native-win32-arm64-msvc@0.8.1': optional: true - '@rslint/native-win32-x64-msvc@0.8.0': + '@rslint/native-win32-x64-msvc@0.8.1': optional: true '@rspack/binding-darwin-arm64@2.1.10': @@ -4714,8 +4704,6 @@ snapshots: git-hooks-list@4.2.1: {} - globals@17.11.0: {} - happy-dom@20.11.2: dependencies: '@types/node': 24.13.3 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index ff94a524..4d7e2214 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -17,7 +17,7 @@ catalog: '@rsbuild/plugin-react': '^2.1.0' '@rsbuild/plugin-sass': '^2.0.1' '@rslib/core': '~1.0.0-beta.3' - '@rslint/core': '~0.8.0' + '@rslint/core': '~0.8.1' '@rspress/core': '^2.0.19' '@rspress/plugin-client-redirects': '^2.0.19' '@rspress/plugin-sitemap': '^2.0.19' @@ -38,7 +38,6 @@ catalog: '@shikijs/transformers': '^4.4.3' 'cspell-ban-words': '^0.0.4' 'fast-json-stable-stringify': '2.1.0' - globals: '^17.11.0' 'happy-dom': '^20.11.2' 'heading-case': '^1.1.5' 'import-meta-resolve': '4.2.0' diff --git a/rstack.config.ts b/rstack.config.ts index 5555e567..c46a8517 100644 --- a/rstack.config.ts +++ b/rstack.config.ts @@ -1,8 +1,7 @@ // Configuration guide: https://rstack.rs/config import { define } from 'rstack'; -define.lint(async ({ js, ts, rstestPlugin }) => { - const { default: globals } = await import('globals'); +define.lint(({ globals, js, ts, rstestPlugin }) => { return [ js.configs.recommended, ts.configs.recommendedTypeChecked,