From 604b17e57d60fe365bdbcf873c8cf6cc77659984 Mon Sep 17 00:00:00 2001 From: Adam Shaw Date: Tue, 21 Jul 2020 18:22:08 -0400 Subject: [PATCH] upgrade rollup-plugin-dts, remove hack --- package.json | 2 +- rollup.packages.js | 8 -------- yarn.lock | 8 ++++---- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index a16873880c..24d252999c 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "postcss-loader": "^3.0.0", "postcss-nesting": "^7.0.1", "rollup": "^2.21.0", - "rollup-plugin-dts": "^1.4.8", + "rollup-plugin-dts": "^1.4.9", "rollup-plugin-postcss": "^3.1.3", "rollup-plugin-sourcemaps": "^0.6.2", "semver": "^7.3.2", diff --git a/rollup.packages.js b/rollup.packages.js index ea11284138..67278296bc 100644 --- a/rollup.packages.js +++ b/rollup.packages.js @@ -161,14 +161,6 @@ function fixDtsCodeOut() { */ code = code.replace(/VNode/g, 'VNode') - /* - rollup-plugin-dts sometimes does not correctly reduce nested type declarations, leaving something like this: - import("../toolbar-struct").ToolbarInput - relevant tickets: - https://github.com/Swatinem/rollup-plugin-dts/issues/106 - "Imported type within imported generic is not reduced" - */ - code = code.replace(/import\(([^)]*)\)\./g, '') - if (/\b(p?react)\b/.test(code)) { throw new Error('BAD reference to preact/react in DTS') } diff --git a/yarn.lock b/yarn.lock index fe82fb76a0..59d2253510 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17187,10 +17187,10 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" -rollup-plugin-dts@^1.4.8: - version "1.4.8" - resolved "https://registry.yarnpkg.com/rollup-plugin-dts/-/rollup-plugin-dts-1.4.8.tgz#3b0eadc285aede11c3f5ced72b56b5f7735df95c" - integrity sha512-2qHB4B3oaTyi1mDmqDzsRGKlev32v3EhMUAmc45Cn9eB22R7FsYDiigvT9XdM/oQzfd0qv5MkeZju8DP0nauiA== +rollup-plugin-dts@^1.4.9: + version "1.4.9" + resolved "https://registry.yarnpkg.com/rollup-plugin-dts/-/rollup-plugin-dts-1.4.9.tgz#936e4cc1139d81c5c0ce64dc1e9fe025bb3eccaf" + integrity sha512-ikEIpVKDhgNFouGQemmVeXojpxEhgSUCPrfEbiDMWg3YmDWYoNifmbmt5AiBqf3KHnv/6Se5+KSgDE11oVlZYg== optionalDependencies: "@babel/code-frame" "^7.10.4"