@servicetitan/startup 33.0.1 → 33.1.1

package/dist/utils/get-jest-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-jest-config.d.ts","sourceRoot":"","sources":["../../src/utils/get-jest-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAiCrC;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAgC/D"}
+{"version":3,"file":"get-jest-config.d.ts","sourceRoot":"","sources":["../../src/utils/get-jest-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAiCrC;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAoC/D"}

package/dist/utils/get-jest-config.js

@@ -70,6 +70,9 @@ function getJestConfigCLI(args) {
             ...defaultConfig.moduleNameMapper
         };
     }
+    const reporters = typeof config.reporters === 'string' ? [
+        config.reporters
+    ] : config.reporters;
     return stringifyForCLI({
         ...mergeArrayValues(defaultConfig, {
             coveragePathIgnorePatterns,
@@ -79,6 +82,9 @@ function getJestConfigCLI(args) {
         ...config,
         ...moduleNameMapper ? {
             moduleNameMapper
+        } : {},
+        ...reporters ? {
+            reporters
         } : {}
     });
 }

package/dist/utils/get-jest-config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/get-jest-config.ts"],"sourcesContent":["import { Config } from '@jest/types';\nimport path from 'path';\nimport { getJestConfiguration } from './get-configuration';\nimport { getDestinationFolders } from './get-destination-folders';\nimport { toArray } from './to-array';\nimport { omit } from './omit';\n\nfunction getDefaultJestConfiguration() {\n    const moduleNameMapper = {\n        '\\\\.(css|scss|less|png|jpg|jpeg|gif|woff|woff2|eot|ttf|otf)$': 'identity-obj-proxy',\n    };\n\n    return {\n        collectCoverageFrom: ['**/*.{ts,tsx}'],\n        coveragePathIgnorePatterns: ['^.+\\\\.d\\\\.ts$'],\n        coverageReporters: ['html-spa', 'text', 'json', 'cobertura', 'lcov'],\n        moduleNameMapper,\n        modulePathIgnorePatterns: ['<rootDir>/.*/__mocks__'],\n        preset: path.join(__dirname, '../../jest'),\n        resolver: '@servicetitan/startup/jest-resolver',\n        setupFiles: [path.join(__dirname, '../../jest/setup.js')],\n        testEnvironment: 'jsdom',\n        testPathIgnorePatterns: ['\\\\.yalc', ...getDestinationFolders()],\n        testRunner: 'jest-circus/runner',\n        transformIgnorePatterns: ['node_modules/(?!(@servicetitan|@react-hook|nanoid|axios)/)'],\n        verbose: true,\n    } as Omit<Config.Argv, 'collectCoverageFrom' | 'moduleNameMapper' | 'setupFiles'> & {\n        collectCoverageFrom: string[];\n        moduleNameMapper: Record<string, string>;\n        setupFiles: string[];\n    };\n}\n\n/**\n * Get Jest config for running it using jest CLI (see jest runCLI function)\n */\nexport function getJestConfigCLI(args: Config.Argv): Config.Argv {\n    const {\n        coveragePathIgnorePatterns,\n        omitDefault = [],\n        setupFiles,\n        testPathIgnorePatterns,\n        ...config\n    } = {\n        ...getJestConfiguration(),\n        ...args,\n    };\n\n    const defaultConfig = omit(getDefaultJestConfiguration(), omitDefault);\n\n    let moduleNameMapper: Record<string, string> | undefined =\n        typeof config.moduleNameMapper === 'string'\n            ? JSON.parse(config.moduleNameMapper)\n            : config.moduleNameMapper;\n\n    if (defaultConfig.moduleNameMapper) {\n        moduleNameMapper = { ...moduleNameMapper, ...defaultConfig.moduleNameMapper };\n    }\n\n    return stringifyForCLI({\n        ...mergeArrayValues(defaultConfig, {\n            coveragePathIgnorePatterns,\n            setupFiles,\n            testPathIgnorePatterns,\n        }),\n        ...config,\n        ...(moduleNameMapper ? { moduleNameMapper } : {}),\n    });\n}\n\nfunction mergeArrayValues(\n    config: any,\n    arrayValues: {\n        coveragePathIgnorePatterns?: string | string[];\n        setupFiles?: string | string[];\n        testPathIgnorePatterns?: string | string[];\n    }\n) {\n    return Object.keys(arrayValues).reduce((result, key: keyof typeof arrayValues) => {\n        const newValue = arrayValues[key];\n        if (newValue) {\n            result[key] = [...toArray(result[key]), ...toArray(newValue)];\n        }\n        return result;\n    }, config);\n}\n\nfunction stringifyForCLI(config: any): Config.Argv {\n    return ['collectCoverageFrom', 'globals', 'moduleNameMapper', 'transform'].reduce(\n        (result, key) => {\n            const value = result[key];\n            if (value && typeof value !== 'string') {\n                result[key] = JSON.stringify(result[key]);\n            }\n            return result;\n        },\n        config\n    );\n}\n"],"names":["getJestConfigCLI","getDefaultJestConfiguration","moduleNameMapper","collectCoverageFrom","coveragePathIgnorePatterns","coverageReporters","modulePathIgnorePatterns","preset","path","join","__dirname","resolver","setupFiles","testEnvironment","testPathIgnorePatterns","getDestinationFolders","testRunner","transformIgnorePatterns","verbose","args","omitDefault","config","getJestConfiguration","defaultConfig","omit","JSON","parse","stringifyForCLI","mergeArrayValues","arrayValues","Object","keys","reduce","result","key","newValue","toArray","value","stringify"],"mappings":";;;;+BAoCgBA;;;eAAAA;;;6DAnCC;kCACoB;uCACC;yBACd;sBACH;;;;;;AAErB,SAASC;IACL,MAAMC,mBAAmB;QACrB,+DAA+D;IACnE;IAEA,OAAO;QACHC,qBAAqB;YAAC;SAAgB;QACtCC,4BAA4B;YAAC;SAAgB;QAC7CC,mBAAmB;YAAC;YAAY;YAAQ;YAAQ;YAAa;SAAO;QACpEH;QACAI,0BAA0B;YAAC;SAAyB;QACpDC,QAAQC,aAAI,CAACC,IAAI,CAACC,WAAW;QAC7BC,UAAU;QACVC,YAAY;YAACJ,aAAI,CAACC,IAAI,CAACC,WAAW;SAAuB;QACzDG,iBAAiB;QACjBC,wBAAwB;YAAC;eAAcC,IAAAA,4CAAqB;SAAG;QAC/DC,YAAY;QACZC,yBAAyB;YAAC;SAA6D;QACvFC,SAAS;IACb;AAKJ;AAKO,SAASlB,iBAAiBmB,IAAiB;IAC9C,MAAM,EACFf,0BAA0B,EAC1BgB,cAAc,EAAE,EAChBR,UAAU,EACVE,sBAAsB,EACtB,GAAGO,QACN,GAAG;QACA,GAAGC,IAAAA,sCAAoB,GAAE;QACzB,GAAGH,IAAI;IACX;IAEA,MAAMI,gBAAgBC,IAAAA,UAAI,EAACvB,+BAA+BmB;IAE1D,IAAIlB,mBACA,OAAOmB,OAAOnB,gBAAgB,KAAK,WAC7BuB,KAAKC,KAAK,CAACL,OAAOnB,gBAAgB,IAClCmB,OAAOnB,gBAAgB;IAEjC,IAAIqB,cAAcrB,gBAAgB,EAAE;QAChCA,mBAAmB;YAAE,GAAGA,gBAAgB;YAAE,GAAGqB,cAAcrB,gBAAgB;QAAC;IAChF;IAEA,OAAOyB,gBAAgB;QACnB,GAAGC,iBAAiBL,eAAe;YAC/BnB;YACAQ;YACAE;QACJ,EAAE;QACF,GAAGO,MAAM;QACT,GAAInB,mBAAmB;YAAEA;QAAiB,IAAI,CAAC,CAAC;IACpD;AACJ;AAEA,SAAS0B,iBACLP,MAAW,EACXQ,WAIC;IAED,OAAOC,OAAOC,IAAI,CAACF,aAAaG,MAAM,CAAC,CAACC,QAAQC;QAC5C,MAAMC,WAAWN,WAAW,CAACK,IAAI;QACjC,IAAIC,UAAU;YACVF,MAAM,CAACC,IAAI,GAAG;mBAAIE,IAAAA,gBAAO,EAACH,MAAM,CAACC,IAAI;mBAAME,IAAAA,gBAAO,EAACD;aAAU;QACjE;QACA,OAAOF;IACX,GAAGZ;AACP;AAEA,SAASM,gBAAgBN,MAAW;IAChC,OAAO;QAAC;QAAuB;QAAW;QAAoB;KAAY,CAACW,MAAM,CAC7E,CAACC,QAAQC;QACL,MAAMG,QAAQJ,MAAM,CAACC,IAAI;QACzB,IAAIG,SAAS,OAAOA,UAAU,UAAU;YACpCJ,MAAM,CAACC,IAAI,GAAGT,KAAKa,SAAS,CAACL,MAAM,CAACC,IAAI;QAC5C;QACA,OAAOD;IACX,GACAZ;AAER"}
+{"version":3,"sources":["../../src/utils/get-jest-config.ts"],"sourcesContent":["import { Config } from '@jest/types';\nimport path from 'path';\nimport { getJestConfiguration } from './get-configuration';\nimport { getDestinationFolders } from './get-destination-folders';\nimport { toArray } from './to-array';\nimport { omit } from './omit';\n\nfunction getDefaultJestConfiguration() {\n    const moduleNameMapper = {\n        '\\\\.(css|scss|less|png|jpg|jpeg|gif|woff|woff2|eot|ttf|otf)$': 'identity-obj-proxy',\n    };\n\n    return {\n        collectCoverageFrom: ['**/*.{ts,tsx}'],\n        coveragePathIgnorePatterns: ['^.+\\\\.d\\\\.ts$'],\n        coverageReporters: ['html-spa', 'text', 'json', 'cobertura', 'lcov'],\n        moduleNameMapper,\n        modulePathIgnorePatterns: ['<rootDir>/.*/__mocks__'],\n        preset: path.join(__dirname, '../../jest'),\n        resolver: '@servicetitan/startup/jest-resolver',\n        setupFiles: [path.join(__dirname, '../../jest/setup.js')],\n        testEnvironment: 'jsdom',\n        testPathIgnorePatterns: ['\\\\.yalc', ...getDestinationFolders()],\n        testRunner: 'jest-circus/runner',\n        transformIgnorePatterns: ['node_modules/(?!(@servicetitan|@react-hook|nanoid|axios)/)'],\n        verbose: true,\n    } as Omit<Config.Argv, 'collectCoverageFrom' | 'moduleNameMapper' | 'setupFiles'> & {\n        collectCoverageFrom: string[];\n        moduleNameMapper: Record<string, string>;\n        setupFiles: string[];\n    };\n}\n\n/**\n * Get Jest config for running it using jest CLI (see jest runCLI function)\n */\nexport function getJestConfigCLI(args: Config.Argv): Config.Argv {\n    const {\n        coveragePathIgnorePatterns,\n        omitDefault = [],\n        setupFiles,\n        testPathIgnorePatterns,\n        ...config\n    } = {\n        ...getJestConfiguration(),\n        ...args,\n    };\n\n    const defaultConfig = omit(getDefaultJestConfiguration(), omitDefault);\n\n    let moduleNameMapper: Record<string, string> | undefined =\n        typeof config.moduleNameMapper === 'string'\n            ? JSON.parse(config.moduleNameMapper)\n            : config.moduleNameMapper;\n\n    if (defaultConfig.moduleNameMapper) {\n        moduleNameMapper = { ...moduleNameMapper, ...defaultConfig.moduleNameMapper };\n    }\n\n    const reporters: string[] | undefined =\n        typeof config.reporters === 'string' ? [config.reporters] : config.reporters;\n\n    return stringifyForCLI({\n        ...mergeArrayValues(defaultConfig, {\n            coveragePathIgnorePatterns,\n            setupFiles,\n            testPathIgnorePatterns,\n        }),\n        ...config,\n        ...(moduleNameMapper ? { moduleNameMapper } : {}),\n        ...(reporters ? { reporters } : {}),\n    });\n}\n\nfunction mergeArrayValues(\n    config: any,\n    arrayValues: {\n        coveragePathIgnorePatterns?: string | string[];\n        setupFiles?: string | string[];\n        testPathIgnorePatterns?: string | string[];\n    }\n) {\n    return Object.keys(arrayValues).reduce((result, key: keyof typeof arrayValues) => {\n        const newValue = arrayValues[key];\n        if (newValue) {\n            result[key] = [...toArray(result[key]), ...toArray(newValue)];\n        }\n        return result;\n    }, config);\n}\n\nfunction stringifyForCLI(config: any): Config.Argv {\n    return ['collectCoverageFrom', 'globals', 'moduleNameMapper', 'transform'].reduce(\n        (result, key) => {\n            const value = result[key];\n            if (value && typeof value !== 'string') {\n                result[key] = JSON.stringify(result[key]);\n            }\n            return result;\n        },\n        config\n    );\n}\n"],"names":["getJestConfigCLI","getDefaultJestConfiguration","moduleNameMapper","collectCoverageFrom","coveragePathIgnorePatterns","coverageReporters","modulePathIgnorePatterns","preset","path","join","__dirname","resolver","setupFiles","testEnvironment","testPathIgnorePatterns","getDestinationFolders","testRunner","transformIgnorePatterns","verbose","args","omitDefault","config","getJestConfiguration","defaultConfig","omit","JSON","parse","reporters","stringifyForCLI","mergeArrayValues","arrayValues","Object","keys","reduce","result","key","newValue","toArray","value","stringify"],"mappings":";;;;+BAoCgBA;;;eAAAA;;;6DAnCC;kCACoB;uCACC;yBACd;sBACH;;;;;;AAErB,SAASC;IACL,MAAMC,mBAAmB;QACrB,+DAA+D;IACnE;IAEA,OAAO;QACHC,qBAAqB;YAAC;SAAgB;QACtCC,4BAA4B;YAAC;SAAgB;QAC7CC,mBAAmB;YAAC;YAAY;YAAQ;YAAQ;YAAa;SAAO;QACpEH;QACAI,0BAA0B;YAAC;SAAyB;QACpDC,QAAQC,aAAI,CAACC,IAAI,CAACC,WAAW;QAC7BC,UAAU;QACVC,YAAY;YAACJ,aAAI,CAACC,IAAI,CAACC,WAAW;SAAuB;QACzDG,iBAAiB;QACjBC,wBAAwB;YAAC;eAAcC,IAAAA,4CAAqB;SAAG;QAC/DC,YAAY;QACZC,yBAAyB;YAAC;SAA6D;QACvFC,SAAS;IACb;AAKJ;AAKO,SAASlB,iBAAiBmB,IAAiB;IAC9C,MAAM,EACFf,0BAA0B,EAC1BgB,cAAc,EAAE,EAChBR,UAAU,EACVE,sBAAsB,EACtB,GAAGO,QACN,GAAG;QACA,GAAGC,IAAAA,sCAAoB,GAAE;QACzB,GAAGH,IAAI;IACX;IAEA,MAAMI,gBAAgBC,IAAAA,UAAI,EAACvB,+BAA+BmB;IAE1D,IAAIlB,mBACA,OAAOmB,OAAOnB,gBAAgB,KAAK,WAC7BuB,KAAKC,KAAK,CAACL,OAAOnB,gBAAgB,IAClCmB,OAAOnB,gBAAgB;IAEjC,IAAIqB,cAAcrB,gBAAgB,EAAE;QAChCA,mBAAmB;YAAE,GAAGA,gBAAgB;YAAE,GAAGqB,cAAcrB,gBAAgB;QAAC;IAChF;IAEA,MAAMyB,YACF,OAAON,OAAOM,SAAS,KAAK,WAAW;QAACN,OAAOM,SAAS;KAAC,GAAGN,OAAOM,SAAS;IAEhF,OAAOC,gBAAgB;QACnB,GAAGC,iBAAiBN,eAAe;YAC/BnB;YACAQ;YACAE;QACJ,EAAE;QACF,GAAGO,MAAM;QACT,GAAInB,mBAAmB;YAAEA;QAAiB,IAAI,CAAC,CAAC;QAChD,GAAIyB,YAAY;YAAEA;QAAU,IAAI,CAAC,CAAC;IACtC;AACJ;AAEA,SAASE,iBACLR,MAAW,EACXS,WAIC;IAED,OAAOC,OAAOC,IAAI,CAACF,aAAaG,MAAM,CAAC,CAACC,QAAQC;QAC5C,MAAMC,WAAWN,WAAW,CAACK,IAAI;QACjC,IAAIC,UAAU;YACVF,MAAM,CAACC,IAAI,GAAG;mBAAIE,IAAAA,gBAAO,EAACH,MAAM,CAACC,IAAI;mBAAME,IAAAA,gBAAO,EAACD;aAAU;QACjE;QACA,OAAOF;IACX,GAAGb;AACP;AAEA,SAASO,gBAAgBP,MAAW;IAChC,OAAO;QAAC;QAAuB;QAAW;QAAoB;KAAY,CAACY,MAAM,CAC7E,CAACC,QAAQC;QACL,MAAMG,QAAQJ,MAAM,CAACC,IAAI;QACzB,IAAIG,SAAS,OAAOA,UAAU,UAAU;YACpCJ,MAAM,CAACC,IAAI,GAAGV,KAAKc,SAAS,CAACL,MAAM,CAACC,IAAI;QAC5C;QACA,OAAOD;IACX,GACAb;AAER"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@servicetitan/startup",
-    "version": "33.0.1",
+    "version": "33.1.1",
     "description": "",
     "homepage": "https://docs.st.dev/docs/frontend/startup",
     "repository": {
@@ -53,9 +53,9 @@
         "@jest/core": "~30.2.0",
         "@jest/types": "~30.2.0",
         "@jsdevtools/coverage-istanbul-loader": "^3.0.5",
-        "@servicetitan/eslint-config": "33.0.1",
-        "@servicetitan/install": "33.0.1",
-        "@servicetitan/stylelint-config": "33.0.1",
+        "@servicetitan/eslint-config": "33.1.1",
+        "@servicetitan/install": "33.1.1",
+        "@servicetitan/stylelint-config": "33.1.1",
         "@svgr/webpack": "^8.1.0",
         "@swc/cli": "^0.5.0",
         "@swc/core": "1.13.5",
@@ -148,5 +148,5 @@
     "cli": {
         "webpack": false
     },
-    "gitHead": "6a140ed15688cc4915d3d0e52000c2f8c1f381ca"
+    "gitHead": "36ff4078b07d6c86bdf968b7f8b3c0adbe03fd4c"
 }

package/src/postinstall.js

@@ -3,12 +3,15 @@ const fs = require('fs');
 const path = require('path');
 
 const cwd = process.env.INIT_CWD;
-const patchDir = path.relative(cwd, path.resolve('patches'));
+const patchDir = path.resolve('patches');
+const relativePatchDir = path.relative(cwd, patchDir);
+const isInstalledInCurrentDirectory = patchDir.startsWith(path.resolve(cwd));
+console.log({ cwd, patchDir, relativePatchDir, isInstalledInCurrentDirectory }); // eslint-disable-line no-console
 
 try {
     // Only apply patches when installed in project (as opposed to globally or in npx cache)
-    if (fs.existsSync('package.json')) {
-        execFileSync('npx', ['patch-package', '--error-on-fail', '--patch-dir', patchDir], {
+    if (fs.existsSync('package.json') && isInstalledInCurrentDirectory) {
+        execFileSync('npx', ['patch-package', '--error-on-fail', '--patch-dir', relativePatchDir], {
             cwd,
             shell: process.platform === 'win32',
             stdio: 'inherit',

package/src/utils/__tests__/get-jest-config.test.ts

@@ -153,5 +153,19 @@ describe('[startup] Utils', () => {
                 itMergesDefaultWithCustomValue();
             });
         });
+
+        describe('with custom "reporters" that is a string', () => {
+            const customConfig = { reporters: 'reporter' };
+
+            beforeEach(() => {
+                jest.mocked(getJestConfiguration).mockReturnValue(customConfig);
+            });
+
+            test('converts string to array', () => {
+                expect(subject()).toEqual(
+                    expect.objectContaining({ reporters: [customConfig.reporters] })
+                );
+            });
+        });
     });
 });

package/src/utils/get-jest-config.ts

@@ -57,6 +57,9 @@ export function getJestConfigCLI(args: Config.Argv): Config.Argv {
         moduleNameMapper = { ...moduleNameMapper, ...defaultConfig.moduleNameMapper };
     }
 
+    const reporters: string[] | undefined =
+        typeof config.reporters === 'string' ? [config.reporters] : config.reporters;
+
     return stringifyForCLI({
         ...mergeArrayValues(defaultConfig, {
             coveragePathIgnorePatterns,
@@ -65,6 +68,7 @@ export function getJestConfigCLI(args: Config.Argv): Config.Argv {
         }),
         ...config,
         ...(moduleNameMapper ? { moduleNameMapper } : {}),
+        ...(reporters ? { reporters } : {}),
     });
 }