@servicetitan/startup 22.7.0 → 22.8.0

package/dist/cli/utils/publish.js

@@ -11,7 +11,7 @@ const getDefaultBuildVersion = (branchName, commitHash) => {
     if (/^\d+$/.test(ch)) {
         ch = parseInt(ch, 10).toString(10);
     }
-    return `${branchName}.${ch}`;
+    return `${branchName.replace(/\W/g, '')}.${ch}`;
 };
 exports.getDefaultBuildVersion = getDefaultBuildVersion;
 //# sourceMappingURL=publish.js.map

package/dist/cli/utils/publish.js.map

@@ -1 +1 @@
-{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../src/cli/utils/publish.ts"],"names":[],"mappings":";;;AAAO,MAAM,sBAAsB,GAAG,CAAC,UAAkB,EAAE,UAAkB,EAAE,EAAE;IAC7E,IAAI,EAAE,GAAG,UAAU,CAAC;IAEpB;;;;OAIG;IACH,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;QAClB,EAAE,GAAG,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;KACtC;IACD,OAAO,GAAG,UAAU,IAAI,EAAE,EAAE,CAAC;AACjC,CAAC,CAAC;AAZW,QAAA,sBAAsB,0BAYjC"}
+{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../src/cli/utils/publish.ts"],"names":[],"mappings":";;;AAAO,MAAM,sBAAsB,GAAG,CAAC,UAAkB,EAAE,UAAkB,EAAE,EAAE;IAC7E,IAAI,EAAE,GAAG,UAAU,CAAC;IAEpB;;;;OAIG;IACH,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;QAClB,EAAE,GAAG,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;KACtC;IACD,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;AACpD,CAAC,CAAC;AAZW,QAAA,sBAAsB,0BAYjC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@servicetitan/startup",
-    "version": "22.7.0",
+    "version": "22.8.0",
     "description": "",
     "homepage": "https://docs.st.dev/docs/frontend/startup",
     "repository": {
@@ -32,12 +32,12 @@
         "@types/yargs": "~17.0.24"
     },
     "dependencies": {
-        "@babel/preset-env": "~7.22.4",
+        "@babel/preset-env": "~7.22.5",
         "@jest/core": "~27.5.1",
         "@jest/types": "~27.5.1",
         "@lerna/exec": "~5.6.2",
-        "@servicetitan/eslint-config": "22.7.0",
-        "@servicetitan/stylelint-config": "22.7.0",
+        "@servicetitan/eslint-config": "22.8.0",
+        "@servicetitan/stylelint-config": "22.8.0",
         "@types/jest": "~27.4.0",
         "chalk": "~4.1.2",
         "chokidar": "~3.5.3",
@@ -49,7 +49,7 @@
         "execa": "~5.1.1",
         "fork-ts-checker-webpack-plugin": "~7.3.0",
         "glob": "~7.2.0",
-        "html-webpack-plugin": "~5.5.1",
+        "html-webpack-plugin": "~5.5.3",
         "identity-obj-proxy": "~3.0.0",
         "jest": "~27.5.1",
         "jest-circus": "~27.5.1",
@@ -63,7 +63,7 @@
         "moment-locales-webpack-plugin": "~1.2.0",
         "portfinder": "~1.0.28",
         "prettier": "~2.7.1",
-        "sass": "~1.62.1",
+        "sass": "~1.63.4",
         "sass-loader": "~12.6.0",
         "source-map-loader": "~3.0.1",
         "style-loader": "~3.3.3",
@@ -76,7 +76,7 @@
         "username": "~5.1.0",
         "webpack": "~5.78.0",
         "webpack-assets-manifest": "~5.1.0",
-        "webpack-bundle-analyzer": "^4.8.0",
+        "webpack-bundle-analyzer": "^4.9.0",
         "webpack-dev-server": "~3.11.2",
         "webpack-filter-warnings-plugin": "~1.2.1",
         "webpack-merge": "~5.9.0",
@@ -91,5 +91,5 @@
     "cli": {
         "webpack": false
     },
-    "gitHead": "e519bdec4693b7eeea5686ce40e418175b7930c5"
+    "gitHead": "21ecb06c077ea32b3f6babf3b1ac988c0076d7e2"
 }

package/src/cli/utils/__tests__/publish.test.ts

@@ -13,4 +13,7 @@ describe('[Startup] utils:publish:getDefaultBuildVersion', () => {
     test('returns correct version for numeric identifiers', () => {
         expect(getDefaultBuildVersion('xxx', '1234')).toEqual('xxx.1234');
     });
+    test('removes non alphanumeric characters from branch name', () => {
+        expect(getDefaultBuildVersion('xxx/yyy', '1234')).toEqual('xxxyyy.1234');
+    });
 });

package/src/cli/utils/publish.ts

@@ -9,5 +9,5 @@ export const getDefaultBuildVersion = (branchName: string, commitHash: string) =
     if (/^\d+$/.test(ch)) {
         ch = parseInt(ch, 10).toString(10);
     }
-    return `${branchName}.${ch}`;
+    return `${branchName.replace(/\W/g, '')}.${ch}`;
 };

package/template/.vscode/extensions.json

@@ -0,0 +1,18 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
+    // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
+
+    // List of extensions which should be recommended for users of this workspace.
+    "recommendations": [
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode",
+        "stylelint.vscode-stylelint",
+        "editorconfig.editorconfig",
+        "yoavbls.pretty-ts-errors",
+        "streetsidesoftware.code-spell-checker",
+        "eamodio.gitlens",
+        "pomber.git-file-history"
+    ],
+    // List of extensions recommended by VS Code that should not be recommended for users of this workspace.
+    "unwantedRecommendations": []
+}

package/template/bootstrap.js

@@ -1,44 +1,22 @@
-const { execSync, spawnSync } = require('child_process');
+const { spawnSync } = require('child_process');
 
-if (checkNpm()) {
-    run('npm', ['i', '--no-audit', '--legacy-peer-deps']);
-} else {
-    console.log(
-        '\x1b[31m%s\x1b[0m',
-        "Heads up! Your version of npm is outdated. Package installation is using npx to run npm v7, but you can install it directly by running 'npm i npm@7 -g' to make the process faster next time! \n"
-    );
-    run('npx', [
-        '--cache',
-        '"./node_modules/.npx-cache/"',
-        'npm@7',
-        'i',
-        '--no-audit',
-        '--legacy-peer-deps',
-    ]);
-}
-
-function checkNpm() {
-    try {
-        const v = execSync('npm -v', { timeout: 10000 });
+// CI env variable is automatically set by github actions ci
+const installCommand = process.env.CI ? 'ci' : 'i';
 
-        if (v == null) {
-            return false;
-        }
+bootstrap();
 
-        return v.toString().split('.')[0] >= 7;
-    } catch (e) {
-        return false;
-    }
+function bootstrap() {
+    run('npm', [installCommand]);
 }
 
 function run(command, args) {
-    const { error, status } = spawnSync(command, args, { stdio: 'inherit', shell: true });
-
-    if (error || status !== 0) {
-        process.exitCode = status || 1;
-
-        if (error) {
-            throw error;
-        }
+    // eslint-disable-next-line no-console
+    console.log('Run command:', command, args.join(' '));
+    const r = spawnSync(command, args, { stdio: 'inherit', shell: true });
+    if (r && r.error) {
+        throw r.error;
+    }
+    if (r && r.status !== 0) {
+        process.exit(r.status);
     }
 }

package/template/lerna.json

@@ -1,6 +1,5 @@
 {
-  "packages": [
-    "packages/*"
-  ],
-  "version": "0.0.0"
+    "packages": ["packages/*"],
+    "version": "0.0.0",
+    "useWorkspaces": true
 }

package/template/package.json

@@ -3,6 +3,10 @@
     "version": "0.0.0",
     "description": "Multi-package web application template",
     "private": true,
+    "engines": {
+        "node": ">=16",
+        "npm": ">=7"
+    },
     "scripts": {
         "bootstrap": "node bootstrap.js",
         "prestart": "npm run bootstrap",