@servicetitan/startup 36.1.2-canary.9 → 36.2.0

package/dist/cli/utils/check-startup-location.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"check-startup-location.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/check-startup-location.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAO,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD,wBAAgB,oBAAoB,CAChC,WAAW,EAAE,WAAW,EACxB,EAAE,kBAAkB,EAAE,GAAE,YAAiB,QAgB5C"}
+{"version":3,"file":"check-startup-location.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/check-startup-location.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAO,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD,wBAAgB,oBAAoB,CAChC,WAAW,EAAE,WAAW,EACxB,EAAE,kBAAkB,EAAE,GAAE,YAAiB,QA+B5C"}

package/dist/cli/utils/check-startup-location.js

@@ -11,10 +11,22 @@ Object.defineProperty(exports, "checkStartupLocation", {
 const _utils = require("../../utils");
 const _clinpm = require("./cli-npm");
 function checkStartupLocation(commandName, { allowRunFromGlobal } = {}) {
-    if (allowRunFromGlobal || process.env.SKIP_STARTUP_LOCATION_CHECK) {
+    if (process.env.SKIP_STARTUP_LOCATION_CHECK) {
         return;
     }
     const projectRoot = (0, _clinpm.npmGetProjectRoot)();
+    /*
+     * Set nx's workspace root so lerna/nx don't walk past a worktree into the
+     * main repo. nx walks ancestors looking for node_modules/nx and picks the
+     * highest match, which lands on the main repo when the worktree was
+     * created inside it. See FAR-1803.
+     */ if (projectRoot) {
+        var _process_env, _NX_WORKSPACE_ROOT_PATH;
+        (_NX_WORKSPACE_ROOT_PATH = (_process_env = process.env).NX_WORKSPACE_ROOT_PATH) !== null && _NX_WORKSPACE_ROOT_PATH !== void 0 ? _NX_WORKSPACE_ROOT_PATH : _process_env.NX_WORKSPACE_ROOT_PATH = projectRoot;
+    }
+    if (allowRunFromGlobal) {
+        return;
+    }
     if (projectRoot && __dirname.startsWith(projectRoot)) {
         process.env.SKIP_STARTUP_LOCATION_CHECK = 'true';
         return;

package/dist/cli/utils/check-startup-location.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/cli/utils/check-startup-location.ts"],"sourcesContent":["import { CommandName, log } from '../../utils';\nimport { CommandEntry } from '../commands/types';\nimport { npmGetProjectRoot } from './cli-npm';\n\nexport function checkStartupLocation(\n    commandName: CommandName,\n    { allowRunFromGlobal }: CommandEntry = {}\n) {\n    if (allowRunFromGlobal || process.env.SKIP_STARTUP_LOCATION_CHECK) {\n        return;\n    }\n\n    const projectRoot = npmGetProjectRoot();\n    if (projectRoot && __dirname.startsWith(projectRoot)) {\n        process.env.SKIP_STARTUP_LOCATION_CHECK = 'true';\n        return;\n    }\n\n    log.error(\n        `Error: ${commandName} must be run from the local @servicetitan/startup installation`\n    );\n    process.exit(1);\n}\n"],"names":["checkStartupLocation","commandName","allowRunFromGlobal","process","env","SKIP_STARTUP_LOCATION_CHECK","projectRoot","npmGetProjectRoot","__dirname","startsWith","log","error","exit"],"mappings":";;;;+BAIgBA;;;eAAAA;;;uBAJiB;wBAEC;AAE3B,SAASA,qBACZC,WAAwB,EACxB,EAAEC,kBAAkB,EAAgB,GAAG,CAAC,CAAC;IAEzC,IAAIA,sBAAsBC,QAAQC,GAAG,CAACC,2BAA2B,EAAE;QAC/D;IACJ;IAEA,MAAMC,cAAcC,IAAAA,yBAAiB;IACrC,IAAID,eAAeE,UAAUC,UAAU,CAACH,cAAc;QAClDH,QAAQC,GAAG,CAACC,2BAA2B,GAAG;QAC1C;IACJ;IAEAK,UAAG,CAACC,KAAK,CACL,CAAC,OAAO,EAAEV,YAAY,8DAA8D,CAAC;IAEzFE,QAAQS,IAAI,CAAC;AACjB"}
+{"version":3,"sources":["../../../src/cli/utils/check-startup-location.ts"],"sourcesContent":["import { CommandName, log } from '../../utils';\nimport { CommandEntry } from '../commands/types';\nimport { npmGetProjectRoot } from './cli-npm';\n\nexport function checkStartupLocation(\n    commandName: CommandName,\n    { allowRunFromGlobal }: CommandEntry = {}\n) {\n    if (process.env.SKIP_STARTUP_LOCATION_CHECK) {\n        return;\n    }\n\n    const projectRoot = npmGetProjectRoot();\n\n    /*\n     * Set nx's workspace root so lerna/nx don't walk past a worktree into the\n     * main repo. nx walks ancestors looking for node_modules/nx and picks the\n     * highest match, which lands on the main repo when the worktree was\n     * created inside it. See FAR-1803.\n     */\n    if (projectRoot) {\n        process.env.NX_WORKSPACE_ROOT_PATH ??= projectRoot;\n    }\n\n    if (allowRunFromGlobal) {\n        return;\n    }\n\n    if (projectRoot && __dirname.startsWith(projectRoot)) {\n        process.env.SKIP_STARTUP_LOCATION_CHECK = 'true';\n        return;\n    }\n\n    log.error(\n        `Error: ${commandName} must be run from the local @servicetitan/startup installation`\n    );\n    process.exit(1);\n}\n"],"names":["checkStartupLocation","commandName","allowRunFromGlobal","process","env","SKIP_STARTUP_LOCATION_CHECK","projectRoot","npmGetProjectRoot","NX_WORKSPACE_ROOT_PATH","__dirname","startsWith","log","error","exit"],"mappings":";;;;+BAIgBA;;;eAAAA;;;uBAJiB;wBAEC;AAE3B,SAASA,qBACZC,WAAwB,EACxB,EAAEC,kBAAkB,EAAgB,GAAG,CAAC,CAAC;IAEzC,IAAIC,QAAQC,GAAG,CAACC,2BAA2B,EAAE;QACzC;IACJ;IAEA,MAAMC,cAAcC,IAAAA,yBAAiB;IAErC;;;;;KAKC,GACD,IAAID,aAAa;YACbH,cAAAA;SAAAA,0BAAAA,CAAAA,eAAAA,QAAQC,GAAG,EAACI,sBAAsB,cAAlCL,qCAAAA,0BAAAA,aAAYK,sBAAsB,GAAKF;IAC3C;IAEA,IAAIJ,oBAAoB;QACpB;IACJ;IAEA,IAAII,eAAeG,UAAUC,UAAU,CAACJ,cAAc;QAClDH,QAAQC,GAAG,CAACC,2BAA2B,GAAG;QAC1C;IACJ;IAEAM,UAAG,CAACC,KAAK,CACL,CAAC,OAAO,EAAEX,YAAY,8DAA8D,CAAC;IAEzFE,QAAQU,IAAI,CAAC;AACjB"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@servicetitan/startup",
-    "version": "36.1.2-canary.9",
+    "version": "36.2.0",
     "description": "CLI to create multi-package Lerna projects with TypeScript and React",
     "homepage": "https://docs.st.dev/docs/frontend/uikit/startup",
     "repository": {
@@ -97,13 +97,13 @@
         "@jest/core": "~30.3.0",
         "@jest/types": "~30.3.0",
         "@jsdevtools/coverage-istanbul-loader": "^3.0.5",
-        "@servicetitan/eslint-config": "36.1.2-canary.9",
-        "@servicetitan/install": "36.1.2-canary.9",
-        "@servicetitan/startup-utils": "36.1.2-canary.9",
-        "@servicetitan/stylelint-config": "36.1.2-canary.9",
+        "@servicetitan/eslint-config": "36.2.0",
+        "@servicetitan/install": "36.2.0",
+        "@servicetitan/startup-utils": "36.2.0",
+        "@servicetitan/stylelint-config": "36.2.0",
         "@svgr/webpack": "^8.1.0",
         "@swc/cli": "^0.8.1",
-        "@swc/core": "1.15.24",
+        "@swc/core": "1.15.33",
         "@types/debug": "^4.1.12",
         "@types/jest": "~30.0.0",
         "@vitest/coverage-v8": "^4.1.5",
@@ -138,7 +138,7 @@
         "multimatch": "~8.0.0",
         "patch-package": "^8.0.1",
         "portfinder": "~1.0.38",
-        "postcss": "~8.5.10",
+        "postcss": "~8.5.14",
         "prettier": "~3.8.3",
         "sass": "~1.99.0",
         "sass-loader": "~16.0.7",
@@ -184,5 +184,6 @@
     },
     "cli": {
         "webpack": false
-    }
+    },
+    "gitHead": "87254b2caf60b20eb46c33b40ffb4dd05ad3e0f7"
 }

package/src/cli/utils/__tests__/check-startup-location.test.ts

@@ -12,6 +12,7 @@ jest.mock('../cli-npm');
 describe('[startup] Cli Utils', () => {
     describe(checkStartupLocation.name, () => {
         const originalSkipLocationCheck = process.env.SKIP_STARTUP_LOCATION_CHECK;
+        const originalNxWorkspaceRootPath = process.env.NX_WORKSPACE_ROOT_PATH;
         const commandName: any = 'test';
         let entry: CommandEntry | undefined;
 
@@ -20,6 +21,7 @@ describe('[startup] Cli Utils', () => {
             jest.mocked(npmGetProjectRoot).mockReturnValue(process.cwd());
             jest.spyOn(process, 'exit').mockImplementation(jest.fn() as any);
             delete process.env.SKIP_STARTUP_LOCATION_CHECK;
+            delete process.env.NX_WORKSPACE_ROOT_PATH;
             entry = undefined;
         });
 
@@ -27,12 +29,15 @@ describe('[startup] Cli Utils', () => {
             if (originalSkipLocationCheck !== undefined) {
                 process.env.SKIP_STARTUP_LOCATION_CHECK = originalSkipLocationCheck;
             }
+            if (originalNxWorkspaceRootPath !== undefined) {
+                process.env.NX_WORKSPACE_ROOT_PATH = originalNxWorkspaceRootPath;
+            }
         });
 
         const subject = () => checkStartupLocation(commandName, entry);
 
-        function itDoesNothing() {
-            test('does nothing', () => {
+        function itDoesNotExitWithError() {
+            test('does not exit with error', () => {
                 subject();
 
                 expect(log.error).not.toHaveBeenCalled();
@@ -40,7 +45,16 @@ describe('[startup] Cli Utils', () => {
             });
         }
 
-        itDoesNothing();
+        function itSetsNxWorkspaceRootPath() {
+            test('sets NX_WORKSPACE_ROOT_PATH to the project root', () => {
+                subject();
+
+                expect(process.env.NX_WORKSPACE_ROOT_PATH).toEqual(npmGetProjectRoot());
+            });
+        }
+
+        itDoesNotExitWithError();
+        itSetsNxWorkspaceRootPath();
 
         test('sets process.env.SKIP_STARTUP_LOCATION_CHECK', () => {
             subject();
@@ -48,6 +62,18 @@ describe('[startup] Cli Utils', () => {
             expect(process.env.SKIP_STARTUP_LOCATION_CHECK).toBeDefined();
         });
 
+        describe('when NX_WORKSPACE_ROOT_PATH is already set', () => {
+            const existingRoot = '/existing/workspace/root';
+
+            beforeEach(() => (process.env.NX_WORKSPACE_ROOT_PATH = existingRoot));
+
+            test('does not overwrite NX_WORKSPACE_ROOT_PATH', () => {
+                subject();
+
+                expect(process.env.NX_WORKSPACE_ROOT_PATH).toEqual(existingRoot);
+            });
+        });
+
         describe('when running from non-project directory', () => {
             beforeEach(() => jest.mocked(npmGetProjectRoot).mockReturnValue('foo'));
 
@@ -63,13 +89,20 @@ describe('[startup] Cli Utils', () => {
             describe('when command allows running from global location', () => {
                 beforeEach(() => (entry = { allowRunFromGlobal: true }));
 
-                itDoesNothing();
+                itDoesNotExitWithError();
+                itSetsNxWorkspaceRootPath();
             });
 
             describe('when parent process has already checked location', () => {
                 beforeEach(() => (process.env.SKIP_STARTUP_LOCATION_CHECK = 'true'));
 
-                itDoesNothing();
+                itDoesNotExitWithError();
+
+                test('does not set NX_WORKSPACE_ROOT_PATH', () => {
+                    subject();
+
+                    expect(process.env.NX_WORKSPACE_ROOT_PATH).toBeUndefined();
+                });
             });
         });
     });

package/src/cli/utils/check-startup-location.ts

@@ -6,11 +6,26 @@ export function checkStartupLocation(
     commandName: CommandName,
     { allowRunFromGlobal }: CommandEntry = {}
 ) {
-    if (allowRunFromGlobal || process.env.SKIP_STARTUP_LOCATION_CHECK) {
+    if (process.env.SKIP_STARTUP_LOCATION_CHECK) {
         return;
     }
 
     const projectRoot = npmGetProjectRoot();
+
+    /*
+     * Set nx's workspace root so lerna/nx don't walk past a worktree into the
+     * main repo. nx walks ancestors looking for node_modules/nx and picks the
+     * highest match, which lands on the main repo when the worktree was
+     * created inside it. See FAR-1803.
+     */
+    if (projectRoot) {
+        process.env.NX_WORKSPACE_ROOT_PATH ??= projectRoot;
+    }
+
+    if (allowRunFromGlobal) {
+        return;
+    }
+
     if (projectRoot && __dirname.startsWith(projectRoot)) {
         process.env.SKIP_STARTUP_LOCATION_CHECK = 'true';
         return;