Merge pull request #477 from dcastil/renovate/rollup-plugin-typescrip…

…t-12.x Update dependency @rollup/plugin-typescript to v12
dcastil · Oct 1, 2024 · 63b477e · 63b477e
2 parents a7f4311 + 4881dd8
commit 63b477e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -67,7 +67,7 @@
         "@codspeed/vitest-plugin": "^3.1.1",
         "@rollup/plugin-babel": "^6.0.4",
         "@rollup/plugin-node-resolve": "^15.3.0",
-        "@rollup/plugin-typescript": "^11.1.6",
+        "@rollup/plugin-typescript": "^12.1.0",
         "@typescript-eslint/eslint-plugin": "^8.8.0",
         "@typescript-eslint/parser": "^8.8.0",
         "@vitest/coverage-v8": "^2.1.1",

diff --git a/scripts/rollup.config.mjs b/scripts/rollup.config.mjs
@@ -26,15 +26,7 @@ export default defineConfig([
             }),
         ],
         external: /node_modules/,
-        plugins: [
-            del({ targets: 'dist/*' }),
-            nodeResolve(),
-            typescript({
-                compilerOptions: {
-                    noEmitOnError: true,
-                },
-            }),
-        ],
+        plugins: [del({ targets: 'dist/*' }), nodeResolve(), typescript()],
     },
 
     // es5 entry point
@@ -57,10 +49,10 @@ export default defineConfig([
             nodeResolve(),
             typescript({
                 compilerOptions: {
-                    noEmitOnError: true,
                     // We don't want to emit declaration files more than once
                     declaration: false,
                     declarationMap: false,
+                    outDir: 'dist/es5/types',
                 },
             }),
         ],

diff --git a/tsconfig.json b/tsconfig.json
@@ -13,13 +13,14 @@
         // Emit
         "declaration": true,
         "noEmit": true,
-        "outDir": "types",
+        "outDir": "dist/types",
         "sourceMap": true,
         // Interop Constraints
         "esModuleInterop": true,
         "forceConsistentCasingInFileNames": true,
         // Language and Environment
-        "target": "ESNext"
+        "target": "ESNext",
+        "noEmitOnError": true
     },
     "include": ["src/**/*"]
 }
diff --git a/yarn.lock b/yarn.lock
@@ -1226,10 +1226,10 @@
     is-module "^1.0.0"
     resolve "^1.22.1"
 
-"@rollup/plugin-typescript@^11.1.6":
-  version "11.1.6"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-11.1.6.tgz#724237d5ec12609ec01429f619d2a3e7d4d1b22b"
-  integrity sha512-R92yOmIACgYdJ7dJ97p4K69I8gg6IEHt8M7dUBxN3W6nrO8uUxX5ixl0yU/N3aZTi8WhPuICvOHXQvF6FaykAA==
+"@rollup/plugin-typescript@^12.1.0":
+  version "12.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-12.1.0.tgz#2b357972091d1a8f71b8c9ce5a6e95fe1473bf77"
+  integrity sha512-Kzs8KGJofe7cfTRODsnG1jNGxSvU8gVoNNd7Z/QaY25AYwe2LSSUpx/kPxqF38NYkpR8de3m51r9uwJpDlz6dg==
   dependencies:
     "@rollup/pluginutils" "^5.1.0"
     resolve "^1.22.1"