From 0e76b32aa55537056cd8541fbe297b2d41c792e8 Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Fri, 20 Mar 2020 10:17:42 -0700 Subject: [PATCH] fix(dev-infra): prep ts-circular-deps to load via node_modules (#36165) to run ts-circular-deps via installed node_modules, we needed to set the hashbang of the script to be a node environment, and discover the project directory based on where the script is run rather than the scripts file location. PR Close #36165 --- dev-infra/ts-circular-dependencies/BUILD.bazel | 1 + dev-infra/ts-circular-dependencies/index.ts | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dev-infra/ts-circular-dependencies/BUILD.bazel b/dev-infra/ts-circular-dependencies/BUILD.bazel index d7c8d6f7e6..d438b66bd5 100644 --- a/dev-infra/ts-circular-dependencies/BUILD.bazel +++ b/dev-infra/ts-circular-dependencies/BUILD.bazel @@ -6,6 +6,7 @@ ts_library( module_name = "@angular/dev-infra-private/ts-circular-dependencies", visibility = ["//dev-infra:__subpackages__"], deps = [ + "//dev-infra/utils:config", "@npm//@types/glob", "@npm//@types/node", "@npm//@types/yargs", diff --git a/dev-infra/ts-circular-dependencies/index.ts b/dev-infra/ts-circular-dependencies/index.ts index d3db5016b4..9dc9879c37 100644 --- a/dev-infra/ts-circular-dependencies/index.ts +++ b/dev-infra/ts-circular-dependencies/index.ts @@ -1,3 +1,4 @@ +#!/usr/bin/env node /** * @license * Copyright Google Inc. All Rights Reserved. @@ -17,7 +18,9 @@ import {Analyzer, ReferenceChain} from './analyzer'; import {compareGoldens, convertReferenceChainToGolden, Golden} from './golden'; import {convertPathToForwardSlash} from './file_system'; -const projectDir = join(__dirname, '../../'); +import {getRepoBaseDir} from '../utils/config'; + +const projectDir = getRepoBaseDir(); const packagesDir = join(projectDir, 'packages/'); // The default glob does not capture deprecated packages such as http, or the webworker platform. const defaultGlob =