diff --git a/package.json b/package.json index b86d7566..090cc4ef 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "build:native": "nx run apex-ast-serializer:build:native", "install:native:dev": "tsx scripts/install-dev-executable.zx.mts", "install:native:ci": "tsx scripts/install-ci-executables.zx.mts", - "clean": "rimraf node_modules", + "clean": "del-cli node_modules", "all:clean": "pnpm run -r clean && pnpm run clean", "release": "npm version --force", "version": "tsx scripts/release.zx.mts" @@ -24,6 +24,7 @@ "@typescript-eslint/eslint-plugin": "7.18.0", "@typescript-eslint/parser": "7.18.0", "cross-env": "7.0.3", + "del-cli": "6.0.0", "eslint": "8.57.1", "eslint-config-airbnb-base": "15.0.0", "eslint-config-airbnb-typescript": "18.0.0", @@ -35,7 +36,6 @@ "prettier": "3.3.3", "prettier-plugin-java": "2.6.5", "prettier-plugin-organize-imports": "4.1.0", - "rimraf": "5.0.10", "semver": "7.6.3", "tsx": "4.19.2", "typescript": "5.6.3", diff --git a/packages/playground/package.json b/packages/playground/package.json index 4774d5e3..3050a578 100644 --- a/packages/playground/package.json +++ b/packages/playground/package.json @@ -4,9 +4,9 @@ "description": "Prettier Apex Playground Website", "main": "index.js", "scripts": { - "build": "rimraf dist && vite build", + "build": "del-cli dist && vite build", "build:watch": "vite build --watch", - "clean": "rimraf node_modules dist", + "clean": "del-cli node_modules dist", "lint": "eslint \"src/*.{ts,tsx}\" \"*.ts\"", "dev": "vite --open http://localhost:5173/", "prettier": "prettier --write \"src/**/*.{ts,tsx,css,html}\" \"./*.{md,ts}\"", diff --git a/packages/prettier-plugin-apex/package.json b/packages/prettier-plugin-apex/package.json index 2e6b172e..81ca5564 100644 --- a/packages/prettier-plugin-apex/package.json +++ b/packages/prettier-plugin-apex/package.json @@ -19,10 +19,10 @@ "/vendor" ], "scripts": { - "build": "rimraf dist && tsc --project tsconfig.prod.json && pnpm run build:standalone", + "build": "del-cli dist && tsc --project tsconfig.prod.json && pnpm run build:standalone", "build:dev": "tsc", "build:standalone": "vite build", - "clean": "rimraf node_modules dist", + "clean": "del-cli node_modules dist", "pretest": "pnpm run lint", "test": "vitest run", "test:parser:built-in": "cross-env APEX_PARSER=built-in pnpm test", @@ -46,7 +46,6 @@ "devDependencies": { "@types/wait-on": "5.3.4", "@vitest/coverage-v8": "2.1.4", - "rimraf": "5.0.10", "vite": "5.4.10", "vitest": "2.1.4" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 94dfaf9c..76e5665f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -26,6 +26,9 @@ importers: cross-env: specifier: 7.0.3 version: 7.0.3 + del-cli: + specifier: 6.0.0 + version: 6.0.0 eslint: specifier: 8.57.1 version: 8.57.1 @@ -59,9 +62,6 @@ importers: prettier-plugin-organize-imports: specifier: 4.1.0 version: 4.1.0(prettier@3.3.3)(typescript@5.6.3) - rimraf: - specifier: 5.0.10 - version: 5.0.10 semver: specifier: 7.6.3 version: 7.6.3 @@ -157,9 +157,6 @@ importers: '@vitest/coverage-v8': specifier: 2.1.4 version: 2.1.4(vitest@2.1.4(@types/node@22.8.1)) - rimraf: - specifier: 5.0.10 - version: 5.0.10 vite: specifier: 5.4.10 version: 5.4.10(@types/node@22.8.1) @@ -828,6 +825,10 @@ packages: '@sinclair/typebox@0.27.8': resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} + '@sindresorhus/merge-streams@2.3.0': + resolution: {integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==} + engines: {node: '>=18'} + '@tsconfig/node18@18.2.4': resolution: {integrity: sha512-5xxU8vVs9/FNcvm3gE07fPbn9tl6tqGGWA9tSlwsUEkBxtRnTsNmwrV8gasZ9F/EobaSv9+nu8AxUKccw77JpQ==} @@ -1247,6 +1248,15 @@ packages: resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==} engines: {node: '>= 0.4'} + del-cli@6.0.0: + resolution: {integrity: sha512-9nitGV2W6KLFyya4qYt4+9AKQFL+c0Ehj5K7V7IwlxTc6RMCfQUGY9E9pLG6e8TQjtwXpuiWIGGZb3mfVxyZkw==} + engines: {node: '>=18'} + hasBin: true + + del@8.0.0: + resolution: {integrity: sha512-R6ep6JJ+eOBZsBr9esiNN1gxFbZE4Q2cULkUSFumGYecAiS6qodDvcPx/sFuWHMNul7DWmrtoEOpYSm7o6tbSA==} + engines: {node: '>=18'} + delayed-stream@1.0.0: resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} engines: {node: '>=0.4.0'} @@ -1614,6 +1624,10 @@ packages: resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} engines: {node: '>=10'} + globby@14.0.2: + resolution: {integrity: sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==} + engines: {node: '>=18'} + good-listener@1.2.2: resolution: {integrity: sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==} @@ -1738,10 +1752,18 @@ packages: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} + is-path-cwd@3.0.0: + resolution: {integrity: sha512-kyiNFFLU0Ampr6SDZitD/DwUo4Zs1nSdnygUBqsu3LooL00Qvb5j+UnvApUn/TTj1J3OuE6BTdQ5rudKmU2ZaA==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + is-path-inside@3.0.3: resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==} engines: {node: '>=8'} + is-path-inside@4.0.0: + resolution: {integrity: sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==} + engines: {node: '>=12'} + is-regex@1.1.4: resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} engines: {node: '>= 0.4'} @@ -1908,6 +1930,10 @@ packages: resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==} engines: {node: '>=10'} + meow@13.2.0: + resolution: {integrity: sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==} + engines: {node: '>=18'} + merge2@1.4.1: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} @@ -2040,6 +2066,10 @@ packages: resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} engines: {node: '>=10'} + p-map@7.0.2: + resolution: {integrity: sha512-z4cYYMMdKHzw4O5UkWJImbZynVIo0lSGTXc7bzB1e/rrDqkgGUNysK/o4bTr+0+xKvvLoTyGqYC4Fgljy9qe1Q==} + engines: {node: '>=18'} + package-json-from-dist@1.0.1: resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==} @@ -2070,6 +2100,10 @@ packages: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} + path-type@5.0.0: + resolution: {integrity: sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==} + engines: {node: '>=12'} + pathe@1.1.2: resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==} @@ -2189,10 +2223,6 @@ packages: deprecated: Rimraf versions prior to v4 are no longer supported hasBin: true - rimraf@5.0.10: - resolution: {integrity: sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==} - hasBin: true - rollup@4.24.2: resolution: {integrity: sha512-do/DFGq5g6rdDhdpPq5qb2ecoczeK6y+2UAjdJ5trjQJj5f1AiVdLRWRc9A9/fFukfvJRgM0UXzxBIYMovm5ww==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} @@ -2264,6 +2294,10 @@ packages: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} + slash@5.1.0: + resolution: {integrity: sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==} + engines: {node: '>=14.16'} + source-map-js@1.2.1: resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} engines: {node: '>=0.10.0'} @@ -2429,6 +2463,10 @@ packages: undici-types@6.19.8: resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} + unicorn-magic@0.1.0: + resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==} + engines: {node: '>=18'} + update-browserslist-db@1.1.1: resolution: {integrity: sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==} hasBin: true @@ -3071,6 +3109,8 @@ snapshots: '@sinclair/typebox@0.27.8': {} + '@sindresorhus/merge-streams@2.3.0': {} + '@tsconfig/node18@18.2.4': {} '@tybys/wasm-util@0.9.0': @@ -3577,6 +3617,20 @@ snapshots: has-property-descriptors: 1.0.2 object-keys: 1.1.1 + del-cli@6.0.0: + dependencies: + del: 8.0.0 + meow: 13.2.0 + + del@8.0.0: + dependencies: + globby: 14.0.2 + is-glob: 4.0.3 + is-path-cwd: 3.0.0 + is-path-inside: 4.0.0 + p-map: 7.0.2 + slash: 5.1.0 + delayed-stream@1.0.0: {} delegate@3.2.0: {} @@ -4071,6 +4125,15 @@ snapshots: merge2: 1.4.1 slash: 3.0.0 + globby@14.0.2: + dependencies: + '@sindresorhus/merge-streams': 2.3.0 + fast-glob: 3.3.2 + ignore: 5.3.2 + path-type: 5.0.0 + slash: 5.1.0 + unicorn-magic: 0.1.0 + good-listener@1.2.2: dependencies: delegate: 3.2.0 @@ -4175,8 +4238,12 @@ snapshots: is-number@7.0.0: {} + is-path-cwd@3.0.0: {} + is-path-inside@3.0.3: {} + is-path-inside@4.0.0: {} + is-regex@1.1.4: dependencies: call-bind: 1.0.7 @@ -4347,6 +4414,8 @@ snapshots: dependencies: semver: 7.6.3 + meow@13.2.0: {} + merge2@1.4.1: {} micromatch@4.0.8: @@ -4522,6 +4591,8 @@ snapshots: dependencies: p-limit: 3.1.0 + p-map@7.0.2: {} + package-json-from-dist@1.0.1: {} parent-module@1.0.1: @@ -4543,6 +4614,8 @@ snapshots: path-type@4.0.0: {} + path-type@5.0.0: {} + pathe@1.1.2: {} pathval@2.0.0: {} @@ -4642,10 +4715,6 @@ snapshots: dependencies: glob: 7.2.3 - rimraf@5.0.10: - dependencies: - glob: 10.4.5 - rollup@4.24.2: dependencies: '@types/estree': 1.0.6 @@ -4740,6 +4809,8 @@ snapshots: slash@3.0.0: {} + slash@5.1.0: {} + source-map-js@1.2.1: {} sprintf-js@1.0.3: {} @@ -4920,6 +4991,8 @@ snapshots: undici-types@6.19.8: optional: true + unicorn-magic@0.1.0: {} + update-browserslist-db@1.1.1(browserslist@4.24.2): dependencies: browserslist: 4.24.2