From 775f9829a2bd013c622fb7ec23171184db206923 Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Tue, 16 Sep 2025 18:49:18 -0700
Subject: [PATCH 01/15] Enable syntax highlighting for pnpmfile.cjs tab
---
apps/lockfile-explorer-web/package.json | 1 +
.../containers/PackageJsonViewer/index.tsx | 26 +++++++++++++++++--
.../rush/browser-approved-packages.json | 4 +++
.../config/subspaces/default/pnpm-lock.yaml | 22 ++++++++++++++++
.../config/subspaces/default/repo-state.json | 2 +-
5 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/apps/lockfile-explorer-web/package.json b/apps/lockfile-explorer-web/package.json
index 59923434733..bc10ae7500c 100644
--- a/apps/lockfile-explorer-web/package.json
+++ b/apps/lockfile-explorer-web/package.json
@@ -14,6 +14,7 @@
"dependencies": {
"@reduxjs/toolkit": "~1.8.6",
"@rushstack/rush-themed-ui": "workspace:*",
+ "prism-react-renderer": "~2.4.1",
"react-dom": "~17.0.2",
"react-redux": "~8.0.4",
"react": "~17.0.2",
diff --git a/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/index.tsx b/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/index.tsx
index b7588f360a7..222ffb7f2e6 100644
--- a/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/index.tsx
+++ b/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/index.tsx
@@ -2,8 +2,10 @@
// See LICENSE in the project root for license information.
import React, { useCallback, useEffect, useState } from 'react';
+
+import { Highlight, themes } from 'prism-react-renderer';
+
import { readPnpmfileAsync, readPackageSpecAsync, readPackageJsonAsync } from '../../helpers/lfxApiClient';
-import styles from './styles.scss';
import { useAppDispatch, useAppSelector } from '../../store/hooks';
import { selectCurrentEntry } from '../../store/slices/entrySlice';
import type { IPackageJson } from '../../types/IPackageJson';
@@ -14,12 +16,32 @@ import { isEntryModified } from '../../helpers/isEntryModified';
import { ScrollArea, Tabs, Text } from '@rushstack/rush-themed-ui';
import { LfxGraphEntryKind } from '../../packlets/lfx-shared';
+import styles from './styles.scss';
+
const PackageView: { [key: string]: string } = {
PACKAGE_JSON: 'PACKAGE_JSON',
PACKAGE_SPEC: 'PACKAGE_SPEC',
PARSED_PACKAGE_JSON: 'PARSED_PACKAGE_JSON'
};
+const CodeBox = (props: { code: string }): JSX.Element => {
+ return (
+
+ {({ className, style, tokens, getLineProps, getTokenProps }) => (
+
+ {tokens.map((line, i) => (
+
+ {line.map((token, key) => (
+
+ ))}
+
+ ))}
+
+ )}
+
+ );
+};
+
export const PackageJsonViewer = (): JSX.Element => {
const dispatch = useAppDispatch();
const [packageJSON, setPackageJSON] = useState(undefined);
@@ -171,7 +193,7 @@ export const PackageJsonViewer = (): JSX.Element => {
);
}
- return {pnpmfile};
+ return ;
case PackageView.PARSED_PACKAGE_JSON:
if (!parsedPackageJSON)
return (
diff --git a/common/config/rush/browser-approved-packages.json b/common/config/rush/browser-approved-packages.json
index 15e248ddeba..103baa6d943 100644
--- a/common/config/rush/browser-approved-packages.json
+++ b/common/config/rush/browser-approved-packages.json
@@ -62,6 +62,10 @@
"name": "office-ui-fabric-core",
"allowedCategories": [ "libraries" ]
},
+ {
+ "name": "prism-react-renderer",
+ "allowedCategories": [ "libraries" ]
+ },
{
"name": "react",
"allowedCategories": [ "libraries", "tests", "vscode-extensions" ]
diff --git a/common/config/subspaces/default/pnpm-lock.yaml b/common/config/subspaces/default/pnpm-lock.yaml
index a7daffa4a97..fa35e21fefc 100644
--- a/common/config/subspaces/default/pnpm-lock.yaml
+++ b/common/config/subspaces/default/pnpm-lock.yaml
@@ -275,6 +275,9 @@ importers:
'@rushstack/rush-themed-ui':
specifier: workspace:*
version: link:../../libraries/rush-themed-ui
+ prism-react-renderer:
+ specifier: ~2.4.1
+ version: 2.4.1(react@17.0.2)
react:
specifier: ~17.0.2
version: 17.0.2
@@ -14045,6 +14048,10 @@ packages:
resolution: {integrity: sha512-nj39q0wAIdhwn7DGUyT9irmsKK1tV0bd5WFEhgpqNTMFZ8cE+jieuTphCW0tfdm47S2zVT5mr09B28b1chmQMA==}
dev: true
+ /@types/prismjs@1.26.5:
+ resolution: {integrity: sha512-AUZTa7hQ2KY5L7AmtSiqxlhWxb4ina0yd8hNbl4TWuqnv/pFP0nDMb3YrfSBf4hJVGLh2YEIBfKaBW/9UEl6IQ==}
+ dev: false
+
/@types/prop-types@15.7.11:
resolution: {integrity: sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==}
@@ -17245,6 +17252,11 @@ packages:
engines: {node: '>=6'}
dev: true
+ /clsx@2.1.1:
+ resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
+ engines: {node: '>=6'}
+ dev: false
+
/cluster-key-slot@1.1.2:
resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==}
engines: {node: '>=0.10.0'}
@@ -26152,6 +26164,16 @@ packages:
engines: {node: '>= 0.8'}
dev: true
+ /prism-react-renderer@2.4.1(react@17.0.2):
+ resolution: {integrity: sha512-ey8Ls/+Di31eqzUxC46h8MksNuGx/n0AAC8uKpwFau4RPDYLuE3EXTp8N8G2vX2N7UC/+IXeNUnlWBGGcAG+Ig==}
+ peerDependencies:
+ react: '>=16.0.0'
+ dependencies:
+ '@types/prismjs': 1.26.5
+ clsx: 2.1.1
+ react: 17.0.2
+ dev: false
+
/prismjs@1.27.0:
resolution: {integrity: sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==}
engines: {node: '>=6'}
diff --git a/common/config/subspaces/default/repo-state.json b/common/config/subspaces/default/repo-state.json
index 280c8df4e79..711e482da42 100644
--- a/common/config/subspaces/default/repo-state.json
+++ b/common/config/subspaces/default/repo-state.json
@@ -1,5 +1,5 @@
// DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush.
{
- "pnpmShrinkwrapHash": "260e89de9a23ec7f38ec7956133ae1097057004b",
+ "pnpmShrinkwrapHash": "b3b0018c5869d606a645e2b69ef6c53f9d2bf483",
"preferredVersionsHash": "61cd419c533464b580f653eb5f5a7e27fe7055ca"
}
From e03c5b048a9de91527bf827fc29a18c9edfa4a87 Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Tue, 16 Sep 2025 19:51:33 -0700
Subject: [PATCH 02/15] Highlight package.json as well
---
.../containers/PackageJsonViewer/CodeBox.tsx | 79 +++++++++++++++++++
.../containers/PackageJsonViewer/index.tsx | 29 ++-----
2 files changed, 84 insertions(+), 24 deletions(-)
create mode 100644 apps/lockfile-explorer-web/src/containers/PackageJsonViewer/CodeBox.tsx
diff --git a/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/CodeBox.tsx b/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/CodeBox.tsx
new file mode 100644
index 00000000000..b5977519b40
--- /dev/null
+++ b/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/CodeBox.tsx
@@ -0,0 +1,79 @@
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
+
+import React from 'react';
+
+import { Highlight, themes } from 'prism-react-renderer';
+
+// Generate this list by doing console.log(Object.keys(Prism.languages))
+// BUT THEN DELETE the API's that are bizarrely mixed into this namespace:
+// "extend", "insertBefore", "DFS"
+export type PrismLanguage =
+ | 'plain'
+ | 'plaintext'
+ | 'text'
+ | 'txt'
+ | 'markup'
+ | 'html'
+ | 'mathml'
+ | 'svg'
+ | 'xml'
+ | 'ssml'
+ | 'atom'
+ | 'rss'
+ | 'regex'
+ | 'clike'
+ | 'javascript'
+ | 'js'
+ | 'actionscript'
+ | 'coffeescript'
+ | 'coffee'
+ | 'javadoclike'
+ | 'css'
+ | 'yaml'
+ | 'yml'
+ | 'markdown'
+ | 'md'
+ | 'graphql'
+ | 'sql'
+ | 'typescript'
+ | 'ts'
+ | 'jsdoc'
+ | 'flow'
+ | 'n4js'
+ | 'n4jsd'
+ | 'jsx'
+ | 'tsx'
+ | 'swift'
+ | 'kotlin'
+ | 'kt'
+ | 'kts'
+ | 'c'
+ | 'objectivec'
+ | 'objc'
+ | 'reason'
+ | 'rust'
+ | 'go'
+ | 'cpp'
+ | 'python'
+ | 'py'
+ | 'json'
+ | 'webmanifest';
+
+export const CodeBox = (props: { code: string; language: PrismLanguage }): JSX.Element => {
+ return (
+
+ {({ className, style, tokens, getLineProps, getTokenProps }) => (
+
+ {tokens.map((line, i) => (
+
+ {line.map((token, key) => (
+
+ ))}
+
+ ))}
+
+ )}
+
+ );
+};
diff --git a/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/index.tsx b/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/index.tsx
index 222ffb7f2e6..a0be0ebd7c3 100644
--- a/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/index.tsx
+++ b/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/index.tsx
@@ -3,8 +3,6 @@
import React, { useCallback, useEffect, useState } from 'react';
-import { Highlight, themes } from 'prism-react-renderer';
-
import { readPnpmfileAsync, readPackageSpecAsync, readPackageJsonAsync } from '../../helpers/lfxApiClient';
import { useAppDispatch, useAppSelector } from '../../store/hooks';
import { selectCurrentEntry } from '../../store/slices/entrySlice';
@@ -15,6 +13,7 @@ import { displaySpecChanges } from '../../helpers/displaySpecChanges';
import { isEntryModified } from '../../helpers/isEntryModified';
import { ScrollArea, Tabs, Text } from '@rushstack/rush-themed-ui';
import { LfxGraphEntryKind } from '../../packlets/lfx-shared';
+import { CodeBox } from './CodeBox';
import styles from './styles.scss';
@@ -24,24 +23,6 @@ const PackageView: { [key: string]: string } = {
PARSED_PACKAGE_JSON: 'PARSED_PACKAGE_JSON'
};
-const CodeBox = (props: { code: string }): JSX.Element => {
- return (
-
- {({ className, style, tokens, getLineProps, getTokenProps }) => (
-
- {tokens.map((line, i) => (
-
- {line.map((token, key) => (
-
- ))}
-
- ))}
-
- )}
-
- );
-};
-
export const PackageJsonViewer = (): JSX.Element => {
const dispatch = useAppDispatch();
const [packageJSON, setPackageJSON] = useState(undefined);
@@ -70,9 +51,9 @@ export const PackageJsonViewer = (): JSX.Element => {
useEffect(() => {
async function loadPackageDetailsAsync(packageName: string): Promise {
- const packageJSONFile = await readPackageJsonAsync(packageName);
+ const packageJSONFile: IPackageJson | undefined = await readPackageJsonAsync(packageName);
setPackageJSON(packageJSONFile);
- const parsedJSON = await readPackageSpecAsync(packageName);
+ const parsedJSON: IPackageJson | undefined = await readPackageSpecAsync(packageName);
setParsedPackageJSON(parsedJSON);
if (packageJSONFile && parsedJSON) {
@@ -183,7 +164,7 @@ export const PackageJsonViewer = (): JSX.Element => {
Please select a Project or Package to view it's package.json
);
- return {JSON.stringify(packageJSON, null, 2)};
+ return ;
case PackageView.PACKAGE_SPEC:
if (!pnpmfile) {
return (
@@ -193,7 +174,7 @@ export const PackageJsonViewer = (): JSX.Element => {
);
}
- return ;
+ return ;
case PackageView.PARSED_PACKAGE_JSON:
if (!parsedPackageJSON)
return (
From 717043a2ed2dd7684046744c789ee2cd302f4960 Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Wed, 17 Sep 2025 13:57:15 -0400
Subject: [PATCH 03/15] Introduce PnpmfileRunner.ts to isolate .pnpmfile.cjs
execution
---
.../cli/explorer/ExplorerCommandLineParser.ts | 22 +++-
.../src/graph/IPnpmfileModule.ts | 24 ++++
.../src/graph/PnpmfileRunner.ts | 107 ++++++++++++++++++
.../src/graph/pnpmfileRunnerWorkerThread.ts | 88 ++++++++++++++
.../src/graph/test/PnpmfileRunner.test.ts | 64 +++++++++++
.../fixtures/PnpmfileRunner/.pnpmfile.cjs | 24 ++++
6 files changed, 325 insertions(+), 4 deletions(-)
create mode 100644 apps/lockfile-explorer/src/graph/IPnpmfileModule.ts
create mode 100644 apps/lockfile-explorer/src/graph/PnpmfileRunner.ts
create mode 100644 apps/lockfile-explorer/src/graph/pnpmfileRunnerWorkerThread.ts
create mode 100644 apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts
create mode 100644 apps/lockfile-explorer/src/graph/test/fixtures/PnpmfileRunner/.pnpmfile.cjs
diff --git a/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts b/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts
index cf0bd6e7839..10c27f90c3c 100644
--- a/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts
+++ b/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts
@@ -7,6 +7,7 @@ import cors from 'cors';
import process from 'process';
import open from 'open';
import updateNotifier from 'update-notifier';
+import * as path from 'node:path';
import { FileSystem, type IPackageJson, JsonFile, PackageJsonLookup } from '@rushstack/node-core-library';
import { ConsoleTerminalProvider, type ITerminal, Terminal, Colorize } from '@rushstack/terminal';
@@ -24,6 +25,7 @@ import {
import type { IAppState } from '../../state';
import { init } from '../../utils/init';
+import { PnpmfileRunner } from '../../graph/PnpmfileRunner';
import * as lfxGraphLoader from '../../graph/lfxGraphLoader';
const EXPLORER_TOOL_FILENAME: 'lockfile-explorer' = 'lockfile-explorer';
@@ -218,10 +220,22 @@ export class ExplorerCommandLineParser extends CommandLineParser {
}
}
- const {
- hooks: { readPackage }
- } = require(appState.pnpmfileLocation);
- const parsedPackage: {} = readPackage(packageJson, {});
+ let parsedPackage: IPackageJson = packageJson;
+
+ const pnpmfilePath: string = path.join(
+ appState.lfxWorkspace.workspaceRootFullPath,
+ appState.lfxWorkspace.pnpmLockfileFolder,
+ '.pnpmfile.cjs'
+ );
+ if (await FileSystem.existsAsync(pnpmfilePath)) {
+ const pnpmFileRunner: PnpmfileRunner = new PnpmfileRunner(pnpmfilePath);
+ try {
+ parsedPackage = await pnpmFileRunner.transformPackageAsync(packageJson, fileLocation);
+ } finally {
+ await pnpmFileRunner.disposeAsync();
+ }
+ }
+
res.send(parsedPackage);
}
);
diff --git a/apps/lockfile-explorer/src/graph/IPnpmfileModule.ts b/apps/lockfile-explorer/src/graph/IPnpmfileModule.ts
new file mode 100644
index 00000000000..05ee1eae2e7
--- /dev/null
+++ b/apps/lockfile-explorer/src/graph/IPnpmfileModule.ts
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
+
+import type { IPackageJson } from '@rushstack/node-core-library';
+
+export interface IReadPackageContext {
+ log: (message: string) => void;
+}
+
+export type IReadPackageHook = (
+ packageJson: IPackageJson,
+ context: IReadPackageContext
+) => IPackageJson | Promise;
+
+export interface IPnpmHooks {
+ readPackage?: IReadPackageHook;
+}
+
+/**
+ * Type of the `.pnpmfile.cjs` module.
+ */
+export interface IPnpmfileModule {
+ hooks?: IPnpmHooks;
+}
diff --git a/apps/lockfile-explorer/src/graph/PnpmfileRunner.ts b/apps/lockfile-explorer/src/graph/PnpmfileRunner.ts
new file mode 100644
index 00000000000..557d1678931
--- /dev/null
+++ b/apps/lockfile-explorer/src/graph/PnpmfileRunner.ts
@@ -0,0 +1,107 @@
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
+
+import { Worker } from 'node:worker_threads';
+import * as path from 'node:path';
+import type { IPackageJson } from '@rushstack/node-core-library';
+
+import type { IRequestMessage, ResponseMessage } from './pnpmfileRunnerWorkerThread';
+
+interface IPromise {
+ resolve: (r: IPackageJson) => void;
+ reject: (e: Error) => void;
+}
+
+/**
+ * Evals `.pnpmfile.cjs` in an isolated thread, so `transformPackageAsync()` can be used to rewrite
+ * package.json files. Calling `disposeAsync()` will free the loaded modules.
+ */
+export class PnpmfileRunner {
+ private _worker: Worker;
+ private _nextId: number = 1000;
+ private _promisesById: Map = new Map();
+ private _disposed: boolean = false;
+
+ public logger: ((message: string) => void) | undefined = undefined;
+
+ public constructor(pnpmfilePath: string) {
+ this._worker = new Worker(path.join(__dirname, './pnpmfileRunnerWorkerThread.js'), {
+ workerData: { pnpmfilePath }
+ });
+
+ this._worker.on('message', (message: ResponseMessage) => {
+ const id: number = message.id;
+ const promise: IPromise | undefined = this._promisesById.get(id);
+ if (!promise) {
+ return;
+ }
+
+ if (message.kind === 'return') {
+ this._promisesById.delete(id);
+ // TODO: Validate the user's readPackage() return value
+ const result: IPackageJson = message.result as IPackageJson;
+ promise.resolve(result);
+ } else if (message.kind === 'log') {
+ // No this._promisesById.delete(id) for this case
+ if (this.logger) {
+ this.logger(message.log);
+ } else {
+ console.log('.pnpmfile.cjs: ' + message.log);
+ }
+ } else {
+ this._promisesById.delete(id);
+ promise.reject(new Error(message.error || 'An unknown error occurred'));
+ }
+ });
+
+ this._worker.on('error', (err) => {
+ for (const promise of this._promisesById.values()) {
+ promise.reject(err);
+ }
+ this._promisesById.clear();
+ });
+
+ this._worker.on('exit', (code) => {
+ if (!this._disposed) {
+ const error: Error = new Error(
+ `PnpmfileRunner worker thread terminated unexpectedly with exit code ${code}`
+ );
+ console.error(error);
+ for (const promise of this._promisesById.values()) {
+ promise.reject(error);
+ }
+ this._promisesById.clear();
+ }
+ });
+ }
+
+ /**
+ * Invokes the readPackage() hook from .pnpmfile.cjs
+ */
+ public transformPackageAsync(
+ packageJson: IPackageJson,
+ packageJsonFullPath: string
+ ): Promise {
+ if (this._disposed) {
+ return Promise.reject(new Error('The operation failed because PnpmfileRunner has been disposed'));
+ }
+
+ const id: number = this._nextId++;
+ return new Promise((resolve, reject) => {
+ this._promisesById.set(id, { resolve, reject });
+ this._worker.postMessage({ id, packageJson, packageJsonFullPath } satisfies IRequestMessage);
+ });
+ }
+
+ public async disposeAsync(): Promise {
+ if (this._disposed) {
+ return;
+ }
+ for (const pending of this._promisesById.values()) {
+ pending.reject(new Error('Aborted because PnpmfileRunner was disposed'));
+ }
+ this._promisesById.clear();
+ this._disposed = true;
+ await this._worker.terminate();
+ }
+}
diff --git a/apps/lockfile-explorer/src/graph/pnpmfileRunnerWorkerThread.ts b/apps/lockfile-explorer/src/graph/pnpmfileRunnerWorkerThread.ts
new file mode 100644
index 00000000000..3281eb73ce2
--- /dev/null
+++ b/apps/lockfile-explorer/src/graph/pnpmfileRunnerWorkerThread.ts
@@ -0,0 +1,88 @@
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
+
+import { parentPort, workerData } from 'node:worker_threads';
+import * as path from 'node:path';
+import * as fs from 'node:fs';
+import type { IPackageJson } from '@rushstack/node-core-library';
+
+import type { IPnpmfileModule, IReadPackageContext } from './IPnpmfileModule';
+
+export interface IRequestMessage {
+ id: number;
+ packageJson: IPackageJson;
+ packageJsonFullPath: string;
+}
+
+export interface IResponseMessageLog {
+ kind: 'log';
+ id: number;
+ log: string;
+}
+export interface IResponseMessageError {
+ kind: 'error';
+ id: number;
+ error: string;
+}
+export interface IResponseMessageReturn {
+ kind: 'return';
+ id: number;
+ result?: unknown;
+}
+export type ResponseMessage = IResponseMessageLog | IResponseMessageError | IResponseMessageReturn;
+
+// debugger;
+
+const { pnpmfilePath } = workerData;
+const resolvedPath: string = path.resolve(pnpmfilePath);
+
+let pnpmfileModule: IPnpmfileModule | undefined = undefined;
+let pnpmfileModuleError: Error | undefined = undefined;
+
+try {
+ if (fs.existsSync(resolvedPath)) {
+ pnpmfileModule = require(resolvedPath);
+ }
+} catch (error) {
+ pnpmfileModuleError = error;
+}
+
+parentPort?.on('message', async (message: IRequestMessage) => {
+ const { id, packageJson } = message;
+
+ if (pnpmfileModuleError) {
+ parentPort?.postMessage({
+ kind: 'error',
+ id,
+ error: pnpmfileModuleError.message
+ } satisfies IResponseMessageError);
+ return;
+ }
+
+ try {
+ if (!pnpmfileModule || !pnpmfileModule.hooks || typeof pnpmfileModule.hooks.readPackage !== 'function') {
+ // No transformation needed
+ parentPort?.postMessage({ kind: 'return', id, result: packageJson } satisfies IResponseMessageReturn);
+ return;
+ }
+
+ const pnpmContext: IReadPackageContext = {
+ log: (logMessage) =>
+ parentPort?.postMessage({
+ kind: 'log',
+ id,
+ log: logMessage
+ } satisfies IResponseMessageLog)
+ };
+
+ const result: IPackageJson = await pnpmfileModule.hooks.readPackage({ ...packageJson }, pnpmContext);
+
+ parentPort?.postMessage({ kind: 'return', id, result } satisfies IResponseMessageReturn);
+ } catch (e) {
+ parentPort?.postMessage({
+ kind: 'error',
+ id,
+ error: (e as Error).message
+ } satisfies IResponseMessageError);
+ }
+});
diff --git a/apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts b/apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts
new file mode 100644
index 00000000000..3a10b47ec5a
--- /dev/null
+++ b/apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts
@@ -0,0 +1,64 @@
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
+
+import inspector from 'inspector';
+import { Path } from '@rushstack/node-core-library';
+import { PnpmfileRunner } from '../PnpmfileRunner';
+
+const isDebuggerAttached: boolean = inspector.url() !== undefined;
+
+// Since we're spawning another thread, increase the timeout to 10s.
+// For debugging, use an infinite timeout.
+jest.setTimeout(isDebuggerAttached ? 1e9 : 10000);
+
+describe('PnpmfileRunner', () => {
+ it('transforms a package.json file', async () => {
+ const dirname: string = Path.convertToSlashes(__dirname);
+ const libIndex: number = dirname.lastIndexOf('/lib/');
+ if (libIndex < 0) {
+ throw new Error('Unexpected file path');
+ }
+ const srcDirname: string =
+ dirname.substring(0, libIndex) + '/src/' + dirname.substring(libIndex + '/lib/'.length);
+
+ const pnpmfilePath: string = srcDirname + '/fixtures/PnpmfileRunner/.pnpmfile.cjs';
+ const pnpmfileRunner: PnpmfileRunner = new PnpmfileRunner(pnpmfilePath);
+ const logMessages: string[] = [];
+ pnpmfileRunner.logger = (message) => {
+ logMessages.push(message);
+ };
+ expect(
+ await pnpmfileRunner.transformPackageAsync(
+ {
+ name: '@types/karma',
+ version: '1.0.0',
+ dependencies: {
+ 'example-dependency': '1.0.0'
+ }
+ },
+ pnpmfilePath
+ )
+ ).toMatchInlineSnapshot(`
+Object {
+ "dependencies": Object {
+ "example-dependency": "1.0.0",
+ "log4js": "0.6.38",
+ },
+ "name": "@types/karma",
+ "version": "1.0.0",
+}
+`);
+
+ expect(logMessages).toMatchInlineSnapshot(`
+Array [
+ "Fixed up dependencies for @types/karma",
+]
+`);
+
+ await pnpmfileRunner.disposeAsync();
+
+ await expect(
+ pnpmfileRunner.transformPackageAsync({ name: 'name', version: '1.0.0' }, '')
+ ).rejects.toThrow('disposed');
+ });
+});
diff --git a/apps/lockfile-explorer/src/graph/test/fixtures/PnpmfileRunner/.pnpmfile.cjs b/apps/lockfile-explorer/src/graph/test/fixtures/PnpmfileRunner/.pnpmfile.cjs
new file mode 100644
index 00000000000..d7998d79e50
--- /dev/null
+++ b/apps/lockfile-explorer/src/graph/test/fixtures/PnpmfileRunner/.pnpmfile.cjs
@@ -0,0 +1,24 @@
+'use strict';
+
+module.exports = {
+ hooks: {
+ readPackage
+ }
+};
+
+/**
+ * This hook is invoked during installation before a package's dependencies
+ * are selected.
+ * The `packageJson` parameter is the deserialized package.json
+ * contents for the package that is about to be installed.
+ * The `context` parameter provides a log() function.
+ * The return value is the updated object.
+ */
+function readPackage(packageJson, context) {
+ if (packageJson.name === '@types/karma') {
+ context.log('Fixed up dependencies for @types/karma');
+ packageJson.dependencies['log4js'] = '0.6.38';
+ }
+
+ return packageJson;
+}
From 0f8393f6b66e603fac32efe46ca366301437968d Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Wed, 17 Sep 2025 13:59:27 -0400
Subject: [PATCH 04/15] rush change
---
.../octogonz-lfx-fixes4_2025-09-17-17-57.json | 10 ++++++++++
.../octogonz-lfx-fixes4_2025-09-17-17-58.json | 10 ++++++++++
2 files changed, 20 insertions(+)
create mode 100644 common/changes/@rushstack/lockfile-explorer/octogonz-lfx-fixes4_2025-09-17-17-57.json
create mode 100644 common/changes/@rushstack/lockfile-explorer/octogonz-lfx-fixes4_2025-09-17-17-58.json
diff --git a/common/changes/@rushstack/lockfile-explorer/octogonz-lfx-fixes4_2025-09-17-17-57.json b/common/changes/@rushstack/lockfile-explorer/octogonz-lfx-fixes4_2025-09-17-17-57.json
new file mode 100644
index 00000000000..873badc1a71
--- /dev/null
+++ b/common/changes/@rushstack/lockfile-explorer/octogonz-lfx-fixes4_2025-09-17-17-57.json
@@ -0,0 +1,10 @@
+{
+ "changes": [
+ {
+ "packageName": "@rushstack/lockfile-explorer",
+ "comment": "Add syntax highlighter",
+ "type": "minor"
+ }
+ ],
+ "packageName": "@rushstack/lockfile-explorer"
+}
\ No newline at end of file
diff --git a/common/changes/@rushstack/lockfile-explorer/octogonz-lfx-fixes4_2025-09-17-17-58.json b/common/changes/@rushstack/lockfile-explorer/octogonz-lfx-fixes4_2025-09-17-17-58.json
new file mode 100644
index 00000000000..8c6e6ab35a0
--- /dev/null
+++ b/common/changes/@rushstack/lockfile-explorer/octogonz-lfx-fixes4_2025-09-17-17-58.json
@@ -0,0 +1,10 @@
+{
+ "changes": [
+ {
+ "packageName": "@rushstack/lockfile-explorer",
+ "comment": "Isolate .pnpmcfile.cjs evaluation",
+ "type": "minor"
+ }
+ ],
+ "packageName": "@rushstack/lockfile-explorer"
+}
\ No newline at end of file
From 0342885b2e470f4847c7bb6c399d0413118767ce Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Wed, 17 Sep 2025 15:15:13 -0400
Subject: [PATCH 05/15] Disable webpack bundle size limits, since this app is
served from localhost
---
apps/lockfile-explorer-web/webpack.config.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/lockfile-explorer-web/webpack.config.js b/apps/lockfile-explorer-web/webpack.config.js
index 10ce2633322..7b09bf573cd 100644
--- a/apps/lockfile-explorer-web/webpack.config.js
+++ b/apps/lockfile-explorer-web/webpack.config.js
@@ -17,11 +17,11 @@ module.exports = function createConfig(env, argv) {
}
},
performance: {
- hints: env.production ? 'error' : false
+ hints: env.production ? 'error' : false,
// This specifies the bundle size limit that will trigger Webpack's warning saying:
// "The following entrypoint(s) combined asset size exceeds the recommended limit."
- // maxEntrypointSize: 500000,
- // maxAssetSize: 500000
+ maxEntrypointSize: Infinity,
+ maxAssetSize: Infinity
},
devServer: {
port: 8096,
From 6f245275587f2b1b730d65715a98b4f0e0513f3f Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Fri, 19 Sep 2025 00:37:33 -0400
Subject: [PATCH 06/15] In a Rush repo, the ".pnpmfile.cjs" tab should show
Rush's file, not the generated temp file
---
.../packlets/lfx-shared/IJsonLfxWorkspace.ts | 17 +++++++++++++
.../cli/explorer/ExplorerCommandLineParser.ts | 25 +++++++++++--------
.../test/lfxGraph-edge-cases-v5.4.test.ts | 1 +
.../test/lfxGraph-edge-cases-v6.0.test.ts | 1 +
.../lfxGraph-website-sample-1-v5.4.test.ts | 4 ++-
.../lfxGraph-website-sample-1-v6.0.test.ts | 4 ++-
.../src/graph/test/testLockfile.ts | 4 ++-
apps/lockfile-explorer/src/utils/init.ts | 24 ++++++++++++++----
8 files changed, 62 insertions(+), 18 deletions(-)
diff --git a/apps/lockfile-explorer-web/src/packlets/lfx-shared/IJsonLfxWorkspace.ts b/apps/lockfile-explorer-web/src/packlets/lfx-shared/IJsonLfxWorkspace.ts
index 841f95e763d..d5115c1b33b 100644
--- a/apps/lockfile-explorer-web/src/packlets/lfx-shared/IJsonLfxWorkspace.ts
+++ b/apps/lockfile-explorer-web/src/packlets/lfx-shared/IJsonLfxWorkspace.ts
@@ -12,6 +12,15 @@ export interface IJsonLfxWorkspaceRushConfig {
* Otherwise this will be an empty string.
*/
readonly subspaceName: string;
+
+ /**
+ * The path to Rush's input file `.pnpmfile.cjs`, relative to `workspaceRootFullPath`
+ * and normalized to use forward slashes without a leading slash. In a Rush workspace,
+ * {@link IJsonLfxWorkspace.pnpmfilePath} is a temporary file that is generated from `rushPnpmfilePath`.
+ *
+ * @example `"common/config/my-subspace/pnpm-lock.yaml"`
+ */
+ readonly rushPnpmfilePath: string;
}
export interface IJsonLfxWorkspace {
@@ -44,6 +53,14 @@ export interface IJsonLfxWorkspace {
*/
readonly pnpmLockfileFolder: string;
+ /**
+ * The path to the `.pnpmfile.cjs` file that is loaded by PNPM. In a Rush workspace,
+ * this is a temporary file that is generated from `rushPnpmfilePath`.
+ *
+ * @example `"common/temp/my-subspace/.pnpmfile.cjs"`
+ */
+ readonly pnpmfilePath: string;
+
/**
* This section will be defined only if this is a Rush workspace (versus a plain PNPM workspace).
*/
diff --git a/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts b/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts
index 10c27f90c3c..aa351cd1e81 100644
--- a/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts
+++ b/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts
@@ -8,7 +8,6 @@ import process from 'process';
import open from 'open';
import updateNotifier from 'update-notifier';
import * as path from 'node:path';
-
import { FileSystem, type IPackageJson, JsonFile, PackageJsonLookup } from '@rushstack/node-core-library';
import { ConsoleTerminalProvider, type ITerminal, Terminal, Colorize } from '@rushstack/terminal';
import {
@@ -16,12 +15,15 @@ import {
CommandLineParser,
type IRequiredCommandLineStringParameter
} from '@rushstack/ts-command-line';
+
import {
type LfxGraph,
lfxGraphSerializer,
type IAppContext,
- type IJsonLfxGraph
+ type IJsonLfxGraph,
+ type IJsonLfxWorkspace
} from '../../../build/lfx-shared';
+import * as lockfilePath from '../../graph/lockfilePath';
import type { IAppState } from '../../state';
import { init } from '../../utils/init';
@@ -100,6 +102,8 @@ export class ExplorerCommandLineParser extends CommandLineParser {
subspaceName: this._subspaceParameter.value
});
+ const lfxWorkspace: IJsonLfxWorkspace = appState.lfxWorkspace;
+
// Important: This must happen after init() reads the current working directory
process.chdir(appState.lockfileExplorerProjectRoot);
@@ -155,7 +159,7 @@ export class ExplorerCommandLineParser extends CommandLineParser {
const pnpmLockfileText: string = await FileSystem.readFileAsync(appState.pnpmLockfileLocation);
const lockfile: unknown = yaml.load(pnpmLockfileText) as unknown;
- const graph: LfxGraph = lfxGraphLoader.generateLockfileGraph(lockfile, appState.lfxWorkspace);
+ const graph: LfxGraph = lfxGraphLoader.generateLockfileGraph(lockfile, lfxWorkspace);
const jsonGraph: IJsonLfxGraph = lfxGraphSerializer.serializeToJson(graph);
res.type('application/json').send(jsonGraph);
@@ -185,13 +189,18 @@ export class ExplorerCommandLineParser extends CommandLineParser {
);
app.get('/api/pnpmfile', async (req: express.Request, res: express.Response) => {
+ const pnpmfilePath: string = lockfilePath.join(
+ lfxWorkspace.workspaceRootFullPath,
+ lfxWorkspace.rushConfig?.rushPnpmfilePath ?? lfxWorkspace.pnpmfilePath
+ );
+
let pnpmfile: string;
try {
- pnpmfile = await FileSystem.readFileAsync(appState.pnpmfileLocation);
+ pnpmfile = await FileSystem.readFileAsync(pnpmfilePath);
} catch (e) {
if (FileSystem.isNotExistError(e)) {
return res.status(404).send({
- message: `Could not load pnpmfile file in this repo.`,
+ message: `Could not load .pnpmfile.cjs file in this repo: "${pnpmfilePath}"`,
error: `No .pnpmifile.cjs found.`
});
} else {
@@ -222,11 +231,7 @@ export class ExplorerCommandLineParser extends CommandLineParser {
let parsedPackage: IPackageJson = packageJson;
- const pnpmfilePath: string = path.join(
- appState.lfxWorkspace.workspaceRootFullPath,
- appState.lfxWorkspace.pnpmLockfileFolder,
- '.pnpmfile.cjs'
- );
+ const pnpmfilePath: string = path.join(lfxWorkspace.workspaceRootFullPath, lfxWorkspace.pnpmfilePath);
if (await FileSystem.existsAsync(pnpmfilePath)) {
const pnpmFileRunner: PnpmfileRunner = new PnpmfileRunner(pnpmfilePath);
try {
diff --git a/apps/lockfile-explorer/src/graph/test/lfxGraph-edge-cases-v5.4.test.ts b/apps/lockfile-explorer/src/graph/test/lfxGraph-edge-cases-v5.4.test.ts
index 1a362d47c73..2aa4a13c230 100644
--- a/apps/lockfile-explorer/src/graph/test/lfxGraph-edge-cases-v5.4.test.ts
+++ b/apps/lockfile-explorer/src/graph/test/lfxGraph-edge-cases-v5.4.test.ts
@@ -9,6 +9,7 @@ export const workspace: IJsonLfxWorkspace = {
workspaceRootFullPath: '/repo',
pnpmLockfilePath: 'pnpm-lock.yaml',
pnpmLockfileFolder: '',
+ pnpmfilePath: '.pnpmfile.cjs',
rushConfig: undefined
};
diff --git a/apps/lockfile-explorer/src/graph/test/lfxGraph-edge-cases-v6.0.test.ts b/apps/lockfile-explorer/src/graph/test/lfxGraph-edge-cases-v6.0.test.ts
index 1a362d47c73..2aa4a13c230 100644
--- a/apps/lockfile-explorer/src/graph/test/lfxGraph-edge-cases-v6.0.test.ts
+++ b/apps/lockfile-explorer/src/graph/test/lfxGraph-edge-cases-v6.0.test.ts
@@ -9,6 +9,7 @@ export const workspace: IJsonLfxWorkspace = {
workspaceRootFullPath: '/repo',
pnpmLockfilePath: 'pnpm-lock.yaml',
pnpmLockfileFolder: '',
+ pnpmfilePath: '.pnpmfile.cjs',
rushConfig: undefined
};
diff --git a/apps/lockfile-explorer/src/graph/test/lfxGraph-website-sample-1-v5.4.test.ts b/apps/lockfile-explorer/src/graph/test/lfxGraph-website-sample-1-v5.4.test.ts
index af8dc57b59d..7c74129e631 100644
--- a/apps/lockfile-explorer/src/graph/test/lfxGraph-website-sample-1-v5.4.test.ts
+++ b/apps/lockfile-explorer/src/graph/test/lfxGraph-website-sample-1-v5.4.test.ts
@@ -9,9 +9,11 @@ export const workspace: IJsonLfxWorkspace = {
workspaceRootFullPath: '/repo',
pnpmLockfilePath: 'common/temp/pnpm-lock.yaml',
pnpmLockfileFolder: 'common/temp',
+ pnpmfilePath: 'common/temp/.pnpmfile.cjs',
rushConfig: {
rushVersion: '5.83.3',
- subspaceName: ''
+ subspaceName: '',
+ rushPnpmfilePath: 'common/config/.pnpmfile.cjs'
}
};
diff --git a/apps/lockfile-explorer/src/graph/test/lfxGraph-website-sample-1-v6.0.test.ts b/apps/lockfile-explorer/src/graph/test/lfxGraph-website-sample-1-v6.0.test.ts
index 90231d947c4..0cf7e0c2c25 100644
--- a/apps/lockfile-explorer/src/graph/test/lfxGraph-website-sample-1-v6.0.test.ts
+++ b/apps/lockfile-explorer/src/graph/test/lfxGraph-website-sample-1-v6.0.test.ts
@@ -9,9 +9,11 @@ export const workspace: IJsonLfxWorkspace = {
workspaceRootFullPath: '/repo',
pnpmLockfilePath: 'common/temp/pnpm-lock.yaml',
pnpmLockfileFolder: 'common/temp',
+ pnpmfilePath: 'common/temp/.pnpmfile.cjs',
rushConfig: {
rushVersion: '5.158.1',
- subspaceName: ''
+ subspaceName: '',
+ rushPnpmfilePath: 'common/config/.pnpmcfile.cjs'
}
};
diff --git a/apps/lockfile-explorer/src/graph/test/testLockfile.ts b/apps/lockfile-explorer/src/graph/test/testLockfile.ts
index 88f898cbdb2..038133be61c 100644
--- a/apps/lockfile-explorer/src/graph/test/testLockfile.ts
+++ b/apps/lockfile-explorer/src/graph/test/testLockfile.ts
@@ -7,9 +7,11 @@ export const TEST_WORKSPACE: IJsonLfxWorkspace = {
workspaceRootFullPath: '/repo',
pnpmLockfilePath: 'common/temp/my-subspace/pnpm-lock.yaml',
pnpmLockfileFolder: 'common/temp/my-subspace',
+ pnpmfilePath: 'common/temp/my-subspace/.pnpmfile.cjs',
rushConfig: {
rushVersion: '0.0.0',
- subspaceName: 'my-subspace'
+ subspaceName: 'my-subspace',
+ rushPnpmfilePath: 'common/config/subspaces/my-subspace/.pnpmfile.cjs'
}
};
diff --git a/apps/lockfile-explorer/src/utils/init.ts b/apps/lockfile-explorer/src/utils/init.ts
index 55f21779109..fe7bf5e8f2d 100644
--- a/apps/lockfile-explorer/src/utils/init.ts
+++ b/apps/lockfile-explorer/src/utils/init.ts
@@ -9,6 +9,7 @@ import { RushConfiguration } from '@microsoft/rush-lib/lib/api/RushConfiguration
import type { Subspace } from '@microsoft/rush-lib/lib/api/Subspace';
import path from 'path';
+import * as lockfilePath from '../graph/lockfilePath';
import type { IAppState } from '../state';
export const init = (options: {
@@ -31,25 +32,37 @@ export const init = (options: {
const rushConfiguration: RushConfiguration = RushConfiguration.loadFromConfigurationFile(rushJsonPath);
const subspace: Subspace = rushConfiguration.getSubspace(subspaceName);
- const workspaceFolder: string = subspace.getSubspaceTempFolderPath();
+ const commonTempFolder: string = subspace.getSubspaceTempFolderPath();
+ const pnpmLockfileAbsolutePath: string = path.join(commonTempFolder, 'pnpm-lock.yaml');
+
+ const relativeCommonTempFolder: string = Path.convertToSlashes(
+ path.relative(currentFolder, subspace.getSubspaceTempFolderPath())
+ );
+ const pnpmLockfileRelativePath: string = lockfilePath.join(relativeCommonTempFolder, 'pnpm-lock.yaml');
+ const pnpmFileRelativePath: string = lockfilePath.join(relativeCommonTempFolder, '.pnpmfile.cjs');
+
+ const relativeCommonConfigFolder: string = Path.convertToSlashes(
+ path.relative(currentFolder, subspace.getSubspaceConfigFolderPath())
+ );
+ const rushPnpmFileRelativePath: string = lockfilePath.join(relativeCommonConfigFolder, '.pnpmfile.cjs');
- const pnpmLockfileAbsolutePath: string = path.resolve(workspaceFolder, 'pnpm-lock.yaml');
- const pnpmLockfileRelativePath: string = path.relative(currentFolder, pnpmLockfileAbsolutePath);
appState = {
currentWorkingDirectory,
appVersion,
debugMode,
lockfileExplorerProjectRoot,
pnpmLockfileLocation: pnpmLockfileAbsolutePath,
- pnpmfileLocation: workspaceFolder + '/.pnpmfile.cjs',
+ pnpmfileLocation: commonTempFolder + '/.pnpmfile.cjs',
projectRoot: currentFolder,
lfxWorkspace: {
workspaceRootFullPath: currentFolder,
pnpmLockfilePath: Path.convertToSlashes(pnpmLockfileRelativePath),
pnpmLockfileFolder: Path.convertToSlashes(path.dirname(pnpmLockfileRelativePath)),
+ pnpmfilePath: Path.convertToSlashes(pnpmFileRelativePath),
rushConfig: {
rushVersion: rushConfiguration.rushConfigurationJson.rushVersion,
- subspaceName: subspaceName ?? ''
+ subspaceName: subspaceName ?? '',
+ rushPnpmfilePath: rushPnpmFileRelativePath
}
}
};
@@ -67,6 +80,7 @@ export const init = (options: {
workspaceRootFullPath: currentFolder,
pnpmLockfilePath: Path.convertToSlashes(path.relative(currentFolder, pnpmLockPath)),
pnpmLockfileFolder: '',
+ pnpmfilePath: '.pnpmfile.cjs',
rushConfig: undefined
}
};
From 2d5b7b86dc69304cf0cd37df79616e9a59894064 Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Fri, 19 Sep 2025 12:27:27 -0400
Subject: [PATCH 07/15] Upgrade Prettier to support `async using`
---
.../autoinstallers/rush-prettier/package.json | 4 +-
.../rush-prettier/pnpm-lock.yaml | 188 +++---------------
2 files changed, 31 insertions(+), 161 deletions(-)
diff --git a/common/autoinstallers/rush-prettier/package.json b/common/autoinstallers/rush-prettier/package.json
index fbe65e10c09..2b3a8597862 100644
--- a/common/autoinstallers/rush-prettier/package.json
+++ b/common/autoinstallers/rush-prettier/package.json
@@ -3,7 +3,7 @@
"version": "1.0.0",
"private": true,
"dependencies": {
- "pretty-quick": "4.0.0",
- "prettier": "3.2.5"
+ "pretty-quick": "4.2.2",
+ "prettier": "3.6.2"
}
}
diff --git a/common/autoinstallers/rush-prettier/pnpm-lock.yaml b/common/autoinstallers/rush-prettier/pnpm-lock.yaml
index f5ea674ea1c..94e04d1885c 100644
--- a/common/autoinstallers/rush-prettier/pnpm-lock.yaml
+++ b/common/autoinstallers/rush-prettier/pnpm-lock.yaml
@@ -6,195 +6,65 @@ settings:
dependencies:
prettier:
- specifier: 3.2.5
- version: 3.2.5
+ specifier: 3.6.2
+ version: 3.6.2
pretty-quick:
- specifier: 4.0.0
- version: 4.0.0(prettier@3.2.5)
+ specifier: 4.2.2
+ version: 4.2.2(prettier@3.6.2)
packages:
- /cross-spawn@7.0.6:
- resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
- engines: {node: '>= 8'}
- dependencies:
- path-key: 3.1.1
- shebang-command: 2.0.0
- which: 2.0.2
- dev: false
-
- /execa@5.1.1:
- resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
- engines: {node: '>=10'}
- dependencies:
- cross-spawn: 7.0.6
- get-stream: 6.0.1
- human-signals: 2.1.0
- is-stream: 2.0.1
- merge-stream: 2.0.0
- npm-run-path: 4.0.1
- onetime: 5.1.2
- signal-exit: 3.0.7
- strip-final-newline: 2.0.0
- dev: false
-
- /find-up@5.0.0:
- resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
- engines: {node: '>=10'}
- dependencies:
- locate-path: 6.0.0
- path-exists: 4.0.0
+ /@pkgr/core@0.2.9:
+ resolution: {integrity: sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==}
+ engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
dev: false
- /get-stream@6.0.1:
- resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
- engines: {node: '>=10'}
- dev: false
-
- /human-signals@2.1.0:
- resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
- engines: {node: '>=10.17.0'}
- dev: false
-
- /ignore@5.3.1:
- resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==}
+ /ignore@7.0.5:
+ resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==}
engines: {node: '>= 4'}
dev: false
- /is-stream@2.0.1:
- resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
- engines: {node: '>=8'}
- dev: false
-
- /isexe@2.0.0:
- resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
- dev: false
-
- /locate-path@6.0.0:
- resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
- engines: {node: '>=10'}
- dependencies:
- p-locate: 5.0.0
- dev: false
-
- /merge-stream@2.0.0:
- resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
- dev: false
-
- /mimic-fn@2.1.0:
- resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
- engines: {node: '>=6'}
- dev: false
-
/mri@1.2.0:
resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
engines: {node: '>=4'}
dev: false
- /npm-run-path@4.0.1:
- resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
- engines: {node: '>=8'}
- dependencies:
- path-key: 3.1.1
+ /picocolors@1.1.1:
+ resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
dev: false
- /onetime@5.1.2:
- resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
- engines: {node: '>=6'}
- dependencies:
- mimic-fn: 2.1.0
+ /picomatch@4.0.3:
+ resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==}
+ engines: {node: '>=12'}
dev: false
- /p-limit@3.1.0:
- resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
- engines: {node: '>=10'}
- dependencies:
- yocto-queue: 0.1.0
- dev: false
-
- /p-locate@5.0.0:
- resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
- engines: {node: '>=10'}
- dependencies:
- p-limit: 3.1.0
- dev: false
-
- /path-exists@4.0.0:
- resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
- engines: {node: '>=8'}
- dev: false
-
- /path-key@3.1.1:
- resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
- engines: {node: '>=8'}
- dev: false
-
- /picocolors@1.0.1:
- resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==}
- dev: false
-
- /picomatch@3.0.1:
- resolution: {integrity: sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==}
- engines: {node: '>=10'}
- dev: false
-
- /prettier@3.2.5:
- resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==}
+ /prettier@3.6.2:
+ resolution: {integrity: sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==}
engines: {node: '>=14'}
hasBin: true
dev: false
- /pretty-quick@4.0.0(prettier@3.2.5):
- resolution: {integrity: sha512-M+2MmeufXb/M7Xw3Afh1gxcYpj+sK0AxEfnfF958ktFeAyi5MsKY5brymVURQLgPLV1QaF5P4pb2oFJ54H3yzQ==}
+ /pretty-quick@4.2.2(prettier@3.6.2):
+ resolution: {integrity: sha512-uAh96tBW1SsD34VhhDmWuEmqbpfYc/B3j++5MC/6b3Cb8Ow7NJsvKFhg0eoGu2xXX+o9RkahkTK6sUdd8E7g5w==}
engines: {node: '>=14'}
hasBin: true
peerDependencies:
prettier: ^3.0.0
dependencies:
- execa: 5.1.1
- find-up: 5.0.0
- ignore: 5.3.1
+ '@pkgr/core': 0.2.9
+ ignore: 7.0.5
mri: 1.2.0
- picocolors: 1.0.1
- picomatch: 3.0.1
- prettier: 3.2.5
- tslib: 2.6.2
+ picocolors: 1.1.1
+ picomatch: 4.0.3
+ prettier: 3.6.2
+ tinyexec: 0.3.2
+ tslib: 2.8.1
dev: false
- /shebang-command@2.0.0:
- resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
- engines: {node: '>=8'}
- dependencies:
- shebang-regex: 3.0.0
- dev: false
-
- /shebang-regex@3.0.0:
- resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
- engines: {node: '>=8'}
- dev: false
-
- /signal-exit@3.0.7:
- resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
- dev: false
-
- /strip-final-newline@2.0.0:
- resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
- engines: {node: '>=6'}
- dev: false
-
- /tslib@2.6.2:
- resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
- dev: false
-
- /which@2.0.2:
- resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
- engines: {node: '>= 8'}
- hasBin: true
- dependencies:
- isexe: 2.0.0
+ /tinyexec@0.3.2:
+ resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==}
dev: false
- /yocto-queue@0.1.0:
- resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
- engines: {node: '>=10'}
+ /tslib@2.8.1:
+ resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
dev: false
From ce37f1880e12cde5bd945874747591e95ead8d2a Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Fri, 19 Sep 2025 14:31:00 -0400
Subject: [PATCH 08/15] prettier -w .
---
.../common/scripts/install-run-rush-pnpm.js | 23 +-
.../common/scripts/install-run-rush.js | 361 ++---
.../common/scripts/install-run-rushx.js | 23 +-
.../common/scripts/install-run.js | 1256 +++++++++--------
.../src/SwcIsolatedTranspilePlugin.ts | 4 +-
libraries/rush-lib/src/api/VersionPolicy.ts | 4 +-
.../pnpm-lock-v9/inconsistent-dep-devDep.yaml | 10 +-
.../test/yamlFiles/pnpm-lock-v9/modified.yaml | 15 +-
.../yamlFiles/pnpm-lock-v9/not-modified.yaml | 15 +-
.../pnpm-lock-v9/overrides-not-modified.yaml | 15 +-
.../yamlFiles/pnpm-lock-v9/pnpm-lock-v9.yaml | 22 +-
11 files changed, 935 insertions(+), 813 deletions(-)
diff --git a/build-tests/rush-redis-cobuild-plugin-integration-test/sandbox/sharded-repo/common/scripts/install-run-rush-pnpm.js b/build-tests/rush-redis-cobuild-plugin-integration-test/sandbox/sharded-repo/common/scripts/install-run-rush-pnpm.js
index 2356649f4e7..4b7aad5d586 100644
--- a/build-tests/rush-redis-cobuild-plugin-integration-test/sandbox/sharded-repo/common/scripts/install-run-rush-pnpm.js
+++ b/build-tests/rush-redis-cobuild-plugin-integration-test/sandbox/sharded-repo/common/scripts/install-run-rush-pnpm.js
@@ -14,18 +14,19 @@
// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
// See the @microsoft/rush package's LICENSE file for details.
-/******/ (() => { // webpackBootstrap
-/******/ "use strict";
-var __webpack_exports__ = {};
-/*!*****************************************************!*\
+/******/ (() => {
+ // webpackBootstrap
+ /******/ 'use strict';
+ var __webpack_exports__ = {};
+ /*!*****************************************************!*\
!*** ./lib-esnext/scripts/install-run-rush-pnpm.js ***!
\*****************************************************/
-// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
-// See LICENSE in the project root for license information.
-require('./install-run-rush');
+ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+ // See LICENSE in the project root for license information.
+ require('./install-run-rush');
+ //# sourceMappingURL=install-run-rush-pnpm.js.map
+ module.exports = __webpack_exports__;
+ /******/
+})();
//# sourceMappingURL=install-run-rush-pnpm.js.map
-module.exports = __webpack_exports__;
-/******/ })()
-;
-//# sourceMappingURL=install-run-rush-pnpm.js.map
\ No newline at end of file
diff --git a/build-tests/rush-redis-cobuild-plugin-integration-test/sandbox/sharded-repo/common/scripts/install-run-rush.js b/build-tests/rush-redis-cobuild-plugin-integration-test/sandbox/sharded-repo/common/scripts/install-run-rush.js
index 9676fc718f9..48da5907f9d 100644
--- a/build-tests/rush-redis-cobuild-plugin-integration-test/sandbox/sharded-repo/common/scripts/install-run-rush.js
+++ b/build-tests/rush-redis-cobuild-plugin-integration-test/sandbox/sharded-repo/common/scripts/install-run-rush.js
@@ -12,207 +12,234 @@
// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
// See the @microsoft/rush package's LICENSE file for details.
-/******/ (() => { // webpackBootstrap
-/******/ "use strict";
-/******/ var __webpack_modules__ = ({
-
-/***/ 657147:
-/*!*********************!*\
+/******/ (() => {
+ // webpackBootstrap
+ /******/ 'use strict';
+ /******/ var __webpack_modules__ = {
+ /***/ 657147:
+ /*!*********************!*\
!*** external "fs" ***!
\*********************/
-/***/ ((module) => {
-
-module.exports = require("fs");
+ /***/ (module) => {
+ module.exports = require('fs');
-/***/ }),
+ /***/
+ },
-/***/ 371017:
-/*!***********************!*\
+ /***/ 371017:
+ /*!***********************!*\
!*** external "path" ***!
\***********************/
-/***/ ((module) => {
-
-module.exports = require("path");
+ /***/ (module) => {
+ module.exports = require('path');
-/***/ })
+ /***/
+ }
-/******/ });
-/************************************************************************/
-/******/ // The module cache
-/******/ var __webpack_module_cache__ = {};
-/******/
-/******/ // The require function
-/******/ function __webpack_require__(moduleId) {
-/******/ // Check if module is in cache
-/******/ var cachedModule = __webpack_module_cache__[moduleId];
-/******/ if (cachedModule !== undefined) {
-/******/ return cachedModule.exports;
-/******/ }
-/******/ // Create a new module (and put it into the cache)
-/******/ var module = __webpack_module_cache__[moduleId] = {
-/******/ // no module.id needed
-/******/ // no module.loaded needed
-/******/ exports: {}
-/******/ };
-/******/
-/******/ // Execute the module function
-/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-/******/
-/******/ // Return the exports of the module
-/******/ return module.exports;
-/******/ }
-/******/
-/************************************************************************/
-/******/ /* webpack/runtime/compat get default export */
-/******/ (() => {
-/******/ // getDefaultExport function for compatibility with non-harmony modules
-/******/ __webpack_require__.n = (module) => {
-/******/ var getter = module && module.__esModule ?
-/******/ () => (module['default']) :
-/******/ () => (module);
-/******/ __webpack_require__.d(getter, { a: getter });
-/******/ return getter;
-/******/ };
-/******/ })();
-/******/
-/******/ /* webpack/runtime/define property getters */
-/******/ (() => {
-/******/ // define getter functions for harmony exports
-/******/ __webpack_require__.d = (exports, definition) => {
-/******/ for(var key in definition) {
-/******/ if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
-/******/ Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
-/******/ }
-/******/ }
-/******/ };
-/******/ })();
-/******/
-/******/ /* webpack/runtime/hasOwnProperty shorthand */
-/******/ (() => {
-/******/ __webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))
-/******/ })();
-/******/
-/******/ /* webpack/runtime/make namespace object */
-/******/ (() => {
-/******/ // define __esModule on exports
-/******/ __webpack_require__.r = (exports) => {
-/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ }
-/******/ Object.defineProperty(exports, '__esModule', { value: true });
-/******/ };
-/******/ })();
-/******/
-/************************************************************************/
-var __webpack_exports__ = {};
-// This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
-(() => {
-/*!************************************************!*\
+ /******/
+ };
+ /************************************************************************/
+ /******/ // The module cache
+ /******/ var __webpack_module_cache__ = {};
+ /******/
+ /******/ // The require function
+ /******/ function __webpack_require__(moduleId) {
+ /******/ // Check if module is in cache
+ /******/ var cachedModule = __webpack_module_cache__[moduleId];
+ /******/ if (cachedModule !== undefined) {
+ /******/ return cachedModule.exports;
+ /******/
+ }
+ /******/ // Create a new module (and put it into the cache)
+ /******/ var module = (__webpack_module_cache__[moduleId] = {
+ /******/ // no module.id needed
+ /******/ // no module.loaded needed
+ /******/ exports: {}
+ /******/
+ });
+ /******/
+ /******/ // Execute the module function
+ /******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+ /******/
+ /******/ // Return the exports of the module
+ /******/ return module.exports;
+ /******/
+ }
+ /******/
+ /************************************************************************/
+ /******/ /* webpack/runtime/compat get default export */
+ /******/ (() => {
+ /******/ // getDefaultExport function for compatibility with non-harmony modules
+ /******/ __webpack_require__.n = (module) => {
+ /******/ var getter =
+ module && module.__esModule ? /******/ () => module['default'] : /******/ () => module;
+ /******/ __webpack_require__.d(getter, { a: getter });
+ /******/ return getter;
+ /******/
+ };
+ /******/
+ })();
+ /******/
+ /******/ /* webpack/runtime/define property getters */
+ /******/ (() => {
+ /******/ // define getter functions for harmony exports
+ /******/ __webpack_require__.d = (exports, definition) => {
+ /******/ for (var key in definition) {
+ /******/ if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
+ /******/ Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
+ /******/
+ }
+ /******/
+ }
+ /******/
+ };
+ /******/
+ })();
+ /******/
+ /******/ /* webpack/runtime/hasOwnProperty shorthand */
+ /******/ (() => {
+ /******/ __webpack_require__.o = (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop);
+ /******/
+ })();
+ /******/
+ /******/ /* webpack/runtime/make namespace object */
+ /******/ (() => {
+ /******/ // define __esModule on exports
+ /******/ __webpack_require__.r = (exports) => {
+ /******/ if (typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+ /******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+ /******/
+ }
+ /******/ Object.defineProperty(exports, '__esModule', { value: true });
+ /******/
+ };
+ /******/
+ })();
+ /******/
+ /************************************************************************/
+ var __webpack_exports__ = {};
+ // This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
+ (() => {
+ /*!************************************************!*\
!*** ./lib-esnext/scripts/install-run-rush.js ***!
\************************************************/
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! path */ 371017);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! fs */ 657147);
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_1__);
-// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
-// See LICENSE in the project root for license information.
-/* eslint-disable no-console */
-
+ __webpack_require__.r(__webpack_exports__);
+ /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! path */ 371017);
+ /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/ __webpack_require__.n(
+ path__WEBPACK_IMPORTED_MODULE_0__
+ );
+ /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! fs */ 657147);
+ /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
+ fs__WEBPACK_IMPORTED_MODULE_1__
+ );
+ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+ // See LICENSE in the project root for license information.
+ /* eslint-disable no-console */
-const { installAndRun, findRushJsonFolder, RUSH_JSON_FILENAME, runWithErrorAndStatusCode } = require('./install-run');
-const PACKAGE_NAME = '@microsoft/rush';
-const RUSH_PREVIEW_VERSION = 'RUSH_PREVIEW_VERSION';
-const INSTALL_RUN_RUSH_LOCKFILE_PATH_VARIABLE = 'INSTALL_RUN_RUSH_LOCKFILE_PATH';
-function _getRushVersion(logger) {
- const rushPreviewVersion = process.env[RUSH_PREVIEW_VERSION];
- if (rushPreviewVersion !== undefined) {
- logger.info(`Using Rush version from environment variable ${RUSH_PREVIEW_VERSION}=${rushPreviewVersion}`);
+ const {
+ installAndRun,
+ findRushJsonFolder,
+ RUSH_JSON_FILENAME,
+ runWithErrorAndStatusCode
+ } = require('./install-run');
+ const PACKAGE_NAME = '@microsoft/rush';
+ const RUSH_PREVIEW_VERSION = 'RUSH_PREVIEW_VERSION';
+ const INSTALL_RUN_RUSH_LOCKFILE_PATH_VARIABLE = 'INSTALL_RUN_RUSH_LOCKFILE_PATH';
+ function _getRushVersion(logger) {
+ const rushPreviewVersion = process.env[RUSH_PREVIEW_VERSION];
+ if (rushPreviewVersion !== undefined) {
+ logger.info(
+ `Using Rush version from environment variable ${RUSH_PREVIEW_VERSION}=${rushPreviewVersion}`
+ );
return rushPreviewVersion;
- }
- const rushJsonFolder = findRushJsonFolder();
- const rushJsonPath = path__WEBPACK_IMPORTED_MODULE_0__.join(rushJsonFolder, RUSH_JSON_FILENAME);
- try {
+ }
+ const rushJsonFolder = findRushJsonFolder();
+ const rushJsonPath = path__WEBPACK_IMPORTED_MODULE_0__.join(rushJsonFolder, RUSH_JSON_FILENAME);
+ try {
const rushJsonContents = fs__WEBPACK_IMPORTED_MODULE_1__.readFileSync(rushJsonPath, 'utf-8');
// Use a regular expression to parse out the rushVersion value because rush.json supports comments,
// but JSON.parse does not and we don't want to pull in more dependencies than we need to in this script.
const rushJsonMatches = rushJsonContents.match(/\"rushVersion\"\s*\:\s*\"([0-9a-zA-Z.+\-]+)\"/);
return rushJsonMatches[1];
- }
- catch (e) {
- throw new Error(`Unable to determine the required version of Rush from ${RUSH_JSON_FILENAME} (${rushJsonFolder}). ` +
+ } catch (e) {
+ throw new Error(
+ `Unable to determine the required version of Rush from ${RUSH_JSON_FILENAME} (${rushJsonFolder}). ` +
`The 'rushVersion' field is either not assigned in ${RUSH_JSON_FILENAME} or was specified ` +
- 'using an unexpected syntax.');
+ 'using an unexpected syntax.'
+ );
+ }
}
-}
-function _getBin(scriptName) {
- switch (scriptName.toLowerCase()) {
+ function _getBin(scriptName) {
+ switch (scriptName.toLowerCase()) {
case 'install-run-rush-pnpm.js':
- return 'rush-pnpm';
+ return 'rush-pnpm';
case 'install-run-rushx.js':
- return 'rushx';
+ return 'rushx';
default:
- return 'rush';
+ return 'rush';
+ }
}
-}
-function _run() {
- const [nodePath /* Ex: /bin/node */, scriptPath /* /repo/common/scripts/install-run-rush.js */, ...packageBinArgs /* [build, --to, myproject] */] = process.argv;
- // Detect if this script was directly invoked, or if the install-run-rushx script was invokved to select the
- // appropriate binary inside the rush package to run
- const scriptName = path__WEBPACK_IMPORTED_MODULE_0__.basename(scriptPath);
- const bin = _getBin(scriptName);
- if (!nodePath || !scriptPath) {
+ function _run() {
+ const [
+ nodePath /* Ex: /bin/node */,
+ scriptPath /* /repo/common/scripts/install-run-rush.js */,
+ ...packageBinArgs /* [build, --to, myproject] */
+ ] = process.argv;
+ // Detect if this script was directly invoked, or if the install-run-rushx script was invokved to select the
+ // appropriate binary inside the rush package to run
+ const scriptName = path__WEBPACK_IMPORTED_MODULE_0__.basename(scriptPath);
+ const bin = _getBin(scriptName);
+ if (!nodePath || !scriptPath) {
throw new Error('Unexpected exception: could not detect node path or script path');
- }
- let commandFound = false;
- let logger = { info: console.log, error: console.error };
- for (const arg of packageBinArgs) {
+ }
+ let commandFound = false;
+ let logger = { info: console.log, error: console.error };
+ for (const arg of packageBinArgs) {
if (arg === '-q' || arg === '--quiet') {
- // The -q/--quiet flag is supported by both `rush` and `rushx`, and will suppress
- // any normal informational/diagnostic information printed during startup.
- //
- // To maintain the same user experience, the install-run* scripts pass along this
- // flag but also use it to suppress any diagnostic information normally printed
- // to stdout.
- logger = {
- info: () => { },
- error: console.error
- };
+ // The -q/--quiet flag is supported by both `rush` and `rushx`, and will suppress
+ // any normal informational/diagnostic information printed during startup.
+ //
+ // To maintain the same user experience, the install-run* scripts pass along this
+ // flag but also use it to suppress any diagnostic information normally printed
+ // to stdout.
+ logger = {
+ info: () => {},
+ error: console.error
+ };
+ } else if (!arg.startsWith('-') || arg === '-h' || arg === '--help') {
+ // We either found something that looks like a command (i.e. - doesn't start with a "-"),
+ // or we found the -h/--help flag, which can be run without a command
+ commandFound = true;
}
- else if (!arg.startsWith('-') || arg === '-h' || arg === '--help') {
- // We either found something that looks like a command (i.e. - doesn't start with a "-"),
- // or we found the -h/--help flag, which can be run without a command
- commandFound = true;
- }
- }
- if (!commandFound) {
+ }
+ if (!commandFound) {
console.log(`Usage: ${scriptName} [args...]`);
if (scriptName === 'install-run-rush-pnpm.js') {
- console.log(`Example: ${scriptName} pnpm-command`);
- }
- else if (scriptName === 'install-run-rush.js') {
- console.log(`Example: ${scriptName} build --to myproject`);
- }
- else {
- console.log(`Example: ${scriptName} custom-command`);
+ console.log(`Example: ${scriptName} pnpm-command`);
+ } else if (scriptName === 'install-run-rush.js') {
+ console.log(`Example: ${scriptName} build --to myproject`);
+ } else {
+ console.log(`Example: ${scriptName} custom-command`);
}
process.exit(1);
- }
- runWithErrorAndStatusCode(logger, () => {
+ }
+ runWithErrorAndStatusCode(logger, () => {
const version = _getRushVersion(logger);
logger.info(`The ${RUSH_JSON_FILENAME} configuration requests Rush version ${version}`);
const lockFilePath = process.env[INSTALL_RUN_RUSH_LOCKFILE_PATH_VARIABLE];
if (lockFilePath) {
- logger.info(`Found ${INSTALL_RUN_RUSH_LOCKFILE_PATH_VARIABLE}="${lockFilePath}", installing with lockfile.`);
+ logger.info(
+ `Found ${INSTALL_RUN_RUSH_LOCKFILE_PATH_VARIABLE}="${lockFilePath}", installing with lockfile.`
+ );
}
return installAndRun(logger, PACKAGE_NAME, version, bin, packageBinArgs, lockFilePath);
- });
-}
-_run();
-//# sourceMappingURL=install-run-rush.js.map
-})();
+ });
+ }
+ _run();
+ //# sourceMappingURL=install-run-rush.js.map
+ })();
-module.exports = __webpack_exports__;
-/******/ })()
-;
-//# sourceMappingURL=install-run-rush.js.map
\ No newline at end of file
+ module.exports = __webpack_exports__;
+ /******/
+})();
+//# sourceMappingURL=install-run-rush.js.map
diff --git a/build-tests/rush-redis-cobuild-plugin-integration-test/sandbox/sharded-repo/common/scripts/install-run-rushx.js b/build-tests/rush-redis-cobuild-plugin-integration-test/sandbox/sharded-repo/common/scripts/install-run-rushx.js
index 6581521f3c7..f865303a384 100644
--- a/build-tests/rush-redis-cobuild-plugin-integration-test/sandbox/sharded-repo/common/scripts/install-run-rushx.js
+++ b/build-tests/rush-redis-cobuild-plugin-integration-test/sandbox/sharded-repo/common/scripts/install-run-rushx.js
@@ -14,18 +14,19 @@
// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
// See the @microsoft/rush package's LICENSE file for details.
-/******/ (() => { // webpackBootstrap
-/******/ "use strict";
-var __webpack_exports__ = {};
-/*!*************************************************!*\
+/******/ (() => {
+ // webpackBootstrap
+ /******/ 'use strict';
+ var __webpack_exports__ = {};
+ /*!*************************************************!*\
!*** ./lib-esnext/scripts/install-run-rushx.js ***!
\*************************************************/
-// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
-// See LICENSE in the project root for license information.
-require('./install-run-rush');
+ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+ // See LICENSE in the project root for license information.
+ require('./install-run-rush');
+ //# sourceMappingURL=install-run-rushx.js.map
+ module.exports = __webpack_exports__;
+ /******/
+})();
//# sourceMappingURL=install-run-rushx.js.map
-module.exports = __webpack_exports__;
-/******/ })()
-;
-//# sourceMappingURL=install-run-rushx.js.map
\ No newline at end of file
diff --git a/build-tests/rush-redis-cobuild-plugin-integration-test/sandbox/sharded-repo/common/scripts/install-run.js b/build-tests/rush-redis-cobuild-plugin-integration-test/sandbox/sharded-repo/common/scripts/install-run.js
index 9283c445267..580ebb343e9 100644
--- a/build-tests/rush-redis-cobuild-plugin-integration-test/sandbox/sharded-repo/common/scripts/install-run.js
+++ b/build-tests/rush-redis-cobuild-plugin-integration-test/sandbox/sharded-repo/common/scripts/install-run.js
@@ -12,732 +12,810 @@
// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
// See the @microsoft/rush package's LICENSE file for details.
-/******/ (() => { // webpackBootstrap
-/******/ "use strict";
-/******/ var __webpack_modules__ = ({
-
-/***/ 679877:
-/*!************************************************!*\
+/******/ (() => {
+ // webpackBootstrap
+ /******/ 'use strict';
+ /******/ var __webpack_modules__ = {
+ /***/ 679877:
+ /*!************************************************!*\
!*** ./lib-esnext/utilities/npmrcUtilities.js ***!
\************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-__webpack_require__.r(__webpack_exports__);
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */ "isVariableSetInNpmrcFile": () => (/* binding */ isVariableSetInNpmrcFile),
-/* harmony export */ "syncNpmrc": () => (/* binding */ syncNpmrc)
-/* harmony export */ });
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! fs */ 657147);
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! path */ 371017);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
-// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
-// See LICENSE in the project root for license information.
-// IMPORTANT - do not use any non-built-in libraries in this file
-
+ /***/ (__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+ __webpack_require__.r(__webpack_exports__);
+ /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+ /* harmony export */ isVariableSetInNpmrcFile: () => /* binding */ isVariableSetInNpmrcFile,
+ /* harmony export */ syncNpmrc: () => /* binding */ syncNpmrc
+ /* harmony export */
+ });
+ /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! fs */ 657147);
+ /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0___default =
+ /*#__PURE__*/ __webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_0__);
+ /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! path */ 371017);
+ /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default =
+ /*#__PURE__*/ __webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
+ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+ // See LICENSE in the project root for license information.
+ // IMPORTANT - do not use any non-built-in libraries in this file
-/**
- * This function reads the content for given .npmrc file path, and also trims
- * unusable lines from the .npmrc file.
- *
- * @returns
- * The text of the the .npmrc.
- */
-// create a global _combinedNpmrc for cache purpose
-const _combinedNpmrcMap = new Map();
-function _trimNpmrcFile(options) {
- const { sourceNpmrcPath, linesToPrepend, linesToAppend } = options;
- const combinedNpmrcFromCache = _combinedNpmrcMap.get(sourceNpmrcPath);
- if (combinedNpmrcFromCache !== undefined) {
- return combinedNpmrcFromCache;
- }
- let npmrcFileLines = [];
- if (linesToPrepend) {
- npmrcFileLines.push(...linesToPrepend);
- }
- if (fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(sourceNpmrcPath)) {
- npmrcFileLines.push(...fs__WEBPACK_IMPORTED_MODULE_0__.readFileSync(sourceNpmrcPath).toString().split('\n'));
- }
- if (linesToAppend) {
- npmrcFileLines.push(...linesToAppend);
- }
- npmrcFileLines = npmrcFileLines.map((line) => (line || '').trim());
- const resultLines = [];
- // This finds environment variable tokens that look like "${VAR_NAME}"
- const expansionRegExp = /\$\{([^\}]+)\}/g;
- // Comment lines start with "#" or ";"
- const commentRegExp = /^\s*[#;]/;
- // Trim out lines that reference environment variables that aren't defined
- for (let line of npmrcFileLines) {
- let lineShouldBeTrimmed = false;
- //remove spaces before or after key and value
- line = line
- .split('=')
- .map((lineToTrim) => lineToTrim.trim())
- .join('=');
- // Ignore comment lines
- if (!commentRegExp.test(line)) {
- const environmentVariables = line.match(expansionRegExp);
- if (environmentVariables) {
+ /**
+ * This function reads the content for given .npmrc file path, and also trims
+ * unusable lines from the .npmrc file.
+ *
+ * @returns
+ * The text of the the .npmrc.
+ */
+ // create a global _combinedNpmrc for cache purpose
+ const _combinedNpmrcMap = new Map();
+ function _trimNpmrcFile(options) {
+ const { sourceNpmrcPath, linesToPrepend, linesToAppend } = options;
+ const combinedNpmrcFromCache = _combinedNpmrcMap.get(sourceNpmrcPath);
+ if (combinedNpmrcFromCache !== undefined) {
+ return combinedNpmrcFromCache;
+ }
+ let npmrcFileLines = [];
+ if (linesToPrepend) {
+ npmrcFileLines.push(...linesToPrepend);
+ }
+ if (fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(sourceNpmrcPath)) {
+ npmrcFileLines.push(
+ ...fs__WEBPACK_IMPORTED_MODULE_0__.readFileSync(sourceNpmrcPath).toString().split('\n')
+ );
+ }
+ if (linesToAppend) {
+ npmrcFileLines.push(...linesToAppend);
+ }
+ npmrcFileLines = npmrcFileLines.map((line) => (line || '').trim());
+ const resultLines = [];
+ // This finds environment variable tokens that look like "${VAR_NAME}"
+ const expansionRegExp = /\$\{([^\}]+)\}/g;
+ // Comment lines start with "#" or ";"
+ const commentRegExp = /^\s*[#;]/;
+ // Trim out lines that reference environment variables that aren't defined
+ for (let line of npmrcFileLines) {
+ let lineShouldBeTrimmed = false;
+ //remove spaces before or after key and value
+ line = line
+ .split('=')
+ .map((lineToTrim) => lineToTrim.trim())
+ .join('=');
+ // Ignore comment lines
+ if (!commentRegExp.test(line)) {
+ const environmentVariables = line.match(expansionRegExp);
+ if (environmentVariables) {
for (const token of environmentVariables) {
- // Remove the leading "${" and the trailing "}" from the token
- const environmentVariableName = token.substring(2, token.length - 1);
- // Is the environment variable defined?
- if (!process.env[environmentVariableName]) {
- // No, so trim this line
- lineShouldBeTrimmed = true;
- break;
- }
+ // Remove the leading "${" and the trailing "}" from the token
+ const environmentVariableName = token.substring(2, token.length - 1);
+ // Is the environment variable defined?
+ if (!process.env[environmentVariableName]) {
+ // No, so trim this line
+ lineShouldBeTrimmed = true;
+ break;
+ }
}
+ }
}
+ if (lineShouldBeTrimmed) {
+ // Example output:
+ // "; MISSING ENVIRONMENT VARIABLE: //my-registry.com/npm/:_authToken=${MY_AUTH_TOKEN}"
+ resultLines.push('; MISSING ENVIRONMENT VARIABLE: ' + line);
+ } else {
+ resultLines.push(line);
+ }
+ }
+ const combinedNpmrc = resultLines.join('\n');
+ //save the cache
+ _combinedNpmrcMap.set(sourceNpmrcPath, combinedNpmrc);
+ return combinedNpmrc;
}
- if (lineShouldBeTrimmed) {
- // Example output:
- // "; MISSING ENVIRONMENT VARIABLE: //my-registry.com/npm/:_authToken=${MY_AUTH_TOKEN}"
- resultLines.push('; MISSING ENVIRONMENT VARIABLE: ' + line);
- }
- else {
- resultLines.push(line);
+ function _copyAndTrimNpmrcFile(options) {
+ const { logger, sourceNpmrcPath, targetNpmrcPath, linesToPrepend, linesToAppend } = options;
+ logger.info(`Transforming ${sourceNpmrcPath}`); // Verbose
+ logger.info(` --> "${targetNpmrcPath}"`);
+ const combinedNpmrc = _trimNpmrcFile({
+ sourceNpmrcPath,
+ linesToPrepend,
+ linesToAppend
+ });
+ fs__WEBPACK_IMPORTED_MODULE_0__.writeFileSync(targetNpmrcPath, combinedNpmrc);
+ return combinedNpmrc;
}
- }
- const combinedNpmrc = resultLines.join('\n');
- //save the cache
- _combinedNpmrcMap.set(sourceNpmrcPath, combinedNpmrc);
- return combinedNpmrc;
-}
-function _copyAndTrimNpmrcFile(options) {
- const { logger, sourceNpmrcPath, targetNpmrcPath, linesToPrepend, linesToAppend } = options;
- logger.info(`Transforming ${sourceNpmrcPath}`); // Verbose
- logger.info(` --> "${targetNpmrcPath}"`);
- const combinedNpmrc = _trimNpmrcFile({
- sourceNpmrcPath,
- linesToPrepend,
- linesToAppend
- });
- fs__WEBPACK_IMPORTED_MODULE_0__.writeFileSync(targetNpmrcPath, combinedNpmrc);
- return combinedNpmrc;
-}
-function syncNpmrc(options) {
- const { sourceNpmrcFolder, targetNpmrcFolder, useNpmrcPublish, logger = {
- // eslint-disable-next-line no-console
- info: console.log,
- // eslint-disable-next-line no-console
- error: console.error
- }, createIfMissing = false, linesToAppend, linesToPrepend } = options;
- const sourceNpmrcPath = path__WEBPACK_IMPORTED_MODULE_1__.join(sourceNpmrcFolder, !useNpmrcPublish ? '.npmrc' : '.npmrc-publish');
- const targetNpmrcPath = path__WEBPACK_IMPORTED_MODULE_1__.join(targetNpmrcFolder, '.npmrc');
- try {
- if (fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(sourceNpmrcPath) || createIfMissing) {
- // Ensure the target folder exists
- if (!fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(targetNpmrcFolder)) {
+ function syncNpmrc(options) {
+ const {
+ sourceNpmrcFolder,
+ targetNpmrcFolder,
+ useNpmrcPublish,
+ logger = {
+ // eslint-disable-next-line no-console
+ info: console.log,
+ // eslint-disable-next-line no-console
+ error: console.error
+ },
+ createIfMissing = false,
+ linesToAppend,
+ linesToPrepend
+ } = options;
+ const sourceNpmrcPath = path__WEBPACK_IMPORTED_MODULE_1__.join(
+ sourceNpmrcFolder,
+ !useNpmrcPublish ? '.npmrc' : '.npmrc-publish'
+ );
+ const targetNpmrcPath = path__WEBPACK_IMPORTED_MODULE_1__.join(targetNpmrcFolder, '.npmrc');
+ try {
+ if (fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(sourceNpmrcPath) || createIfMissing) {
+ // Ensure the target folder exists
+ if (!fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(targetNpmrcFolder)) {
fs__WEBPACK_IMPORTED_MODULE_0__.mkdirSync(targetNpmrcFolder, { recursive: true });
- }
- return _copyAndTrimNpmrcFile({
+ }
+ return _copyAndTrimNpmrcFile({
sourceNpmrcPath,
targetNpmrcPath,
logger,
linesToAppend,
linesToPrepend
- });
+ });
+ } else if (fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(targetNpmrcPath)) {
+ // If the source .npmrc doesn't exist and there is one in the target, delete the one in the target
+ logger.info(`Deleting ${targetNpmrcPath}`); // Verbose
+ fs__WEBPACK_IMPORTED_MODULE_0__.unlinkSync(targetNpmrcPath);
+ }
+ } catch (e) {
+ throw new Error(`Error syncing .npmrc file: ${e}`);
+ }
}
- else if (fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(targetNpmrcPath)) {
- // If the source .npmrc doesn't exist and there is one in the target, delete the one in the target
- logger.info(`Deleting ${targetNpmrcPath}`); // Verbose
- fs__WEBPACK_IMPORTED_MODULE_0__.unlinkSync(targetNpmrcPath);
+ function isVariableSetInNpmrcFile(sourceNpmrcFolder, variableKey) {
+ const sourceNpmrcPath = `${sourceNpmrcFolder}/.npmrc`;
+ //if .npmrc file does not exist, return false directly
+ if (!fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(sourceNpmrcPath)) {
+ return false;
+ }
+ const trimmedNpmrcFile = _trimNpmrcFile({ sourceNpmrcPath });
+ const variableKeyRegExp = new RegExp(`^${variableKey}=`, 'm');
+ return trimmedNpmrcFile.match(variableKeyRegExp) !== null;
}
- }
- catch (e) {
- throw new Error(`Error syncing .npmrc file: ${e}`);
- }
-}
-function isVariableSetInNpmrcFile(sourceNpmrcFolder, variableKey) {
- const sourceNpmrcPath = `${sourceNpmrcFolder}/.npmrc`;
- //if .npmrc file does not exist, return false directly
- if (!fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(sourceNpmrcPath)) {
- return false;
- }
- const trimmedNpmrcFile = _trimNpmrcFile({ sourceNpmrcPath });
- const variableKeyRegExp = new RegExp(`^${variableKey}=`, 'm');
- return trimmedNpmrcFile.match(variableKeyRegExp) !== null;
-}
-//# sourceMappingURL=npmrcUtilities.js.map
+ //# sourceMappingURL=npmrcUtilities.js.map
-/***/ }),
+ /***/
+ },
-/***/ 532081:
-/*!********************************!*\
+ /***/ 532081:
+ /*!********************************!*\
!*** external "child_process" ***!
\********************************/
-/***/ ((module) => {
-
-module.exports = require("child_process");
+ /***/ (module) => {
+ module.exports = require('child_process');
-/***/ }),
+ /***/
+ },
-/***/ 657147:
-/*!*********************!*\
+ /***/ 657147:
+ /*!*********************!*\
!*** external "fs" ***!
\*********************/
-/***/ ((module) => {
+ /***/ (module) => {
+ module.exports = require('fs');
-module.exports = require("fs");
+ /***/
+ },
-/***/ }),
-
-/***/ 822037:
-/*!*********************!*\
+ /***/ 822037:
+ /*!*********************!*\
!*** external "os" ***!
\*********************/
-/***/ ((module) => {
-
-module.exports = require("os");
+ /***/ (module) => {
+ module.exports = require('os');
-/***/ }),
+ /***/
+ },
-/***/ 371017:
-/*!***********************!*\
+ /***/ 371017:
+ /*!***********************!*\
!*** external "path" ***!
\***********************/
-/***/ ((module) => {
-
-module.exports = require("path");
+ /***/ (module) => {
+ module.exports = require('path');
-/***/ })
+ /***/
+ }
-/******/ });
-/************************************************************************/
-/******/ // The module cache
-/******/ var __webpack_module_cache__ = {};
-/******/
-/******/ // The require function
-/******/ function __webpack_require__(moduleId) {
-/******/ // Check if module is in cache
-/******/ var cachedModule = __webpack_module_cache__[moduleId];
-/******/ if (cachedModule !== undefined) {
-/******/ return cachedModule.exports;
-/******/ }
-/******/ // Create a new module (and put it into the cache)
-/******/ var module = __webpack_module_cache__[moduleId] = {
-/******/ // no module.id needed
-/******/ // no module.loaded needed
-/******/ exports: {}
-/******/ };
-/******/
-/******/ // Execute the module function
-/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-/******/
-/******/ // Return the exports of the module
-/******/ return module.exports;
-/******/ }
-/******/
-/************************************************************************/
-/******/ /* webpack/runtime/compat get default export */
-/******/ (() => {
-/******/ // getDefaultExport function for compatibility with non-harmony modules
-/******/ __webpack_require__.n = (module) => {
-/******/ var getter = module && module.__esModule ?
-/******/ () => (module['default']) :
-/******/ () => (module);
-/******/ __webpack_require__.d(getter, { a: getter });
-/******/ return getter;
-/******/ };
-/******/ })();
-/******/
-/******/ /* webpack/runtime/define property getters */
-/******/ (() => {
-/******/ // define getter functions for harmony exports
-/******/ __webpack_require__.d = (exports, definition) => {
-/******/ for(var key in definition) {
-/******/ if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
-/******/ Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
-/******/ }
-/******/ }
-/******/ };
-/******/ })();
-/******/
-/******/ /* webpack/runtime/hasOwnProperty shorthand */
-/******/ (() => {
-/******/ __webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))
-/******/ })();
-/******/
-/******/ /* webpack/runtime/make namespace object */
-/******/ (() => {
-/******/ // define __esModule on exports
-/******/ __webpack_require__.r = (exports) => {
-/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ }
-/******/ Object.defineProperty(exports, '__esModule', { value: true });
-/******/ };
-/******/ })();
-/******/
-/************************************************************************/
-var __webpack_exports__ = {};
-// This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
-(() => {
-/*!*******************************************!*\
+ /******/
+ };
+ /************************************************************************/
+ /******/ // The module cache
+ /******/ var __webpack_module_cache__ = {};
+ /******/
+ /******/ // The require function
+ /******/ function __webpack_require__(moduleId) {
+ /******/ // Check if module is in cache
+ /******/ var cachedModule = __webpack_module_cache__[moduleId];
+ /******/ if (cachedModule !== undefined) {
+ /******/ return cachedModule.exports;
+ /******/
+ }
+ /******/ // Create a new module (and put it into the cache)
+ /******/ var module = (__webpack_module_cache__[moduleId] = {
+ /******/ // no module.id needed
+ /******/ // no module.loaded needed
+ /******/ exports: {}
+ /******/
+ });
+ /******/
+ /******/ // Execute the module function
+ /******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+ /******/
+ /******/ // Return the exports of the module
+ /******/ return module.exports;
+ /******/
+ }
+ /******/
+ /************************************************************************/
+ /******/ /* webpack/runtime/compat get default export */
+ /******/ (() => {
+ /******/ // getDefaultExport function for compatibility with non-harmony modules
+ /******/ __webpack_require__.n = (module) => {
+ /******/ var getter =
+ module && module.__esModule ? /******/ () => module['default'] : /******/ () => module;
+ /******/ __webpack_require__.d(getter, { a: getter });
+ /******/ return getter;
+ /******/
+ };
+ /******/
+ })();
+ /******/
+ /******/ /* webpack/runtime/define property getters */
+ /******/ (() => {
+ /******/ // define getter functions for harmony exports
+ /******/ __webpack_require__.d = (exports, definition) => {
+ /******/ for (var key in definition) {
+ /******/ if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
+ /******/ Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
+ /******/
+ }
+ /******/
+ }
+ /******/
+ };
+ /******/
+ })();
+ /******/
+ /******/ /* webpack/runtime/hasOwnProperty shorthand */
+ /******/ (() => {
+ /******/ __webpack_require__.o = (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop);
+ /******/
+ })();
+ /******/
+ /******/ /* webpack/runtime/make namespace object */
+ /******/ (() => {
+ /******/ // define __esModule on exports
+ /******/ __webpack_require__.r = (exports) => {
+ /******/ if (typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+ /******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+ /******/
+ }
+ /******/ Object.defineProperty(exports, '__esModule', { value: true });
+ /******/
+ };
+ /******/
+ })();
+ /******/
+ /************************************************************************/
+ var __webpack_exports__ = {};
+ // This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
+ (() => {
+ /*!*******************************************!*\
!*** ./lib-esnext/scripts/install-run.js ***!
\*******************************************/
-__webpack_require__.r(__webpack_exports__);
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */ "RUSH_JSON_FILENAME": () => (/* binding */ RUSH_JSON_FILENAME),
-/* harmony export */ "findRushJsonFolder": () => (/* binding */ findRushJsonFolder),
-/* harmony export */ "getNpmPath": () => (/* binding */ getNpmPath),
-/* harmony export */ "installAndRun": () => (/* binding */ installAndRun),
-/* harmony export */ "runWithErrorAndStatusCode": () => (/* binding */ runWithErrorAndStatusCode)
-/* harmony export */ });
-/* harmony import */ var child_process__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! child_process */ 532081);
-/* harmony import */ var child_process__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(child_process__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! fs */ 657147);
-/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var os__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! os */ 822037);
-/* harmony import */ var os__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(os__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! path */ 371017);
-/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _utilities_npmrcUtilities__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utilities/npmrcUtilities */ 679877);
-// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
-// See LICENSE in the project root for license information.
-/* eslint-disable no-console */
-
-
-
-
+ __webpack_require__.r(__webpack_exports__);
+ /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+ /* harmony export */ RUSH_JSON_FILENAME: () => /* binding */ RUSH_JSON_FILENAME,
+ /* harmony export */ findRushJsonFolder: () => /* binding */ findRushJsonFolder,
+ /* harmony export */ getNpmPath: () => /* binding */ getNpmPath,
+ /* harmony export */ installAndRun: () => /* binding */ installAndRun,
+ /* harmony export */ runWithErrorAndStatusCode: () => /* binding */ runWithErrorAndStatusCode
+ /* harmony export */
+ });
+ /* harmony import */ var child_process__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(
+ /*! child_process */ 532081
+ );
+ /* harmony import */ var child_process__WEBPACK_IMPORTED_MODULE_0___default =
+ /*#__PURE__*/ __webpack_require__.n(child_process__WEBPACK_IMPORTED_MODULE_0__);
+ /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! fs */ 657147);
+ /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/ __webpack_require__.n(
+ fs__WEBPACK_IMPORTED_MODULE_1__
+ );
+ /* harmony import */ var os__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! os */ 822037);
+ /* harmony import */ var os__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/ __webpack_require__.n(
+ os__WEBPACK_IMPORTED_MODULE_2__
+ );
+ /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! path */ 371017);
+ /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/ __webpack_require__.n(
+ path__WEBPACK_IMPORTED_MODULE_3__
+ );
+ /* harmony import */ var _utilities_npmrcUtilities__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(
+ /*! ../utilities/npmrcUtilities */ 679877
+ );
+ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+ // See LICENSE in the project root for license information.
+ /* eslint-disable no-console */
-const RUSH_JSON_FILENAME = 'rush.json';
-const RUSH_TEMP_FOLDER_ENV_VARIABLE_NAME = 'RUSH_TEMP_FOLDER';
-const INSTALL_RUN_LOCKFILE_PATH_VARIABLE = 'INSTALL_RUN_LOCKFILE_PATH';
-const INSTALLED_FLAG_FILENAME = 'installed.flag';
-const NODE_MODULES_FOLDER_NAME = 'node_modules';
-const PACKAGE_JSON_FILENAME = 'package.json';
-/**
- * Parse a package specifier (in the form of name\@version) into name and version parts.
- */
-function _parsePackageSpecifier(rawPackageSpecifier) {
- rawPackageSpecifier = (rawPackageSpecifier || '').trim();
- const separatorIndex = rawPackageSpecifier.lastIndexOf('@');
- let name;
- let version = undefined;
- if (separatorIndex === 0) {
+ const RUSH_JSON_FILENAME = 'rush.json';
+ const RUSH_TEMP_FOLDER_ENV_VARIABLE_NAME = 'RUSH_TEMP_FOLDER';
+ const INSTALL_RUN_LOCKFILE_PATH_VARIABLE = 'INSTALL_RUN_LOCKFILE_PATH';
+ const INSTALLED_FLAG_FILENAME = 'installed.flag';
+ const NODE_MODULES_FOLDER_NAME = 'node_modules';
+ const PACKAGE_JSON_FILENAME = 'package.json';
+ /**
+ * Parse a package specifier (in the form of name\@version) into name and version parts.
+ */
+ function _parsePackageSpecifier(rawPackageSpecifier) {
+ rawPackageSpecifier = (rawPackageSpecifier || '').trim();
+ const separatorIndex = rawPackageSpecifier.lastIndexOf('@');
+ let name;
+ let version = undefined;
+ if (separatorIndex === 0) {
// The specifier starts with a scope and doesn't have a version specified
name = rawPackageSpecifier;
- }
- else if (separatorIndex === -1) {
+ } else if (separatorIndex === -1) {
// The specifier doesn't have a version
name = rawPackageSpecifier;
- }
- else {
+ } else {
name = rawPackageSpecifier.substring(0, separatorIndex);
version = rawPackageSpecifier.substring(separatorIndex + 1);
- }
- if (!name) {
+ }
+ if (!name) {
throw new Error(`Invalid package specifier: ${rawPackageSpecifier}`);
- }
- return { name, version };
-}
-let _npmPath = undefined;
-/**
- * Get the absolute path to the npm executable
- */
-function getNpmPath() {
- if (!_npmPath) {
+ }
+ return { name, version };
+ }
+ let _npmPath = undefined;
+ /**
+ * Get the absolute path to the npm executable
+ */
+ function getNpmPath() {
+ if (!_npmPath) {
try {
- if (_isWindows()) {
- // We're on Windows
- const whereOutput = child_process__WEBPACK_IMPORTED_MODULE_0__.execSync('where npm', { stdio: [] }).toString();
- const lines = whereOutput.split(os__WEBPACK_IMPORTED_MODULE_2__.EOL).filter((line) => !!line);
- // take the last result, we are looking for a .cmd command
- // see https://github.com/microsoft/rushstack/issues/759
- _npmPath = lines[lines.length - 1];
- }
- else {
- // We aren't on Windows - assume we're on *NIX or Darwin
- _npmPath = child_process__WEBPACK_IMPORTED_MODULE_0__.execSync('command -v npm', { stdio: [] }).toString();
- }
- }
- catch (e) {
- throw new Error(`Unable to determine the path to the NPM tool: ${e}`);
+ if (_isWindows()) {
+ // We're on Windows
+ const whereOutput = child_process__WEBPACK_IMPORTED_MODULE_0__
+ .execSync('where npm', { stdio: [] })
+ .toString();
+ const lines = whereOutput.split(os__WEBPACK_IMPORTED_MODULE_2__.EOL).filter((line) => !!line);
+ // take the last result, we are looking for a .cmd command
+ // see https://github.com/microsoft/rushstack/issues/759
+ _npmPath = lines[lines.length - 1];
+ } else {
+ // We aren't on Windows - assume we're on *NIX or Darwin
+ _npmPath = child_process__WEBPACK_IMPORTED_MODULE_0__
+ .execSync('command -v npm', { stdio: [] })
+ .toString();
+ }
+ } catch (e) {
+ throw new Error(`Unable to determine the path to the NPM tool: ${e}`);
}
_npmPath = _npmPath.trim();
if (!fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(_npmPath)) {
- throw new Error('The NPM executable does not exist');
+ throw new Error('The NPM executable does not exist');
}
+ }
+ return _npmPath;
}
- return _npmPath;
-}
-function _ensureFolder(folderPath) {
- if (!fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(folderPath)) {
+ function _ensureFolder(folderPath) {
+ if (!fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(folderPath)) {
const parentDir = path__WEBPACK_IMPORTED_MODULE_3__.dirname(folderPath);
_ensureFolder(parentDir);
fs__WEBPACK_IMPORTED_MODULE_1__.mkdirSync(folderPath);
- }
-}
-/**
- * Create missing directories under the specified base directory, and return the resolved directory.
- *
- * Does not support "." or ".." path segments.
- * Assumes the baseFolder exists.
- */
-function _ensureAndJoinPath(baseFolder, ...pathSegments) {
- let joinedPath = baseFolder;
- try {
+ }
+ }
+ /**
+ * Create missing directories under the specified base directory, and return the resolved directory.
+ *
+ * Does not support "." or ".." path segments.
+ * Assumes the baseFolder exists.
+ */
+ function _ensureAndJoinPath(baseFolder, ...pathSegments) {
+ let joinedPath = baseFolder;
+ try {
for (let pathSegment of pathSegments) {
- pathSegment = pathSegment.replace(/[\\\/]/g, '+');
- joinedPath = path__WEBPACK_IMPORTED_MODULE_3__.join(joinedPath, pathSegment);
- if (!fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(joinedPath)) {
- fs__WEBPACK_IMPORTED_MODULE_1__.mkdirSync(joinedPath);
- }
+ pathSegment = pathSegment.replace(/[\\\/]/g, '+');
+ joinedPath = path__WEBPACK_IMPORTED_MODULE_3__.join(joinedPath, pathSegment);
+ if (!fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(joinedPath)) {
+ fs__WEBPACK_IMPORTED_MODULE_1__.mkdirSync(joinedPath);
+ }
}
- }
- catch (e) {
- throw new Error(`Error building local installation folder (${path__WEBPACK_IMPORTED_MODULE_3__.join(baseFolder, ...pathSegments)}): ${e}`);
- }
- return joinedPath;
-}
-function _getRushTempFolder(rushCommonFolder) {
- const rushTempFolder = process.env[RUSH_TEMP_FOLDER_ENV_VARIABLE_NAME];
- if (rushTempFolder !== undefined) {
+ } catch (e) {
+ throw new Error(
+ `Error building local installation folder (${path__WEBPACK_IMPORTED_MODULE_3__.join(baseFolder, ...pathSegments)}): ${e}`
+ );
+ }
+ return joinedPath;
+ }
+ function _getRushTempFolder(rushCommonFolder) {
+ const rushTempFolder = process.env[RUSH_TEMP_FOLDER_ENV_VARIABLE_NAME];
+ if (rushTempFolder !== undefined) {
_ensureFolder(rushTempFolder);
return rushTempFolder;
- }
- else {
+ } else {
return _ensureAndJoinPath(rushCommonFolder, 'temp');
- }
-}
-/**
- * Compare version strings according to semantic versioning.
- * Returns a positive integer if "a" is a later version than "b",
- * a negative integer if "b" is later than "a",
- * and 0 otherwise.
- */
-function _compareVersionStrings(a, b) {
- const aParts = a.split(/[.-]/);
- const bParts = b.split(/[.-]/);
- const numberOfParts = Math.max(aParts.length, bParts.length);
- for (let i = 0; i < numberOfParts; i++) {
+ }
+ }
+ /**
+ * Compare version strings according to semantic versioning.
+ * Returns a positive integer if "a" is a later version than "b",
+ * a negative integer if "b" is later than "a",
+ * and 0 otherwise.
+ */
+ function _compareVersionStrings(a, b) {
+ const aParts = a.split(/[.-]/);
+ const bParts = b.split(/[.-]/);
+ const numberOfParts = Math.max(aParts.length, bParts.length);
+ for (let i = 0; i < numberOfParts; i++) {
if (aParts[i] !== bParts[i]) {
- return (Number(aParts[i]) || 0) - (Number(bParts[i]) || 0);
+ return (Number(aParts[i]) || 0) - (Number(bParts[i]) || 0);
}
- }
- return 0;
-}
-/**
- * Resolve a package specifier to a static version
- */
-function _resolvePackageVersion(logger, rushCommonFolder, { name, version }) {
- if (!version) {
+ }
+ return 0;
+ }
+ /**
+ * Resolve a package specifier to a static version
+ */
+ function _resolvePackageVersion(logger, rushCommonFolder, { name, version }) {
+ if (!version) {
version = '*'; // If no version is specified, use the latest version
- }
- if (version.match(/^[a-zA-Z0-9\-\+\.]+$/)) {
+ }
+ if (version.match(/^[a-zA-Z0-9\-\+\.]+$/)) {
// If the version contains only characters that we recognize to be used in static version specifiers,
// pass the version through
return version;
- }
- else {
+ } else {
// version resolves to
try {
- const rushTempFolder = _getRushTempFolder(rushCommonFolder);
- const sourceNpmrcFolder = path__WEBPACK_IMPORTED_MODULE_3__.join(rushCommonFolder, 'config', 'rush');
- (0,_utilities_npmrcUtilities__WEBPACK_IMPORTED_MODULE_4__.syncNpmrc)({
- sourceNpmrcFolder,
- targetNpmrcFolder: rushTempFolder,
- logger
- });
- const npmPath = getNpmPath();
- // This returns something that looks like:
- // ```
- // [
- // "3.0.0",
- // "3.0.1",
- // ...
- // "3.0.20"
- // ]
- // ```
- //
- // if multiple versions match the selector, or
- //
- // ```
- // "3.0.0"
- // ```
- //
- // if only a single version matches.
- const spawnSyncOptions = {
- cwd: rushTempFolder,
- stdio: [],
- shell: _isWindows()
- };
- const platformNpmPath = _getPlatformPath(npmPath);
- const npmVersionSpawnResult = child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync(platformNpmPath, ['view', `${name}@${version}`, 'version', '--no-update-notifier', '--json'], spawnSyncOptions);
- if (npmVersionSpawnResult.status !== 0) {
- throw new Error(`"npm view" returned error code ${npmVersionSpawnResult.status}`);
- }
- const npmViewVersionOutput = npmVersionSpawnResult.stdout.toString();
- const parsedVersionOutput = JSON.parse(npmViewVersionOutput);
- const versions = Array.isArray(parsedVersionOutput)
- ? parsedVersionOutput
- : [parsedVersionOutput];
- let latestVersion = versions[0];
- for (let i = 1; i < versions.length; i++) {
- const latestVersionCandidate = versions[i];
- if (_compareVersionStrings(latestVersionCandidate, latestVersion) > 0) {
- latestVersion = latestVersionCandidate;
- }
- }
- if (!latestVersion) {
- throw new Error('No versions found for the specified version range.');
+ const rushTempFolder = _getRushTempFolder(rushCommonFolder);
+ const sourceNpmrcFolder = path__WEBPACK_IMPORTED_MODULE_3__.join(
+ rushCommonFolder,
+ 'config',
+ 'rush'
+ );
+ (0, _utilities_npmrcUtilities__WEBPACK_IMPORTED_MODULE_4__.syncNpmrc)({
+ sourceNpmrcFolder,
+ targetNpmrcFolder: rushTempFolder,
+ logger
+ });
+ const npmPath = getNpmPath();
+ // This returns something that looks like:
+ // ```
+ // [
+ // "3.0.0",
+ // "3.0.1",
+ // ...
+ // "3.0.20"
+ // ]
+ // ```
+ //
+ // if multiple versions match the selector, or
+ //
+ // ```
+ // "3.0.0"
+ // ```
+ //
+ // if only a single version matches.
+ const spawnSyncOptions = {
+ cwd: rushTempFolder,
+ stdio: [],
+ shell: _isWindows()
+ };
+ const platformNpmPath = _getPlatformPath(npmPath);
+ const npmVersionSpawnResult = child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync(
+ platformNpmPath,
+ ['view', `${name}@${version}`, 'version', '--no-update-notifier', '--json'],
+ spawnSyncOptions
+ );
+ if (npmVersionSpawnResult.status !== 0) {
+ throw new Error(`"npm view" returned error code ${npmVersionSpawnResult.status}`);
+ }
+ const npmViewVersionOutput = npmVersionSpawnResult.stdout.toString();
+ const parsedVersionOutput = JSON.parse(npmViewVersionOutput);
+ const versions = Array.isArray(parsedVersionOutput) ? parsedVersionOutput : [parsedVersionOutput];
+ let latestVersion = versions[0];
+ for (let i = 1; i < versions.length; i++) {
+ const latestVersionCandidate = versions[i];
+ if (_compareVersionStrings(latestVersionCandidate, latestVersion) > 0) {
+ latestVersion = latestVersionCandidate;
}
- return latestVersion;
- }
- catch (e) {
- throw new Error(`Unable to resolve version ${version} of package ${name}: ${e}`);
+ }
+ if (!latestVersion) {
+ throw new Error('No versions found for the specified version range.');
+ }
+ return latestVersion;
+ } catch (e) {
+ throw new Error(`Unable to resolve version ${version} of package ${name}: ${e}`);
}
- }
-}
-let _rushJsonFolder;
-/**
- * Find the absolute path to the folder containing rush.json
- */
-function findRushJsonFolder() {
- if (!_rushJsonFolder) {
+ }
+ }
+ let _rushJsonFolder;
+ /**
+ * Find the absolute path to the folder containing rush.json
+ */
+ function findRushJsonFolder() {
+ if (!_rushJsonFolder) {
let basePath = __dirname;
let tempPath = __dirname;
do {
- const testRushJsonPath = path__WEBPACK_IMPORTED_MODULE_3__.join(basePath, RUSH_JSON_FILENAME);
- if (fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(testRushJsonPath)) {
- _rushJsonFolder = basePath;
- break;
- }
- else {
- basePath = tempPath;
- }
+ const testRushJsonPath = path__WEBPACK_IMPORTED_MODULE_3__.join(basePath, RUSH_JSON_FILENAME);
+ if (fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(testRushJsonPath)) {
+ _rushJsonFolder = basePath;
+ break;
+ } else {
+ basePath = tempPath;
+ }
} while (basePath !== (tempPath = path__WEBPACK_IMPORTED_MODULE_3__.dirname(basePath))); // Exit the loop when we hit the disk root
if (!_rushJsonFolder) {
- throw new Error(`Unable to find ${RUSH_JSON_FILENAME}.`);
+ throw new Error(`Unable to find ${RUSH_JSON_FILENAME}.`);
}
- }
- return _rushJsonFolder;
-}
-/**
- * Detects if the package in the specified directory is installed
- */
-function _isPackageAlreadyInstalled(packageInstallFolder) {
- try {
- const flagFilePath = path__WEBPACK_IMPORTED_MODULE_3__.join(packageInstallFolder, INSTALLED_FLAG_FILENAME);
+ }
+ return _rushJsonFolder;
+ }
+ /**
+ * Detects if the package in the specified directory is installed
+ */
+ function _isPackageAlreadyInstalled(packageInstallFolder) {
+ try {
+ const flagFilePath = path__WEBPACK_IMPORTED_MODULE_3__.join(
+ packageInstallFolder,
+ INSTALLED_FLAG_FILENAME
+ );
if (!fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(flagFilePath)) {
- return false;
+ return false;
}
const fileContents = fs__WEBPACK_IMPORTED_MODULE_1__.readFileSync(flagFilePath).toString();
return fileContents.trim() === process.version;
- }
- catch (e) {
+ } catch (e) {
return false;
+ }
}
-}
-/**
- * Delete a file. Fail silently if it does not exist.
- */
-function _deleteFile(file) {
- try {
+ /**
+ * Delete a file. Fail silently if it does not exist.
+ */
+ function _deleteFile(file) {
+ try {
fs__WEBPACK_IMPORTED_MODULE_1__.unlinkSync(file);
- }
- catch (err) {
+ } catch (err) {
if (err.code !== 'ENOENT' && err.code !== 'ENOTDIR') {
- throw err;
+ throw err;
}
- }
-}
-/**
- * Removes the following files and directories under the specified folder path:
- * - installed.flag
- * -
- * - node_modules
- */
-function _cleanInstallFolder(rushTempFolder, packageInstallFolder, lockFilePath) {
- try {
- const flagFile = path__WEBPACK_IMPORTED_MODULE_3__.resolve(packageInstallFolder, INSTALLED_FLAG_FILENAME);
+ }
+ }
+ /**
+ * Removes the following files and directories under the specified folder path:
+ * - installed.flag
+ * -
+ * - node_modules
+ */
+ function _cleanInstallFolder(rushTempFolder, packageInstallFolder, lockFilePath) {
+ try {
+ const flagFile = path__WEBPACK_IMPORTED_MODULE_3__.resolve(
+ packageInstallFolder,
+ INSTALLED_FLAG_FILENAME
+ );
_deleteFile(flagFile);
- const packageLockFile = path__WEBPACK_IMPORTED_MODULE_3__.resolve(packageInstallFolder, 'package-lock.json');
+ const packageLockFile = path__WEBPACK_IMPORTED_MODULE_3__.resolve(
+ packageInstallFolder,
+ 'package-lock.json'
+ );
if (lockFilePath) {
- fs__WEBPACK_IMPORTED_MODULE_1__.copyFileSync(lockFilePath, packageLockFile);
- }
- else {
- // Not running `npm ci`, so need to cleanup
- _deleteFile(packageLockFile);
- const nodeModulesFolder = path__WEBPACK_IMPORTED_MODULE_3__.resolve(packageInstallFolder, NODE_MODULES_FOLDER_NAME);
- if (fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(nodeModulesFolder)) {
- const rushRecyclerFolder = _ensureAndJoinPath(rushTempFolder, 'rush-recycler');
- fs__WEBPACK_IMPORTED_MODULE_1__.renameSync(nodeModulesFolder, path__WEBPACK_IMPORTED_MODULE_3__.join(rushRecyclerFolder, `install-run-${Date.now().toString()}`));
- }
+ fs__WEBPACK_IMPORTED_MODULE_1__.copyFileSync(lockFilePath, packageLockFile);
+ } else {
+ // Not running `npm ci`, so need to cleanup
+ _deleteFile(packageLockFile);
+ const nodeModulesFolder = path__WEBPACK_IMPORTED_MODULE_3__.resolve(
+ packageInstallFolder,
+ NODE_MODULES_FOLDER_NAME
+ );
+ if (fs__WEBPACK_IMPORTED_MODULE_1__.existsSync(nodeModulesFolder)) {
+ const rushRecyclerFolder = _ensureAndJoinPath(rushTempFolder, 'rush-recycler');
+ fs__WEBPACK_IMPORTED_MODULE_1__.renameSync(
+ nodeModulesFolder,
+ path__WEBPACK_IMPORTED_MODULE_3__.join(
+ rushRecyclerFolder,
+ `install-run-${Date.now().toString()}`
+ )
+ );
+ }
}
- }
- catch (e) {
+ } catch (e) {
throw new Error(`Error cleaning the package install folder (${packageInstallFolder}): ${e}`);
+ }
}
-}
-function _createPackageJson(packageInstallFolder, name, version) {
- try {
+ function _createPackageJson(packageInstallFolder, name, version) {
+ try {
const packageJsonContents = {
- name: 'ci-rush',
- version: '0.0.0',
- dependencies: {
- [name]: version
- },
- description: "DON'T WARN",
- repository: "DON'T WARN",
- license: 'MIT'
+ name: 'ci-rush',
+ version: '0.0.0',
+ dependencies: {
+ [name]: version
+ },
+ description: "DON'T WARN",
+ repository: "DON'T WARN",
+ license: 'MIT'
};
- const packageJsonPath = path__WEBPACK_IMPORTED_MODULE_3__.join(packageInstallFolder, PACKAGE_JSON_FILENAME);
- fs__WEBPACK_IMPORTED_MODULE_1__.writeFileSync(packageJsonPath, JSON.stringify(packageJsonContents, undefined, 2));
- }
- catch (e) {
+ const packageJsonPath = path__WEBPACK_IMPORTED_MODULE_3__.join(
+ packageInstallFolder,
+ PACKAGE_JSON_FILENAME
+ );
+ fs__WEBPACK_IMPORTED_MODULE_1__.writeFileSync(
+ packageJsonPath,
+ JSON.stringify(packageJsonContents, undefined, 2)
+ );
+ } catch (e) {
throw new Error(`Unable to create package.json: ${e}`);
+ }
}
-}
-/**
- * Run "npm install" in the package install folder.
- */
-function _installPackage(logger, packageInstallFolder, name, version, command) {
- try {
+ /**
+ * Run "npm install" in the package install folder.
+ */
+ function _installPackage(logger, packageInstallFolder, name, version, command) {
+ try {
logger.info(`Installing ${name}...`);
const npmPath = getNpmPath();
const platformNpmPath = _getPlatformPath(npmPath);
const result = child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync(platformNpmPath, [command], {
- stdio: 'inherit',
- cwd: packageInstallFolder,
- env: process.env,
- shell: _isWindows()
+ stdio: 'inherit',
+ cwd: packageInstallFolder,
+ env: process.env,
+ shell: _isWindows()
});
if (result.status !== 0) {
- throw new Error(`"npm ${command}" encountered an error`);
+ throw new Error(`"npm ${command}" encountered an error`);
}
logger.info(`Successfully installed ${name}@${version}`);
- }
- catch (e) {
+ } catch (e) {
throw new Error(`Unable to install package: ${e}`);
- }
-}
-/**
- * Get the ".bin" path for the package.
- */
-function _getBinPath(packageInstallFolder, binName) {
- const binFolderPath = path__WEBPACK_IMPORTED_MODULE_3__.resolve(packageInstallFolder, NODE_MODULES_FOLDER_NAME, '.bin');
- const resolvedBinName = _isWindows() ? `${binName}.cmd` : binName;
- return path__WEBPACK_IMPORTED_MODULE_3__.resolve(binFolderPath, resolvedBinName);
-}
-/**
- * Returns a cross-platform path - windows must enclose any path containing spaces within double quotes.
- */
-function _getPlatformPath(platformPath) {
- return _isWindows() && platformPath.includes(' ') ? `"${platformPath}"` : platformPath;
-}
-function _isWindows() {
- return os__WEBPACK_IMPORTED_MODULE_2__.platform() === 'win32';
-}
-/**
- * Write a flag file to the package's install directory, signifying that the install was successful.
- */
-function _writeFlagFile(packageInstallFolder) {
- try {
- const flagFilePath = path__WEBPACK_IMPORTED_MODULE_3__.join(packageInstallFolder, INSTALLED_FLAG_FILENAME);
+ }
+ }
+ /**
+ * Get the ".bin" path for the package.
+ */
+ function _getBinPath(packageInstallFolder, binName) {
+ const binFolderPath = path__WEBPACK_IMPORTED_MODULE_3__.resolve(
+ packageInstallFolder,
+ NODE_MODULES_FOLDER_NAME,
+ '.bin'
+ );
+ const resolvedBinName = _isWindows() ? `${binName}.cmd` : binName;
+ return path__WEBPACK_IMPORTED_MODULE_3__.resolve(binFolderPath, resolvedBinName);
+ }
+ /**
+ * Returns a cross-platform path - windows must enclose any path containing spaces within double quotes.
+ */
+ function _getPlatformPath(platformPath) {
+ return _isWindows() && platformPath.includes(' ') ? `"${platformPath}"` : platformPath;
+ }
+ function _isWindows() {
+ return os__WEBPACK_IMPORTED_MODULE_2__.platform() === 'win32';
+ }
+ /**
+ * Write a flag file to the package's install directory, signifying that the install was successful.
+ */
+ function _writeFlagFile(packageInstallFolder) {
+ try {
+ const flagFilePath = path__WEBPACK_IMPORTED_MODULE_3__.join(
+ packageInstallFolder,
+ INSTALLED_FLAG_FILENAME
+ );
fs__WEBPACK_IMPORTED_MODULE_1__.writeFileSync(flagFilePath, process.version);
- }
- catch (e) {
+ } catch (e) {
throw new Error(`Unable to create installed.flag file in ${packageInstallFolder}`);
- }
-}
-function installAndRun(logger, packageName, packageVersion, packageBinName, packageBinArgs, lockFilePath = process.env[INSTALL_RUN_LOCKFILE_PATH_VARIABLE]) {
- const rushJsonFolder = findRushJsonFolder();
- const rushCommonFolder = path__WEBPACK_IMPORTED_MODULE_3__.join(rushJsonFolder, 'common');
- const rushTempFolder = _getRushTempFolder(rushCommonFolder);
- const packageInstallFolder = _ensureAndJoinPath(rushTempFolder, 'install-run', `${packageName}@${packageVersion}`);
- if (!_isPackageAlreadyInstalled(packageInstallFolder)) {
+ }
+ }
+ function installAndRun(
+ logger,
+ packageName,
+ packageVersion,
+ packageBinName,
+ packageBinArgs,
+ lockFilePath = process.env[INSTALL_RUN_LOCKFILE_PATH_VARIABLE]
+ ) {
+ const rushJsonFolder = findRushJsonFolder();
+ const rushCommonFolder = path__WEBPACK_IMPORTED_MODULE_3__.join(rushJsonFolder, 'common');
+ const rushTempFolder = _getRushTempFolder(rushCommonFolder);
+ const packageInstallFolder = _ensureAndJoinPath(
+ rushTempFolder,
+ 'install-run',
+ `${packageName}@${packageVersion}`
+ );
+ if (!_isPackageAlreadyInstalled(packageInstallFolder)) {
// The package isn't already installed
_cleanInstallFolder(rushTempFolder, packageInstallFolder, lockFilePath);
const sourceNpmrcFolder = path__WEBPACK_IMPORTED_MODULE_3__.join(rushCommonFolder, 'config', 'rush');
- (0,_utilities_npmrcUtilities__WEBPACK_IMPORTED_MODULE_4__.syncNpmrc)({
- sourceNpmrcFolder,
- targetNpmrcFolder: packageInstallFolder,
- logger
+ (0, _utilities_npmrcUtilities__WEBPACK_IMPORTED_MODULE_4__.syncNpmrc)({
+ sourceNpmrcFolder,
+ targetNpmrcFolder: packageInstallFolder,
+ logger
});
_createPackageJson(packageInstallFolder, packageName, packageVersion);
const command = lockFilePath ? 'ci' : 'install';
_installPackage(logger, packageInstallFolder, packageName, packageVersion, command);
_writeFlagFile(packageInstallFolder);
- }
- const statusMessage = `Invoking "${packageBinName} ${packageBinArgs.join(' ')}"`;
- const statusMessageLine = new Array(statusMessage.length + 1).join('-');
- logger.info('\n' + statusMessage + '\n' + statusMessageLine + '\n');
- const binPath = _getBinPath(packageInstallFolder, packageBinName);
- const binFolderPath = path__WEBPACK_IMPORTED_MODULE_3__.resolve(packageInstallFolder, NODE_MODULES_FOLDER_NAME, '.bin');
- // Windows environment variables are case-insensitive. Instead of using SpawnSyncOptions.env, we need to
- // assign via the process.env proxy to ensure that we append to the right PATH key.
- const originalEnvPath = process.env.PATH || '';
- let result;
- try {
+ }
+ const statusMessage = `Invoking "${packageBinName} ${packageBinArgs.join(' ')}"`;
+ const statusMessageLine = new Array(statusMessage.length + 1).join('-');
+ logger.info('\n' + statusMessage + '\n' + statusMessageLine + '\n');
+ const binPath = _getBinPath(packageInstallFolder, packageBinName);
+ const binFolderPath = path__WEBPACK_IMPORTED_MODULE_3__.resolve(
+ packageInstallFolder,
+ NODE_MODULES_FOLDER_NAME,
+ '.bin'
+ );
+ // Windows environment variables are case-insensitive. Instead of using SpawnSyncOptions.env, we need to
+ // assign via the process.env proxy to ensure that we append to the right PATH key.
+ const originalEnvPath = process.env.PATH || '';
+ let result;
+ try {
// `npm` bin stubs on Windows are `.cmd` files
// Node.js will not directly invoke a `.cmd` file unless `shell` is set to `true`
const platformBinPath = _getPlatformPath(binPath);
process.env.PATH = [binFolderPath, originalEnvPath].join(path__WEBPACK_IMPORTED_MODULE_3__.delimiter);
result = child_process__WEBPACK_IMPORTED_MODULE_0__.spawnSync(platformBinPath, packageBinArgs, {
- stdio: 'inherit',
- windowsVerbatimArguments: false,
- shell: _isWindows(),
- cwd: process.cwd(),
- env: process.env
+ stdio: 'inherit',
+ windowsVerbatimArguments: false,
+ shell: _isWindows(),
+ cwd: process.cwd(),
+ env: process.env
});
- }
- finally {
+ } finally {
process.env.PATH = originalEnvPath;
- }
- if (result.status !== null) {
+ }
+ if (result.status !== null) {
return result.status;
- }
- else {
+ } else {
throw result.error || new Error('An unknown error occurred.');
+ }
}
-}
-function runWithErrorAndStatusCode(logger, fn) {
- process.exitCode = 1;
- try {
+ function runWithErrorAndStatusCode(logger, fn) {
+ process.exitCode = 1;
+ try {
const exitCode = fn();
process.exitCode = exitCode;
- }
- catch (e) {
+ } catch (e) {
logger.error('\n\n' + e.toString() + '\n\n');
- }
-}
-function _run() {
- const [nodePath /* Ex: /bin/node */, scriptPath /* /repo/common/scripts/install-run-rush.js */, rawPackageSpecifier /* qrcode@^1.2.0 */, packageBinName /* qrcode */, ...packageBinArgs /* [-f, myproject/lib] */] = process.argv;
- if (!nodePath) {
+ }
+ }
+ function _run() {
+ const [
+ nodePath /* Ex: /bin/node */,
+ scriptPath /* /repo/common/scripts/install-run-rush.js */,
+ rawPackageSpecifier /* qrcode@^1.2.0 */,
+ packageBinName /* qrcode */,
+ ...packageBinArgs /* [-f, myproject/lib] */
+ ] = process.argv;
+ if (!nodePath) {
throw new Error('Unexpected exception: could not detect node path');
- }
- if (path__WEBPACK_IMPORTED_MODULE_3__.basename(scriptPath).toLowerCase() !== 'install-run.js') {
+ }
+ if (path__WEBPACK_IMPORTED_MODULE_3__.basename(scriptPath).toLowerCase() !== 'install-run.js') {
// If install-run.js wasn't directly invoked, don't execute the rest of this function. Return control
// to the script that (presumably) imported this file
return;
- }
- if (process.argv.length < 4) {
+ }
+ if (process.argv.length < 4) {
console.log('Usage: install-run.js @ [args...]');
console.log('Example: install-run.js qrcode@1.2.2 qrcode https://rushjs.io');
process.exit(1);
- }
- const logger = { info: console.log, error: console.error };
- runWithErrorAndStatusCode(logger, () => {
+ }
+ const logger = { info: console.log, error: console.error };
+ runWithErrorAndStatusCode(logger, () => {
const rushJsonFolder = findRushJsonFolder();
const rushCommonFolder = _ensureAndJoinPath(rushJsonFolder, 'common');
const packageSpecifier = _parsePackageSpecifier(rawPackageSpecifier);
const name = packageSpecifier.name;
const version = _resolvePackageVersion(logger, rushCommonFolder, packageSpecifier);
if (packageSpecifier.version !== version) {
- console.log(`Resolved to ${name}@${version}`);
+ console.log(`Resolved to ${name}@${version}`);
}
return installAndRun(logger, name, version, packageBinName, packageBinArgs);
- });
-}
-_run();
-//# sourceMappingURL=install-run.js.map
-})();
+ });
+ }
+ _run();
+ //# sourceMappingURL=install-run.js.map
+ })();
-module.exports = __webpack_exports__;
-/******/ })()
-;
-//# sourceMappingURL=install-run.js.map
\ No newline at end of file
+ module.exports = __webpack_exports__;
+ /******/
+})();
+//# sourceMappingURL=install-run.js.map
diff --git a/heft-plugins/heft-isolated-typescript-transpile-plugin/src/SwcIsolatedTranspilePlugin.ts b/heft-plugins/heft-isolated-typescript-transpile-plugin/src/SwcIsolatedTranspilePlugin.ts
index 4d281846216..4ac859ef33c 100644
--- a/heft-plugins/heft-isolated-typescript-transpile-plugin/src/SwcIsolatedTranspilePlugin.ts
+++ b/heft-plugins/heft-isolated-typescript-transpile-plugin/src/SwcIsolatedTranspilePlugin.ts
@@ -290,10 +290,10 @@ async function transpileProjectAsync(
// https://github.com/swc-project/swc-node/blob/e6cd8b83d1ce76a0abf770f52425704e5d2872c6/packages/register/read-default-tsconfig.ts#L131C7-L139C20
const react: Partial | undefined =
- tsConfigOptions.jsxFactory ??
+ (tsConfigOptions.jsxFactory ??
tsConfigOptions.jsxFragmentFactory ??
tsConfigOptions.jsx ??
- tsConfigOptions.jsxImportSource
+ tsConfigOptions.jsxImportSource)
? {
pragma: tsConfigOptions.jsxFactory,
pragmaFrag: tsConfigOptions.jsxFragmentFactory,
diff --git a/libraries/rush-lib/src/api/VersionPolicy.ts b/libraries/rush-lib/src/api/VersionPolicy.ts
index f2a18967836..8d357bbaeb7 100644
--- a/libraries/rush-lib/src/api/VersionPolicy.ts
+++ b/libraries/rush-lib/src/api/VersionPolicy.ts
@@ -218,7 +218,7 @@ export class LockStepVersionPolicy extends VersionPolicy {
/**
* @internal
*/
- public declare readonly _json: ILockStepVersionJson;
+ declare public readonly _json: ILockStepVersionJson;
private _version: semver.SemVer;
/**
@@ -340,7 +340,7 @@ export class IndividualVersionPolicy extends VersionPolicy {
/**
* @internal
*/
- public declare readonly _json: IIndividualVersionJson;
+ declare public readonly _json: IIndividualVersionJson;
/**
* The major version that has been locked
diff --git a/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/inconsistent-dep-devDep.yaml b/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/inconsistent-dep-devDep.yaml
index 7f26989631c..08f6420eaf5 100644
--- a/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/inconsistent-dep-devDep.yaml
+++ b/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/inconsistent-dep-devDep.yaml
@@ -5,7 +5,6 @@ settings:
excludeLinksFromLockfile: false
importers:
-
.: {}
../../apps/bar:
@@ -15,12 +14,13 @@ importers:
version: 2.3.2
packages:
-
prettier@2.3.2:
- resolution: {integrity: sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==}
- engines: {node: '>=10.13.0'}
+ resolution:
+ {
+ integrity: sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==
+ }
+ engines: { node: '>=10.13.0' }
hasBin: true
snapshots:
-
prettier@2.3.2: {}
diff --git a/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/modified.yaml b/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/modified.yaml
index 71509e89efe..7f156d05a28 100644
--- a/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/modified.yaml
+++ b/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/modified.yaml
@@ -5,7 +5,6 @@ settings:
excludeLinksFromLockfile: false
importers:
-
.: {}
../../apps/foo:
@@ -19,17 +18,21 @@ importers:
version: 5.0.4
packages:
-
tslib@2.3.1:
- resolution: {integrity: sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==}
+ resolution:
+ {
+ integrity: sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
+ }
typescript@5.0.4:
- resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==}
- engines: {node: '>=12.20'}
+ resolution:
+ {
+ integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==
+ }
+ engines: { node: '>=12.20' }
hasBin: true
snapshots:
-
tslib@2.3.1: {}
typescript@5.0.4: {}
diff --git a/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/not-modified.yaml b/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/not-modified.yaml
index 47ef29262c3..f17060bc2eb 100644
--- a/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/not-modified.yaml
+++ b/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/not-modified.yaml
@@ -5,7 +5,6 @@ settings:
excludeLinksFromLockfile: false
importers:
-
.: {}
../../apps/foo:
@@ -19,17 +18,21 @@ importers:
version: 5.0.4
packages:
-
tslib@2.3.1:
- resolution: {integrity: sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==}
+ resolution:
+ {
+ integrity: sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
+ }
typescript@5.0.4:
- resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==}
- engines: {node: '>=12.20'}
+ resolution:
+ {
+ integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==
+ }
+ engines: { node: '>=12.20' }
hasBin: true
snapshots:
-
tslib@2.3.1: {}
typescript@5.0.4: {}
diff --git a/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/overrides-not-modified.yaml b/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/overrides-not-modified.yaml
index d21630b1d81..69e66401e1e 100644
--- a/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/overrides-not-modified.yaml
+++ b/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/overrides-not-modified.yaml
@@ -8,7 +8,6 @@ overrides:
typescript: 5.0.4
importers:
-
.: {}
../../apps/foo:
@@ -22,17 +21,21 @@ importers:
version: 5.0.4
packages:
-
tslib@2.3.1:
- resolution: {integrity: sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==}
+ resolution:
+ {
+ integrity: sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
+ }
typescript@5.0.4:
- resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==}
- engines: {node: '>=12.20'}
+ resolution:
+ {
+ integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==
+ }
+ engines: { node: '>=12.20' }
hasBin: true
snapshots:
-
tslib@2.3.1: {}
typescript@5.0.4: {}
diff --git a/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/pnpm-lock-v9.yaml b/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/pnpm-lock-v9.yaml
index 9fe144e1b91..91130e28c33 100644
--- a/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/pnpm-lock-v9.yaml
+++ b/libraries/rush-lib/src/logic/pnpm/test/yamlFiles/pnpm-lock-v9/pnpm-lock-v9.yaml
@@ -5,7 +5,6 @@ settings:
excludeLinksFromLockfile: false
importers:
-
.:
dependencies:
jquery:
@@ -16,20 +15,27 @@ importers:
version: 2.1.0
packages:
-
jquery@3.7.1:
- resolution: {integrity: sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==}
+ resolution:
+ {
+ integrity: sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
+ }
pad-left@2.1.0:
- resolution: {integrity: sha512-HJxs9K9AztdIQIAIa/OIazRAUW/L6B9hbQDxO4X07roW3eo9XqZc2ur9bn1StH9CnbbI9EgvejHQX7CBpCF1QA==}
- engines: {node: '>=0.10.0'}
+ resolution:
+ {
+ integrity: sha512-HJxs9K9AztdIQIAIa/OIazRAUW/L6B9hbQDxO4X07roW3eo9XqZc2ur9bn1StH9CnbbI9EgvejHQX7CBpCF1QA==
+ }
+ engines: { node: '>=0.10.0' }
repeat-string@1.6.1:
- resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==}
- engines: {node: '>=0.10'}
+ resolution:
+ {
+ integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
+ }
+ engines: { node: '>=0.10' }
snapshots:
-
jquery@3.7.1: {}
pad-left@2.1.0:
From 2c7c7b3f8de6e18acc9c9c929b1f47778a98c56c Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Fri, 19 Sep 2025 14:31:42 -0400
Subject: [PATCH 09/15] PR feedback: use "await using"
---
.../src/cli/explorer/ExplorerCommandLineParser.ts | 8 ++------
apps/lockfile-explorer/src/graph/PnpmfileRunner.ts | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts b/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts
index aa351cd1e81..5e587d756e2 100644
--- a/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts
+++ b/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts
@@ -233,12 +233,8 @@ export class ExplorerCommandLineParser extends CommandLineParser {
const pnpmfilePath: string = path.join(lfxWorkspace.workspaceRootFullPath, lfxWorkspace.pnpmfilePath);
if (await FileSystem.existsAsync(pnpmfilePath)) {
- const pnpmFileRunner: PnpmfileRunner = new PnpmfileRunner(pnpmfilePath);
- try {
- parsedPackage = await pnpmFileRunner.transformPackageAsync(packageJson, fileLocation);
- } finally {
- await pnpmFileRunner.disposeAsync();
- }
+ await using pnpmFileRunner: PnpmfileRunner = new PnpmfileRunner(pnpmfilePath);
+ parsedPackage = await pnpmFileRunner.transformPackageAsync(packageJson, fileLocation);
}
res.send(parsedPackage);
diff --git a/apps/lockfile-explorer/src/graph/PnpmfileRunner.ts b/apps/lockfile-explorer/src/graph/PnpmfileRunner.ts
index 557d1678931..d1156502b87 100644
--- a/apps/lockfile-explorer/src/graph/PnpmfileRunner.ts
+++ b/apps/lockfile-explorer/src/graph/PnpmfileRunner.ts
@@ -93,7 +93,7 @@ export class PnpmfileRunner {
});
}
- public async disposeAsync(): Promise {
+ public async [Symbol.asyncDispose](): Promise {
if (this._disposed) {
return;
}
From 3fa47020eec63377fcb42a42fdc03c57c8ec3430 Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Fri, 19 Sep 2025 14:43:06 -0400
Subject: [PATCH 10/15] PR feedback
---
.../src/graph/pnpmfileRunnerWorkerThread.ts | 29 ++++++++++++-------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/apps/lockfile-explorer/src/graph/pnpmfileRunnerWorkerThread.ts b/apps/lockfile-explorer/src/graph/pnpmfileRunnerWorkerThread.ts
index 3281eb73ce2..d67f39f149e 100644
--- a/apps/lockfile-explorer/src/graph/pnpmfileRunnerWorkerThread.ts
+++ b/apps/lockfile-explorer/src/graph/pnpmfileRunnerWorkerThread.ts
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
// See LICENSE in the project root for license information.
-import { parentPort, workerData } from 'node:worker_threads';
+import { parentPort, workerData, type MessagePort } from 'node:worker_threads';
import * as path from 'node:path';
import * as fs from 'node:fs';
import type { IPackageJson } from '@rushstack/node-core-library';
@@ -40,18 +40,23 @@ let pnpmfileModule: IPnpmfileModule | undefined = undefined;
let pnpmfileModuleError: Error | undefined = undefined;
try {
- if (fs.existsSync(resolvedPath)) {
- pnpmfileModule = require(resolvedPath);
- }
+ pnpmfileModule = require(resolvedPath);
} catch (error) {
pnpmfileModuleError = error;
}
-parentPort?.on('message', async (message: IRequestMessage) => {
+// eslint-disable-next-line @rushstack/no-new-null
+const threadParentPort: null | MessagePort = parentPort;
+
+if (!threadParentPort) {
+ throw new Error('Not running in a worker thread');
+}
+
+threadParentPort.on('message', async (message: IRequestMessage) => {
const { id, packageJson } = message;
if (pnpmfileModuleError) {
- parentPort?.postMessage({
+ threadParentPort.postMessage({
kind: 'error',
id,
error: pnpmfileModuleError.message
@@ -62,13 +67,17 @@ parentPort?.on('message', async (message: IRequestMessage) => {
try {
if (!pnpmfileModule || !pnpmfileModule.hooks || typeof pnpmfileModule.hooks.readPackage !== 'function') {
// No transformation needed
- parentPort?.postMessage({ kind: 'return', id, result: packageJson } satisfies IResponseMessageReturn);
+ threadParentPort.postMessage({
+ kind: 'return',
+ id,
+ result: packageJson
+ } satisfies IResponseMessageReturn);
return;
}
const pnpmContext: IReadPackageContext = {
log: (logMessage) =>
- parentPort?.postMessage({
+ threadParentPort.postMessage({
kind: 'log',
id,
log: logMessage
@@ -77,9 +86,9 @@ parentPort?.on('message', async (message: IRequestMessage) => {
const result: IPackageJson = await pnpmfileModule.hooks.readPackage({ ...packageJson }, pnpmContext);
- parentPort?.postMessage({ kind: 'return', id, result } satisfies IResponseMessageReturn);
+ threadParentPort.postMessage({ kind: 'return', id, result } satisfies IResponseMessageReturn);
} catch (e) {
- parentPort?.postMessage({
+ threadParentPort.postMessage({
kind: 'error',
id,
error: (e as Error).message
From b86e85d133f2298b625bcfd8bc92c91d10eba21f Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Fri, 19 Sep 2025 16:01:47 -0400
Subject: [PATCH 11/15] PR feedback
---
apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts b/apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts
index 3a10b47ec5a..ade6e260f71 100644
--- a/apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts
+++ b/apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts
@@ -11,7 +11,7 @@ const isDebuggerAttached: boolean = inspector.url() !== undefined;
// For debugging, use an infinite timeout.
jest.setTimeout(isDebuggerAttached ? 1e9 : 10000);
-describe('PnpmfileRunner', () => {
+describe(PnpmfileRunner.name, () => {
it('transforms a package.json file', async () => {
const dirname: string = Path.convertToSlashes(__dirname);
const libIndex: number = dirname.lastIndexOf('/lib/');
From e45e089d034390bbf431cdb51fa02601d2254821 Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Sun, 21 Sep 2025 15:46:50 -0400
Subject: [PATCH 12/15] rush change
---
.../rush/octogonz-lfx-fixes4_2025-09-21-19-46.json | 10 ++++++++++
.../octogonz-lfx-fixes4_2025-09-21-19-46.json | 10 ++++++++++
2 files changed, 20 insertions(+)
create mode 100644 common/changes/@microsoft/rush/octogonz-lfx-fixes4_2025-09-21-19-46.json
create mode 100644 common/changes/@rushstack/heft-isolated-typescript-transpile-plugin/octogonz-lfx-fixes4_2025-09-21-19-46.json
diff --git a/common/changes/@microsoft/rush/octogonz-lfx-fixes4_2025-09-21-19-46.json b/common/changes/@microsoft/rush/octogonz-lfx-fixes4_2025-09-21-19-46.json
new file mode 100644
index 00000000000..bd7ff97cb34
--- /dev/null
+++ b/common/changes/@microsoft/rush/octogonz-lfx-fixes4_2025-09-21-19-46.json
@@ -0,0 +1,10 @@
+{
+ "changes": [
+ {
+ "packageName": "@microsoft/rush",
+ "comment": "",
+ "type": "none"
+ }
+ ],
+ "packageName": "@microsoft/rush"
+}
\ No newline at end of file
diff --git a/common/changes/@rushstack/heft-isolated-typescript-transpile-plugin/octogonz-lfx-fixes4_2025-09-21-19-46.json b/common/changes/@rushstack/heft-isolated-typescript-transpile-plugin/octogonz-lfx-fixes4_2025-09-21-19-46.json
new file mode 100644
index 00000000000..fbd4c12b6b9
--- /dev/null
+++ b/common/changes/@rushstack/heft-isolated-typescript-transpile-plugin/octogonz-lfx-fixes4_2025-09-21-19-46.json
@@ -0,0 +1,10 @@
+{
+ "changes": [
+ {
+ "packageName": "@rushstack/heft-isolated-typescript-transpile-plugin",
+ "comment": "",
+ "type": "none"
+ }
+ ],
+ "packageName": "@rushstack/heft-isolated-typescript-transpile-plugin"
+}
\ No newline at end of file
From a387e7517547c6934c18a54e0d5cb9d904b1a1eb Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Sun, 21 Sep 2025 15:56:35 -0400
Subject: [PATCH 13/15] PR feedback
---
.../src/containers/PackageJsonViewer/CodeBox.tsx | 2 +-
apps/lockfile-explorer/src/graph/PnpmfileRunner.ts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/CodeBox.tsx b/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/CodeBox.tsx
index b5977519b40..6294d35a121 100644
--- a/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/CodeBox.tsx
+++ b/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/CodeBox.tsx
@@ -6,7 +6,7 @@ import React from 'react';
import { Highlight, themes } from 'prism-react-renderer';
// Generate this list by doing console.log(Object.keys(Prism.languages))
-// BUT THEN DELETE the API's that are bizarrely mixed into this namespace:
+// BUT THEN DELETE the APIs that are bizarrely mixed into this namespace:
// "extend", "insertBefore", "DFS"
export type PrismLanguage =
| 'plain'
diff --git a/apps/lockfile-explorer/src/graph/PnpmfileRunner.ts b/apps/lockfile-explorer/src/graph/PnpmfileRunner.ts
index d1156502b87..ddb1c1908c8 100644
--- a/apps/lockfile-explorer/src/graph/PnpmfileRunner.ts
+++ b/apps/lockfile-explorer/src/graph/PnpmfileRunner.ts
@@ -25,7 +25,7 @@ export class PnpmfileRunner {
public logger: ((message: string) => void) | undefined = undefined;
public constructor(pnpmfilePath: string) {
- this._worker = new Worker(path.join(__dirname, './pnpmfileRunnerWorkerThread.js'), {
+ this._worker = new Worker(path.join(`${__dirname}/pnpmfileRunnerWorkerThread.js`), {
workerData: { pnpmfilePath }
});
From 4c9500558a956fd75c15ed9a7494afd87344f765 Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Sun, 21 Sep 2025 16:17:42 -0400
Subject: [PATCH 14/15] Fix build break
---
apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts b/apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts
index ade6e260f71..486b54deed5 100644
--- a/apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts
+++ b/apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts
@@ -22,7 +22,7 @@ describe(PnpmfileRunner.name, () => {
dirname.substring(0, libIndex) + '/src/' + dirname.substring(libIndex + '/lib/'.length);
const pnpmfilePath: string = srcDirname + '/fixtures/PnpmfileRunner/.pnpmfile.cjs';
- const pnpmfileRunner: PnpmfileRunner = new PnpmfileRunner(pnpmfilePath);
+ await using pnpmfileRunner: PnpmfileRunner = new PnpmfileRunner(pnpmfilePath);
const logMessages: string[] = [];
pnpmfileRunner.logger = (message) => {
logMessages.push(message);
@@ -55,8 +55,6 @@ Array [
]
`);
- await pnpmfileRunner.disposeAsync();
-
await expect(
pnpmfileRunner.transformPackageAsync({ name: 'name', version: '1.0.0' }, '')
).rejects.toThrow('disposed');
From fa575020b121e64c379740500de4b9f71c437f33 Mon Sep 17 00:00:00 2001
From: Pete Gonzalez <4673363+octogonz@users.noreply.github.com>
Date: Sun, 21 Sep 2025 16:19:46 -0700
Subject: [PATCH 15/15] Revert `[Symbol.asyncDispose]()` because it isn't
supported by Node 18
---
.../cli/explorer/ExplorerCommandLineParser.ts | 8 +++-
.../src/graph/PnpmfileRunner.ts | 2 +-
.../src/graph/pnpmfileRunnerWorkerThread.ts | 1 -
.../src/graph/test/PnpmfileRunner.test.ts | 37 +++++++++++--------
.../lfxGraph-edge-cases-v5.4.test.ts.snap | 1 +
.../lfxGraph-edge-cases-v6.0.test.ts.snap | 1 +
...fxGraph-website-sample-1-v5.4.test.ts.snap | 2 +
...fxGraph-website-sample-1-v6.0.test.ts.snap | 2 +
.../src/graph/test/serializeToJson.test.ts | 2 +
9 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts b/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts
index 5e587d756e2..aa351cd1e81 100644
--- a/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts
+++ b/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts
@@ -233,8 +233,12 @@ export class ExplorerCommandLineParser extends CommandLineParser {
const pnpmfilePath: string = path.join(lfxWorkspace.workspaceRootFullPath, lfxWorkspace.pnpmfilePath);
if (await FileSystem.existsAsync(pnpmfilePath)) {
- await using pnpmFileRunner: PnpmfileRunner = new PnpmfileRunner(pnpmfilePath);
- parsedPackage = await pnpmFileRunner.transformPackageAsync(packageJson, fileLocation);
+ const pnpmFileRunner: PnpmfileRunner = new PnpmfileRunner(pnpmfilePath);
+ try {
+ parsedPackage = await pnpmFileRunner.transformPackageAsync(packageJson, fileLocation);
+ } finally {
+ await pnpmFileRunner.disposeAsync();
+ }
}
res.send(parsedPackage);
diff --git a/apps/lockfile-explorer/src/graph/PnpmfileRunner.ts b/apps/lockfile-explorer/src/graph/PnpmfileRunner.ts
index ddb1c1908c8..6049f215fcb 100644
--- a/apps/lockfile-explorer/src/graph/PnpmfileRunner.ts
+++ b/apps/lockfile-explorer/src/graph/PnpmfileRunner.ts
@@ -93,7 +93,7 @@ export class PnpmfileRunner {
});
}
- public async [Symbol.asyncDispose](): Promise {
+ public async disposeAsync(): Promise {
if (this._disposed) {
return;
}
diff --git a/apps/lockfile-explorer/src/graph/pnpmfileRunnerWorkerThread.ts b/apps/lockfile-explorer/src/graph/pnpmfileRunnerWorkerThread.ts
index d67f39f149e..da87f43b115 100644
--- a/apps/lockfile-explorer/src/graph/pnpmfileRunnerWorkerThread.ts
+++ b/apps/lockfile-explorer/src/graph/pnpmfileRunnerWorkerThread.ts
@@ -3,7 +3,6 @@
import { parentPort, workerData, type MessagePort } from 'node:worker_threads';
import * as path from 'node:path';
-import * as fs from 'node:fs';
import type { IPackageJson } from '@rushstack/node-core-library';
import type { IPnpmfileModule, IReadPackageContext } from './IPnpmfileModule';
diff --git a/apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts b/apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts
index 486b54deed5..118e75afbba 100644
--- a/apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts
+++ b/apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts
@@ -22,23 +22,25 @@ describe(PnpmfileRunner.name, () => {
dirname.substring(0, libIndex) + '/src/' + dirname.substring(libIndex + '/lib/'.length);
const pnpmfilePath: string = srcDirname + '/fixtures/PnpmfileRunner/.pnpmfile.cjs';
- await using pnpmfileRunner: PnpmfileRunner = new PnpmfileRunner(pnpmfilePath);
const logMessages: string[] = [];
- pnpmfileRunner.logger = (message) => {
- logMessages.push(message);
- };
- expect(
- await pnpmfileRunner.transformPackageAsync(
- {
- name: '@types/karma',
- version: '1.0.0',
- dependencies: {
- 'example-dependency': '1.0.0'
- }
- },
- pnpmfilePath
- )
- ).toMatchInlineSnapshot(`
+
+ const pnpmfileRunner: PnpmfileRunner = new PnpmfileRunner(pnpmfilePath);
+ try {
+ pnpmfileRunner.logger = (message) => {
+ logMessages.push(message);
+ };
+ expect(
+ await pnpmfileRunner.transformPackageAsync(
+ {
+ name: '@types/karma',
+ version: '1.0.0',
+ dependencies: {
+ 'example-dependency': '1.0.0'
+ }
+ },
+ pnpmfilePath
+ )
+ ).toMatchInlineSnapshot(`
Object {
"dependencies": Object {
"example-dependency": "1.0.0",
@@ -48,6 +50,9 @@ Object {
"version": "1.0.0",
}
`);
+ } finally {
+ await pnpmfileRunner.disposeAsync();
+ }
expect(logMessages).toMatchInlineSnapshot(`
Array [
diff --git a/apps/lockfile-explorer/src/graph/test/__snapshots__/lfxGraph-edge-cases-v5.4.test.ts.snap b/apps/lockfile-explorer/src/graph/test/__snapshots__/lfxGraph-edge-cases-v5.4.test.ts.snap
index 382a4991800..ff8058f4180 100644
--- a/apps/lockfile-explorer/src/graph/test/__snapshots__/lfxGraph-edge-cases-v5.4.test.ts.snap
+++ b/apps/lockfile-explorer/src/graph/test/__snapshots__/lfxGraph-edge-cases-v5.4.test.ts.snap
@@ -160,6 +160,7 @@ exports[`lfxGraph-edge-cases-v5.4 loads a workspace 1`] = `
workspace:
pnpmLockfileFolder: ''
pnpmLockfilePath: pnpm-lock.yaml
+ pnpmfilePath: .pnpmfile.cjs
workspaceRootFullPath: /repo
"
`;
diff --git a/apps/lockfile-explorer/src/graph/test/__snapshots__/lfxGraph-edge-cases-v6.0.test.ts.snap b/apps/lockfile-explorer/src/graph/test/__snapshots__/lfxGraph-edge-cases-v6.0.test.ts.snap
index 382a4991800..ff8058f4180 100644
--- a/apps/lockfile-explorer/src/graph/test/__snapshots__/lfxGraph-edge-cases-v6.0.test.ts.snap
+++ b/apps/lockfile-explorer/src/graph/test/__snapshots__/lfxGraph-edge-cases-v6.0.test.ts.snap
@@ -160,6 +160,7 @@ exports[`lfxGraph-edge-cases-v5.4 loads a workspace 1`] = `
workspace:
pnpmLockfileFolder: ''
pnpmLockfilePath: pnpm-lock.yaml
+ pnpmfilePath: .pnpmfile.cjs
workspaceRootFullPath: /repo
"
`;
diff --git a/apps/lockfile-explorer/src/graph/test/__snapshots__/lfxGraph-website-sample-1-v5.4.test.ts.snap b/apps/lockfile-explorer/src/graph/test/__snapshots__/lfxGraph-website-sample-1-v5.4.test.ts.snap
index a79208cc8c9..58b8bf4cb78 100644
--- a/apps/lockfile-explorer/src/graph/test/__snapshots__/lfxGraph-website-sample-1-v5.4.test.ts.snap
+++ b/apps/lockfile-explorer/src/graph/test/__snapshots__/lfxGraph-website-sample-1-v5.4.test.ts.snap
@@ -317,7 +317,9 @@ exports[`lfxGraph-website-sample-1-v5.4 loads a workspace 1`] = `
workspace:
pnpmLockfileFolder: common/temp
pnpmLockfilePath: common/temp/pnpm-lock.yaml
+ pnpmfilePath: common/temp/.pnpmfile.cjs
rushConfig:
+ rushPnpmfilePath: common/config/.pnpmfile.cjs
rushVersion: 5.83.3
subspaceName: ''
workspaceRootFullPath: /repo
diff --git a/apps/lockfile-explorer/src/graph/test/__snapshots__/lfxGraph-website-sample-1-v6.0.test.ts.snap b/apps/lockfile-explorer/src/graph/test/__snapshots__/lfxGraph-website-sample-1-v6.0.test.ts.snap
index 7f65a88ff52..64f461236c5 100644
--- a/apps/lockfile-explorer/src/graph/test/__snapshots__/lfxGraph-website-sample-1-v6.0.test.ts.snap
+++ b/apps/lockfile-explorer/src/graph/test/__snapshots__/lfxGraph-website-sample-1-v6.0.test.ts.snap
@@ -263,7 +263,9 @@ exports[`lfxGraph-website-sample-1-v6.0 loads a workspace 1`] = `
workspace:
pnpmLockfileFolder: common/temp
pnpmLockfilePath: common/temp/pnpm-lock.yaml
+ pnpmfilePath: common/temp/.pnpmfile.cjs
rushConfig:
+ rushPnpmfilePath: common/config/.pnpmcfile.cjs
rushVersion: 5.158.1
subspaceName: ''
workspaceRootFullPath: /repo
diff --git a/apps/lockfile-explorer/src/graph/test/serializeToJson.test.ts b/apps/lockfile-explorer/src/graph/test/serializeToJson.test.ts
index 46ffc2c09db..d05769f2e81 100644
--- a/apps/lockfile-explorer/src/graph/test/serializeToJson.test.ts
+++ b/apps/lockfile-explorer/src/graph/test/serializeToJson.test.ts
@@ -88,7 +88,9 @@ Object {
"workspace": Object {
"pnpmLockfileFolder": "common/temp/my-subspace",
"pnpmLockfilePath": "common/temp/my-subspace/pnpm-lock.yaml",
+ "pnpmfilePath": "common/temp/my-subspace/.pnpmfile.cjs",
"rushConfig": Object {
+ "rushPnpmfilePath": "common/config/subspaces/my-subspace/.pnpmfile.cjs",
"rushVersion": "0.0.0",
"subspaceName": "my-subspace",
},