From 2e8e95031cf5c668381d430194d3a4117a9614e6 Mon Sep 17 00:00:00 2001 From: Jeroen Claassens Date: Sun, 19 Mar 2023 15:28:06 +0100 Subject: [PATCH] build: resolve issue with esbuild-plugin-version-injector not working (#9246) The issue was two-fold. First of all, tsup starts using swc when `emitDecoratorMetadata` and `@swc/core` is installed. `@swc/core` is installed transiently, which still causes the problem. Okay, sure, so we move the `emitDecoratorMetadata` option to just `packages/builders/tsconfig.json` seeing as the other packages don't use decorators anyway. But that still leaves solving the issue for builders. @vladfrangu ended up finding out that there was a bug in how esbuild handles plugins causing the esbuild-plugin-version-injector plugin to not get loaded. This is solved in v1.1.0 where the content is also replaced using the `onEnd` hook, if it wasn't replaced by `onLoad` yet. --- packages/builders/package.json | 2 +- packages/builders/tsconfig.json | 1 + packages/collection/package.json | 2 +- packages/next/package.json | 2 +- packages/rest/package.json | 2 +- packages/voice/package.json | 2 +- packages/ws/package.json | 2 +- tsconfig.json | 1 - yarn.lock | 20 ++++++++++---------- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/builders/package.json b/packages/builders/package.json index 11c34fbe9..0a3433722 100644 --- a/packages/builders/package.json +++ b/packages/builders/package.json @@ -70,7 +70,7 @@ "@vitest/coverage-c8": "^0.29.1", "cross-env": "^7.0.3", "downlevel-dts": "^0.11.0", - "esbuild-plugin-version-injector": "^1.0.3", + "esbuild-plugin-version-injector": "^1.1.0", "eslint": "^8.35.0", "eslint-config-neon": "^0.1.40", "eslint-formatter-pretty": "^4.1.0", diff --git a/packages/builders/tsconfig.json b/packages/builders/tsconfig.json index 10563526b..70f2d60b5 100644 --- a/packages/builders/tsconfig.json +++ b/packages/builders/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { + "emitDecoratorMetadata": true, "exactOptionalPropertyTypes": false }, "include": ["src/**/*.ts"] diff --git a/packages/collection/package.json b/packages/collection/package.json index 4b84b3d3a..26dd9ab49 100644 --- a/packages/collection/package.json +++ b/packages/collection/package.json @@ -56,7 +56,7 @@ "@types/node": "16.18.13", "@vitest/coverage-c8": "^0.29.1", "cross-env": "^7.0.3", - "esbuild-plugin-version-injector": "^1.0.3", + "esbuild-plugin-version-injector": "^1.1.0", "eslint": "^8.35.0", "eslint-config-neon": "^0.1.40", "eslint-formatter-pretty": "^4.1.0", diff --git a/packages/next/package.json b/packages/next/package.json index ed904001d..f74959ead 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -67,7 +67,7 @@ "@types/node": "18.14.2", "@vitest/coverage-c8": "^0.29.1", "cross-env": "^7.0.3", - "esbuild-plugin-version-injector": "^1.0.3", + "esbuild-plugin-version-injector": "^1.1.0", "eslint": "^8.35.0", "eslint-config-neon": "^0.1.40", "eslint-formatter-pretty": "^4.1.0", diff --git a/packages/rest/package.json b/packages/rest/package.json index 75b761d08..e982b6b64 100644 --- a/packages/rest/package.json +++ b/packages/rest/package.json @@ -68,7 +68,7 @@ "@types/node": "16.18.13", "@vitest/coverage-c8": "^0.29.1", "cross-env": "^7.0.3", - "esbuild-plugin-version-injector": "^1.0.3", + "esbuild-plugin-version-injector": "^1.1.0", "eslint": "^8.35.0", "eslint-config-neon": "^0.1.40", "eslint-formatter-pretty": "^4.1.0", diff --git a/packages/voice/package.json b/packages/voice/package.json index 462d32dff..42d882a43 100644 --- a/packages/voice/package.json +++ b/packages/voice/package.json @@ -68,7 +68,7 @@ "@types/jest": "^29.4.0", "@types/node": "16.18.13", "cross-env": "^7.0.3", - "esbuild-plugin-version-injector": "^1.0.3", + "esbuild-plugin-version-injector": "^1.1.0", "eslint": "^8.35.0", "eslint-config-neon": "^0.1.40", "eslint-formatter-pretty": "^4.1.0", diff --git a/packages/ws/package.json b/packages/ws/package.json index c41f62b4a..fa3dc4dbf 100644 --- a/packages/ws/package.json +++ b/packages/ws/package.json @@ -75,7 +75,7 @@ "@types/node": "16.18.13", "@vitest/coverage-c8": "^0.29.1", "cross-env": "^7.0.3", - "esbuild-plugin-version-injector": "^1.0.3", + "esbuild-plugin-version-injector": "^1.1.0", "eslint": "^8.35.0", "eslint-config-neon": "^0.1.40", "eslint-formatter-pretty": "^4.1.0", diff --git a/tsconfig.json b/tsconfig.json index ab1af7f5a..353b71229 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -35,7 +35,6 @@ "forceConsistentCasingInFileNames": true, // Language and Environment - "emitDecoratorMetadata": true, "experimentalDecorators": true, "lib": ["ESNext"], "target": "ES2021", diff --git a/yarn.lock b/yarn.lock index 547ff1990..15ef5a0ab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2066,7 +2066,7 @@ __metadata: cross-env: ^7.0.3 discord-api-types: ^0.37.35 downlevel-dts: ^0.11.0 - esbuild-plugin-version-injector: ^1.0.3 + esbuild-plugin-version-injector: ^1.1.0 eslint: ^8.35.0 eslint-config-neon: ^0.1.40 eslint-formatter-pretty: ^4.1.0 @@ -2089,7 +2089,7 @@ __metadata: "@types/node": 16.18.13 "@vitest/coverage-c8": ^0.29.1 cross-env: ^7.0.3 - esbuild-plugin-version-injector: ^1.0.3 + esbuild-plugin-version-injector: ^1.1.0 eslint: ^8.35.0 eslint-config-neon: ^0.1.40 eslint-formatter-pretty: ^4.1.0 @@ -2256,7 +2256,7 @@ __metadata: "@vitest/coverage-c8": ^0.29.1 cross-env: ^7.0.3 discord-api-types: ^0.37.35 - esbuild-plugin-version-injector: ^1.0.3 + esbuild-plugin-version-injector: ^1.1.0 eslint: ^8.35.0 eslint-config-neon: ^0.1.40 eslint-formatter-pretty: ^4.1.0 @@ -2324,7 +2324,7 @@ __metadata: "@vitest/coverage-c8": ^0.29.1 cross-env: ^7.0.3 discord-api-types: ^0.37.35 - esbuild-plugin-version-injector: ^1.0.3 + esbuild-plugin-version-injector: ^1.1.0 eslint: ^8.35.0 eslint-config-neon: ^0.1.40 eslint-formatter-pretty: ^4.1.0 @@ -2428,7 +2428,7 @@ __metadata: "@types/ws": ^8.5.4 cross-env: ^7.0.3 discord-api-types: ^0.37.35 - esbuild-plugin-version-injector: ^1.0.3 + esbuild-plugin-version-injector: ^1.1.0 eslint: ^8.35.0 eslint-config-neon: ^0.1.40 eslint-formatter-pretty: ^4.1.0 @@ -2519,7 +2519,7 @@ __metadata: "@vladfrangu/async_event_emitter": ^2.1.4 cross-env: ^7.0.3 discord-api-types: ^0.37.35 - esbuild-plugin-version-injector: ^1.0.3 + esbuild-plugin-version-injector: ^1.1.0 eslint: ^8.35.0 eslint-config-neon: ^0.1.40 eslint-formatter-pretty: ^4.1.0 @@ -10202,12 +10202,12 @@ __metadata: languageName: node linkType: hard -"esbuild-plugin-version-injector@npm:^1.0.3": - version: 1.0.3 - resolution: "esbuild-plugin-version-injector@npm:1.0.3" +"esbuild-plugin-version-injector@npm:^1.1.0": + version: 1.1.0 + resolution: "esbuild-plugin-version-injector@npm:1.1.0" dependencies: "@sapphire/result": ^2.6.0 - checksum: 12c9e8bf55fd6dc80979b93a1fc0acfc5e9d94b2fed5a0e645cdac768d73841750edccde2d21641619f7d9e143d248ec3400a11ebcda81dfecd7c36e9acc83d7 + checksum: 441a379eba7979eae9423056097aab7db9ea049967f322a3a65bec8fc361cf352d41425383954d0954a05cb38c3b5c035e8d11e629e78b9d85dae9f7b9360eea languageName: node linkType: hard