From d4874d93c5c074931ddbacb4d584a8734cb19fd8 Mon Sep 17 00:00:00 2001 From: EGOIST <0x142857@gmail.com> Date: Fri, 10 Jul 2020 22:47:47 +0800 Subject: [PATCH 1/2] chore(deps): update tsup --- package.json | 2 +- yarn.lock | 42 +++++++----------------------------------- 2 files changed, 8 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index 3c3b6277..301e17a4 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "resolve": "^1.17.0", "rollup-plugin-hashbang": "^2.2.2", "ts-jest": "^26.1.1", - "tsup": "^1.5.1", + "tsup": "^2.0.0", "typescript": "^3.9.6" } } diff --git a/yarn.lock b/yarn.lock index d85179ec..8c410387 100644 --- a/yarn.lock +++ b/yarn.lock @@ -498,15 +498,6 @@ estree-walker "^1.0.1" picomatch "^2.2.2" -"@rollup/pluginutils@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b" - integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg== - dependencies: - "@types/estree" "0.0.39" - estree-walker "^1.0.1" - picomatch "^2.2.2" - "@sinonjs/commons@^1.7.0": version "1.7.2" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.2.tgz#505f55c74e0272b43f6c52d81946bed7058fc0e2" @@ -1317,11 +1308,6 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -esbuild@^0.5.3: - version "0.5.26" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.5.26.tgz#0868e8f3e0938c6cb9a8c93e74f85900eff1a071" - integrity sha512-OopLmIbQNOWBWMBoOtHjDEaIiTI2okEpRkbiKccfatnXJtsGazwWhR0dmvY8ynjLx/BOPS9mQ6QFl7J1BQCcaQ== - escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -3155,14 +3141,6 @@ rollup-plugin-dts@^1.4.7: optionalDependencies: "@babel/code-frame" "^7.8.3" -rollup-plugin-esbuild@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-esbuild/-/rollup-plugin-esbuild-2.1.0.tgz#8e12337c63a5b1144e0c5e8adf2f1568ad4d7d69" - integrity sha512-XYqmwk4X0SPEExgilARbre/PplhLtE3q6wiZtfgIbwxJOVGXWec1Bkcux7TFTHGX3TQozzqEASTsRJCt7py/5Q== - dependencies: - "@rollup/pluginutils" "^3.1.0" - esbuild "^0.5.3" - rollup-plugin-hashbang@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/rollup-plugin-hashbang/-/rollup-plugin-hashbang-2.2.2.tgz#971fc49b452e63f9dfdc75f79ae7256b3485e750" @@ -3181,13 +3159,6 @@ rollup-plugin-typescript2@^0.27.1: resolve "1.15.1" tslib "1.11.2" -rollup@^2.18.0: - version "2.21.0" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.21.0.tgz#d2e114533812043d5c9b7b0a83f1b2a242e4e1d6" - integrity sha512-BEGgy+wSzux7Ycq58pRiWEOBZaXRXTuvzl1gsm7gqmsAHxkWf9nyA5V2LN9fGSHhhDQd0/C13iRzSh4bbIpWZQ== - optionalDependencies: - fsevents "~2.1.2" - rollup@^2.20.0: version "2.20.0" resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.20.0.tgz#7456fed8424a5247954958751642e9fdd0ad7485" @@ -3645,15 +3616,16 @@ tslib@^2.0.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.0.tgz#18d13fc2dce04051e20f074cc8387fd8089ce4f3" integrity sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g== -tsup@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/tsup/-/tsup-1.5.1.tgz#34022d3e7a2e6dc0f3d6b6399c12ac54f9182c73" - integrity sha512-H4CpUz5GAiS36HhJSrCTbNPOl1V0FT1WkMb1mnygmU67l7f4fpG9MsxeH7dHzT7Q3pyCZapBscnG5h7DuUnU7g== +tsup@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/tsup/-/tsup-2.0.0.tgz#90dfe94c11b5b5a716413a23849fb7657e33415c" + integrity sha512-fT8Ury8cfvxCCA2gJ05dB7h2vYkky++XTHTePiND9roJ5mtpFV7LArGcpZrrwdF+YaqoYjwYByv4w+vREUIcNg== dependencies: joycon "^2.2.5" - rollup "^2.18.0" + rollup "^2.20.0" rollup-plugin-dts "^1.4.7" - rollup-plugin-esbuild "^2.1.0" + rollup-plugin-typescript2 "^0.27.1" + tslib "^2.0.0" tunnel-agent@^0.6.0: version "0.6.0" From b51c28582cb5728b790f1ea0982c3cc89c21d943 Mon Sep 17 00:00:00 2001 From: EGOIST <0x142857@gmail.com> Date: Fri, 10 Jul 2020 22:50:58 +0800 Subject: [PATCH 2/2] fix: namedExports option is no longer needed in commonjs plugin --- src/index.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/index.ts b/src/index.ts index 609b1e97..bbecf93a 100644 --- a/src/index.ts +++ b/src/index.ts @@ -75,7 +75,7 @@ export async function createRollupConfigs(files: string[], options: Options) { tsconfigOverride: { compilerOptions: { module: 'esnext', - } + }, }, tsconfig, }), @@ -87,10 +87,6 @@ export async function createRollupConfigs(files: string[], options: Options) { }), !dts && commonjsPlugin({ - namedExports: { - // commonjs plugin failed to detect named exports for `resolve`, TODO: report this bug - resolve: ['sync', 'isCore', 'default'], - }, // @ts-ignore wrong typing in @rollup/plugin-commonjs ignore: (name: string) => { if (!options.external) {