From bfcef7732849303ac6a47fbfbf6e46d1ac2354f0 Mon Sep 17 00:00:00 2001 From: Jason Dent Date: Thu, 2 Mar 2023 11:27:56 +0100 Subject: [PATCH] chore: hoist rollup to root (#4265) --- .eslintrc.js | 2 +- package.json | 1 + packages/cspell-lib/package.json | 2 -- packages/cspell/package.json | 4 +--- pnpm-lock.yaml | 10 ++-------- .../cspell-io/test-cspell-io/rollup.config.mjs | 1 - .../test-cspell-lib-rollup/rollup.config.mjs | 1 - .../test-cspell-pipe-rollup/rollup.config.mjs | 1 - .../test-cspell-service-bus-rollup/rollup.config.mjs | 1 - .../test-cspell-strong-weak-map/rollup.config.mjs | 1 - .../test-cspell-trie-lib/rollup.config.mjs | 1 - .../test-cspell-types-rollup/rollup.config.mjs | 1 - .../test-dynamic-import-rollup/rollup.config.mjs | 1 - 13 files changed, 5 insertions(+), 22 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index c2f5aa18a75..d77cf79276d 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -100,7 +100,7 @@ const config = { }, }, { - files: ['vitest.config.*', '**/*.test.*', '**/test.*'], + files: ['vitest.config.*', '**/*.test.*', '**/test.*', '**/rollup.*'], rules: { 'node/no-extraneous-import': 'off', 'node/no-extraneous-require': 'off', diff --git a/package.json b/package.json index 807a2dfb422..b15efa91430 100644 --- a/package.json +++ b/package.json @@ -114,6 +114,7 @@ "nyc": "^15.1.0", "prettier": "^2.8.4", "rollup": "^3.18.0", + "rollup-plugin-dts": "^5.2.0", "shelljs": "^0.8.5", "shx": "^0.3.4", "ts-jest": "^29.0.5", diff --git a/packages/cspell-lib/package.json b/packages/cspell-lib/package.json index e1428b2dc66..219d14558ad 100644 --- a/packages/cspell-lib/package.json +++ b/packages/cspell-lib/package.json @@ -88,8 +88,6 @@ "expect": "^29.4.3", "jest": "^29.4.3", "lorem-ipsum": "^2.0.8", - "rollup": "^3.18.0", - "rollup-plugin-dts": "^5.2.0", "ts-jest": "^29.0.5" } } diff --git a/packages/cspell/package.json b/packages/cspell/package.json index cd0698314a5..bee6a55e850 100644 --- a/packages/cspell/package.json +++ b/packages/cspell/package.json @@ -105,8 +105,6 @@ "@types/micromatch": "^4.0.2", "@types/semver": "^7.3.13", "micromatch": "^4.0.5", - "minimatch": "^7.4.2", - "rollup": "^3.18.0", - "rollup-plugin-dts": "^5.2.0" + "minimatch": "^7.4.2" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2f928ca160a..7f4d380d069 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -36,6 +36,7 @@ importers: nyc: ^15.1.0 prettier: ^2.8.4 rollup: ^3.18.0 + rollup-plugin-dts: ^5.2.0 shelljs: ^0.8.5 shx: ^0.3.4 ts-jest: ^29.0.5 @@ -77,6 +78,7 @@ importers: nyc: 15.1.0 prettier: 2.8.4 rollup: 3.18.0 + rollup-plugin-dts: 5.2.0_fn2onl6nbsljlgjr3jlzr6w7we shelljs: 0.8.5 shx: 0.3.4 ts-jest: 29.0.5_kv2fdk7yz6jlbcjfldgcwh5vp4 @@ -155,8 +157,6 @@ importers: imurmurhash: ^0.1.4 micromatch: ^4.0.5 minimatch: ^7.4.2 - rollup: ^3.18.0 - rollup-plugin-dts: ^5.2.0 semver: ^7.3.8 strip-ansi: ^6.0.1 vscode-uri: ^3.0.7 @@ -187,8 +187,6 @@ importers: '@types/semver': 7.3.13 micromatch: 4.0.5 minimatch: 7.4.2 - rollup: 3.18.0 - rollup-plugin-dts: 5.2.0_fn2onl6nbsljlgjr3jlzr6w7we packages/cspell-bundled-dicts: specifiers: @@ -465,8 +463,6 @@ importers: lorem-ipsum: ^2.0.8 resolve-from: ^5.0.0 resolve-global: ^1.0.0 - rollup: ^3.18.0 - rollup-plugin-dts: ^5.2.0 ts-jest: ^29.0.5 vscode-languageserver-textdocument: ^1.0.8 vscode-uri: ^3.0.7 @@ -507,8 +503,6 @@ importers: expect: 29.4.3 jest: 29.4.3 lorem-ipsum: 2.0.8 - rollup: 3.18.0 - rollup-plugin-dts: 5.2.0_fn2onl6nbsljlgjr3jlzr6w7we ts-jest: 29.0.5_kv2fdk7yz6jlbcjfldgcwh5vp4 packages/cspell-pipe: diff --git a/test-packages/cspell-io/test-cspell-io/rollup.config.mjs b/test-packages/cspell-io/test-cspell-io/rollup.config.mjs index 69387aba403..4222218dd03 100644 --- a/test-packages/cspell-io/test-cspell-io/rollup.config.mjs +++ b/test-packages/cspell-io/test-cspell-io/rollup.config.mjs @@ -1,4 +1,3 @@ -/* eslint-disable node/no-extraneous-import */ import rollupPluginNodeResolve from '@rollup/plugin-node-resolve'; import rollupPluginTypescript from '@rollup/plugin-typescript'; import rollupPluginJson from '@rollup/plugin-json'; diff --git a/test-packages/cspell-lib/test-cspell-lib-rollup/rollup.config.mjs b/test-packages/cspell-lib/test-cspell-lib-rollup/rollup.config.mjs index e2306897662..3c16d20c6d7 100644 --- a/test-packages/cspell-lib/test-cspell-lib-rollup/rollup.config.mjs +++ b/test-packages/cspell-lib/test-cspell-lib-rollup/rollup.config.mjs @@ -1,4 +1,3 @@ -/* eslint-disable node/no-extraneous-import */ import rollupPluginNodeResolve from '@rollup/plugin-node-resolve'; import rollupPluginTypescript from '@rollup/plugin-typescript'; import alias from '@rollup/plugin-alias'; diff --git a/test-packages/cspell-pipe/test-cspell-pipe-rollup/rollup.config.mjs b/test-packages/cspell-pipe/test-cspell-pipe-rollup/rollup.config.mjs index b373ac900aa..8c35dc9876f 100644 --- a/test-packages/cspell-pipe/test-cspell-pipe-rollup/rollup.config.mjs +++ b/test-packages/cspell-pipe/test-cspell-pipe-rollup/rollup.config.mjs @@ -1,4 +1,3 @@ -/* eslint-disable node/no-extraneous-import */ import rollupPluginNodeResolve from '@rollup/plugin-node-resolve'; import rollupPluginTypescript from '@rollup/plugin-typescript'; import rollupPluginJson from '@rollup/plugin-json'; diff --git a/test-packages/cspell-service-bus/test-cspell-service-bus-rollup/rollup.config.mjs b/test-packages/cspell-service-bus/test-cspell-service-bus-rollup/rollup.config.mjs index b373ac900aa..8c35dc9876f 100644 --- a/test-packages/cspell-service-bus/test-cspell-service-bus-rollup/rollup.config.mjs +++ b/test-packages/cspell-service-bus/test-cspell-service-bus-rollup/rollup.config.mjs @@ -1,4 +1,3 @@ -/* eslint-disable node/no-extraneous-import */ import rollupPluginNodeResolve from '@rollup/plugin-node-resolve'; import rollupPluginTypescript from '@rollup/plugin-typescript'; import rollupPluginJson from '@rollup/plugin-json'; diff --git a/test-packages/cspell-strong-weak-map/test-cspell-strong-weak-map/rollup.config.mjs b/test-packages/cspell-strong-weak-map/test-cspell-strong-weak-map/rollup.config.mjs index ebe7f49644a..d239003baa6 100644 --- a/test-packages/cspell-strong-weak-map/test-cspell-strong-weak-map/rollup.config.mjs +++ b/test-packages/cspell-strong-weak-map/test-cspell-strong-weak-map/rollup.config.mjs @@ -1,4 +1,3 @@ -/* eslint-disable node/no-extraneous-import */ import rollupPluginNodeResolve from '@rollup/plugin-node-resolve'; import rollupPluginTypescript from '@rollup/plugin-typescript'; import rollupPluginJson from '@rollup/plugin-json'; diff --git a/test-packages/cspell-trie-lib/test-cspell-trie-lib/rollup.config.mjs b/test-packages/cspell-trie-lib/test-cspell-trie-lib/rollup.config.mjs index ebe7f49644a..d239003baa6 100644 --- a/test-packages/cspell-trie-lib/test-cspell-trie-lib/rollup.config.mjs +++ b/test-packages/cspell-trie-lib/test-cspell-trie-lib/rollup.config.mjs @@ -1,4 +1,3 @@ -/* eslint-disable node/no-extraneous-import */ import rollupPluginNodeResolve from '@rollup/plugin-node-resolve'; import rollupPluginTypescript from '@rollup/plugin-typescript'; import rollupPluginJson from '@rollup/plugin-json'; diff --git a/test-packages/cspell-types/test-cspell-types-rollup/rollup.config.mjs b/test-packages/cspell-types/test-cspell-types-rollup/rollup.config.mjs index 1c1ccb4e67c..e30ecc67df7 100644 --- a/test-packages/cspell-types/test-cspell-types-rollup/rollup.config.mjs +++ b/test-packages/cspell-types/test-cspell-types-rollup/rollup.config.mjs @@ -1,4 +1,3 @@ -/* eslint-disable node/no-extraneous-import */ import rollupPluginNodeResolve from '@rollup/plugin-node-resolve'; import rollupPluginTypescript from '@rollup/plugin-typescript'; import rollupPluginJson from '@rollup/plugin-json'; diff --git a/test-packages/dynamic-import/test-dynamic-import-rollup/rollup.config.mjs b/test-packages/dynamic-import/test-dynamic-import-rollup/rollup.config.mjs index a39fb34f1d1..055404be3c6 100644 --- a/test-packages/dynamic-import/test-dynamic-import-rollup/rollup.config.mjs +++ b/test-packages/dynamic-import/test-dynamic-import-rollup/rollup.config.mjs @@ -1,4 +1,3 @@ -/* eslint-disable node/no-extraneous-import */ import rollupPluginNodeResolve from '@rollup/plugin-node-resolve'; import rollupPluginTypescript from '@rollup/plugin-typescript'; import rollupPluginJson from '@rollup/plugin-json';