From 6f7be751b764d44ad41a96f41d1d601cddd5dd39 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 26 Sep 2023 14:23:51 +0200 Subject: [PATCH 1/3] fix(scripts-ts-node): disable ts checks when invoking ts-node/register untill swc works --- scripts/ts-node/register.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/ts-node/register.js b/scripts/ts-node/register.js index fc44e6548a186a..3dd2ee26c7bbff 100644 --- a/scripts/ts-node/register.js +++ b/scripts/ts-node/register.js @@ -3,6 +3,9 @@ const tsNode = require('ts-node'); tsNode.register({ // https://github.com/TypeStrong/ts-node#skipproject - don't read tsconfig within ts-node skipProject: true, + // @deprecated: we cannot use this until new version of ts-node is released https://github.com/TypeStrong/ts-node/pull/2062 // swc: true, + // remove this once `swc` will start working again + transpileOnly: true, }); From d4636272edbefcd8f6f896e14fc2d29e381cba58 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 26 Sep 2023 14:25:20 +0200 Subject: [PATCH 2/3] refactor(scripts-beachball): hoist ts in-memory transpilation to 1 module --- scripts/beachball/package.json | 3 ++- scripts/beachball/register.js | 10 ++++++++++ scripts/beachball/release-v8.config.js | 6 ++---- scripts/beachball/release-vNext.config.js | 6 ++---- 4 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 scripts/beachball/register.js diff --git a/scripts/beachball/package.json b/scripts/beachball/package.json index c608ae36c8d086..a1bc631431ae88 100644 --- a/scripts/beachball/package.json +++ b/scripts/beachball/package.json @@ -12,6 +12,7 @@ }, "dependencies": { "@fluentui/scripts-github": "*", - "@fluentui/scripts-monorepo": "*" + "@fluentui/scripts-monorepo": "*", + "@fluentui/scripts-ts-node": "*" } } diff --git a/scripts/beachball/register.js b/scripts/beachball/register.js new file mode 100644 index 00000000000000..9b2ecef82cd3d5 --- /dev/null +++ b/scripts/beachball/register.js @@ -0,0 +1,10 @@ +exports.register = register; + +/** + * in memory TypeScript compilation helper + */ +function register() { + if (process.env.NODE_ENV !== 'test') { + require('@fluentui/scripts-ts-node/register'); + } +} diff --git a/scripts/beachball/release-v8.config.js b/scripts/beachball/release-v8.config.js index 1fdb3acd047c84..07fe6af53775a7 100644 --- a/scripts/beachball/release-v8.config.js +++ b/scripts/beachball/release-v8.config.js @@ -1,11 +1,9 @@ // @ts-check -if (process.env.NODE_ENV !== 'test') { - require('../ts-node/register'); -} +require('./register').register(); -const { getConfig } = require('./utils'); const { config: sharedConfig } = require('./shared.config'); +const { getConfig } = require('./utils'); const { scope } = getConfig({ version: 'v8' }); diff --git a/scripts/beachball/release-vNext.config.js b/scripts/beachball/release-vNext.config.js index a65641786b1bba..0d546e68ef2130 100644 --- a/scripts/beachball/release-vNext.config.js +++ b/scripts/beachball/release-vNext.config.js @@ -1,9 +1,7 @@ -if (process.env.NODE_ENV !== 'test') { - require('../ts-node/register'); -} +require('./register').register(); -const { getConfig } = require('./utils'); const { config: sharedConfig } = require('./shared.config'); +const { getConfig } = require('./utils'); const { scope, groupConfig } = getConfig({ version: 'vNext' }); From 0c7623467b1b8106dddf97d5a38166c08b903bcc Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 26 Sep 2023 15:12:59 +0200 Subject: [PATCH 3/3] fixup! refactor(scripts-beachball): hoist ts in-memory transpilation to 1 module --- scripts/beachball/register.js | 1 + scripts/beachball/release-v8.config.js | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/beachball/register.js b/scripts/beachball/register.js index 9b2ecef82cd3d5..a3c902866714a1 100644 --- a/scripts/beachball/register.js +++ b/scripts/beachball/register.js @@ -5,6 +5,7 @@ exports.register = register; */ function register() { if (process.env.NODE_ENV !== 'test') { + // @ts-expect-error - ts-node/register doesn't provide types so this would error require('@fluentui/scripts-ts-node/register'); } } diff --git a/scripts/beachball/release-v8.config.js b/scripts/beachball/release-v8.config.js index 07fe6af53775a7..a1f54c75a81c57 100644 --- a/scripts/beachball/release-v8.config.js +++ b/scripts/beachball/release-v8.config.js @@ -1,5 +1,3 @@ -// @ts-check - require('./register').register(); const { config: sharedConfig } = require('./shared.config');