From fc683313630a729bf737fbb673deef1f65ff2628 Mon Sep 17 00:00:00 2001 From: Chris Krycho Date: Tue, 18 Apr 2023 16:52:33 -0600 Subject: [PATCH] Remove special-case lookup for TypeScript Since `broccoli-typescript-compiler` v8, we get `typescript` directly ourselves, and `broccoli-typescript-compiler` uses it as a peer dep rather than supplying it itself. Remove our custom lookup for it. --- broccoli/deprecated-features.js | 2 +- broccoli/features.js | 2 +- broccoli/typescript.js | 17 ----------------- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 broccoli/typescript.js diff --git a/broccoli/deprecated-features.js b/broccoli/deprecated-features.js index f8073718f02..b74799ec2fc 100644 --- a/broccoli/deprecated-features.js +++ b/broccoli/deprecated-features.js @@ -2,7 +2,7 @@ const fs = require('fs'); const path = require('path'); -const ts = require('./typescript'); +const ts = require('typescript'); /** * @param name {string} diff --git a/broccoli/features.js b/broccoli/features.js index 4ef04308558..6793ea573e1 100644 --- a/broccoli/features.js +++ b/broccoli/features.js @@ -1,7 +1,7 @@ 'use strict'; const fs = require('fs'); -const ts = require('./typescript'); +const ts = require('typescript'); function getFeatures() { let fileName = 'packages/@ember/canary-features/index.ts'; diff --git a/broccoli/typescript.js b/broccoli/typescript.js deleted file mode 100644 index e43043afa8b..00000000000 --- a/broccoli/typescript.js +++ /dev/null @@ -1,17 +0,0 @@ -'use strict'; - -const resolve = require('resolve'); -const path = require('path'); - -// our typescript version comes from a dependency in -// broccoli-typescript-compiler, so we look typescript up -// from there... -let broccoliTypescriptCompilerRoot = path.dirname( - resolve.sync('broccoli-typescript-compiler/package.json'), - { basedir: __dirname } -); -let typescriptEntryPoint = resolve.sync('typescript', { - basedir: broccoliTypescriptCompilerRoot, -}); - -module.exports = require(typescriptEntryPoint);