fix: release

Romanchuk · Romanchuk · commit a986fb50d802 · 2024-08-15T11:56:43.000+07:00
diff --git a/libs/ab/ng-package.json b/libs/ab/ng-package.json
@@ -10,5 +10,6 @@
         "zone.js",
         "@angular/ssr",
         "ngx-cookie"
-    ]
+    ],
+    "dest": "../../dist/libs/ab"
 }
diff --git a/libs/ab/project.json b/libs/ab/project.json
@@ -6,7 +6,7 @@
     "targets": {
         "build": {
             "executor": "@nx/angular:ng-packagr-lite",
-            "outputs": ["{workspaceRoot}/dist/libs/ab"],
+            "outputs": ["{options.outputPath}"],
             "options": {
                 "project": "libs/ab/ng-package.json",
                 "tsConfig": "libs/ab/tsconfig.lib.json"
diff --git a/libs/ab/tsconfig.lib.json b/libs/ab/tsconfig.lib.json
@@ -2,7 +2,7 @@
     "extends": "./tsconfig.json",
     "composite": true,
     "compilerOptions": {
-        "outDir": "../../dist/e2e",
+        "outDir": "../../dist/ab",
         "lib": ["dom", "es2022"]
     }
 }
diff --git a/libs/api/ng-package.json b/libs/api/ng-package.json
@@ -2,5 +2,6 @@
     "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
     "lib": {
         "entryFile": "src/index.ts"
-    }
+    },
+    "dest": "../../dist/libs/api"
 }
diff --git a/libs/api/project.json b/libs/api/project.json
@@ -8,7 +8,7 @@
     "targets": {
         "build": {
             "executor": "@nx/angular:ng-packagr-lite",
-            "outputs": ["{workspaceRoot}/dist/libs/api"],
+            "outputs": ["{options.outputPath}"],
             "options": {
                 "project": "libs/api/ng-package.json",
                 "tsConfig": "libs/api/tsconfig.lib.json"
diff --git a/libs/api/tsconfig.lib.json b/libs/api/tsconfig.lib.json
@@ -1,14 +1,8 @@
 {
-    "composite": true,
     "extends": "./tsconfig.json",
+    "composite": true,
     "compilerOptions": {
-        "outDir": "../../dist/out-tsc",
-        "declaration": true,
-        "declarationMap": true,
-        "inlineSources": true,
-        "types": ["node"],
-        "lib": ["dom", "es2021"]
-    },
-    "exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
-    "include": ["**/*.ts"]
+        "outDir": "../../dist/api",
+        "lib": ["dom", "es2022"]
+    }
 }
diff --git a/libs/auth/ng-package.json b/libs/auth/ng-package.json
@@ -3,5 +3,6 @@
     "lib": {
         "entryFile": "src/index.ts"
     },
-    "allowedNonPeerDependencies": ["ngx-cookie"]
+    "allowedNonPeerDependencies": ["ngx-cookie"],
+    "dest": "../../dist/libs/auth"
 }
diff --git a/libs/auth/project.json b/libs/auth/project.json
@@ -8,7 +8,7 @@
     "targets": {
         "build": {
             "executor": "@nx/angular:ng-packagr-lite",
-            "outputs": ["{workspaceRoot}/dist/libs/auth"],
+            "outputs": ["{options.outputPath}"],
             "options": {
                 "project": "libs/auth/ng-package.json",
                 "tsConfig": "libs/auth/tsconfig.lib.json"
diff --git a/libs/auth/tsconfig.lib.json b/libs/auth/tsconfig.lib.json
@@ -1,13 +1,8 @@
 {
     "extends": "./tsconfig.json",
+    "composite": true,
     "compilerOptions": {
-        "outDir": "../../dist/out-tsc",
-        "declaration": true,
-        "declarationMap": true,
-        "inlineSources": true,
-        "types": [],
-        "lib": ["dom", "es2018"]
-    },
-    "exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
-    "include": ["**/*.ts"]
+        "outDir": "../../dist/auth",
+        "lib": ["dom", "es2022"]
+    }
 }
diff --git a/libs/linters/tsconfig.lib.json b/libs/linters/tsconfig.lib.json
@@ -1,12 +1,8 @@
 {
     "extends": "./tsconfig.json",
+    "composite": true,
     "compilerOptions": {
-        "outDir": "../../dist/out-tsc",
-        "declaration": true,
-        "declarationMap": true,
-        "inlineSources": true,
-        "types": []
-    },
-    "exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
-    "include": ["**/*.ts"]
+        "outDir": "../../dist/linters",
+        "lib": ["dom", "es2022"]
+    }
 }
diff --git a/libs/validation-message/ng-package.json b/libs/validation-message/ng-package.json
@@ -3,5 +3,6 @@
     "lib": {
         "entryFile": "src/index.ts"
     },
-    "allowedNonPeerDependencies": ["angular", "rxjs", "angular-i18next"]
+    "allowedNonPeerDependencies": ["angular", "rxjs", "angular-i18next"],
+    "dest": "../../dist/libs/validation-message"
 }
diff --git a/libs/validation-message/project.json b/libs/validation-message/project.json
@@ -8,7 +8,7 @@
     "targets": {
         "build": {
             "executor": "@nx/angular:ng-packagr-lite",
-            "outputs": ["{workspaceRoot}/dist/libs/validation-message"],
+            "outputs": ["{options.outputPath}"],
             "options": {
                 "project": "libs/validation-message/ng-package.json",
                 "tsConfig": "libs/validation-message/tsconfig.lib.json"
diff --git a/libs/validation-message/tsconfig.lib.json b/libs/validation-message/tsconfig.lib.json
@@ -2,7 +2,7 @@
     "extends": "./tsconfig.json",
     "composite": true,
     "compilerOptions": {
-        "outDir": "../../dist/e2e",
+        "outDir": "../../dist/libs/validation-message",
         "lib": ["dom", "es2022"]
     }
 }
diff --git a/nx.json b/nx.json
@@ -39,7 +39,6 @@
             "inputs": ["production", "^production"]
         },
         "nx-release-publish": {
-            "executor": "@nx/js:release-publish",
             "dependsOn": ["build"],
             "options": {
                 "packageRoot": "{workspaceRoot}/dist/{projectRoot}"
@@ -52,17 +51,12 @@
         "production": ["default"]
     },
     "release": {
-        "git": {
-            "tag": true,
-            "commit": true,
-            "commitMessage": "chore(release): {version}"
-        },
         "projects": ["libs/*"],
         "releaseTagPattern": "release/{version}",
         "changelog": {
-            "workspaceChangelog": true,
-            "projectChangelogs": true,
-            "createRelease": "github"
+            "projectChangelogs": {
+                "createRelease": "github"
+            }
         }
     }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
         "workspace-generator": "nx workspace-generator",
         "dep-graph": "nx dep-graph",
         "help": "nx help",
-        "release": "npm exec -- nx release --verbose"
+        "release": "npm exec -- rimraf dist && npm exec -- tsx ./tools/scripts/release/index.ts --dry-run"
     },
     "private": true,
     "dependencies": {
@@ -85,6 +85,7 @@
         "jest": "~29.7.0",
         "jest-preset-angular": "14.1.0",
         "lint-staged": "~15.2.0",
+        "log-symbols": "6.0.0",
         "ng-packagr": "~18.1.0",
         "ngx-cookie": "~6.0.1",
         "nx": "19.1.1",
diff --git a/tools/scripts/release/git.ts b/tools/scripts/release/git.ts
@@ -0,0 +1,23 @@
+import {execa} from 'execa';
+
+const gitPushWithTagsAndUpstream = async (dryRun: boolean) => {
+    if (dryRun) {
+        return;
+    }
+
+    console.log('\nPushing tags');
+
+    const {stdout} = await execa('git', ['branch', '--show-current']);
+
+    try {
+        await execa('git', ['push', '--follow-tags']);
+    } catch (e) {
+        try {
+            await execa('git', ['push', '--set-upstream', 'origin', stdout, '--follow-tags']);
+        } catch (e) {
+            throw new Error(e);
+        }
+    }
+};
+
+export default gitPushWithTagsAndUpstream;
diff --git a/tools/scripts/release/index.ts b/tools/scripts/release/index.ts
@@ -0,0 +1,60 @@
+import logSymbols from 'log-symbols';
+import {releaseChangelog, releasePublish, releaseVersion} from 'nx/src/command-line/release';
+import * as yargs from 'yargs';
+
+(async () => {
+    const options = await yargs
+        .version(false) // don't use the default meaning of version in yargs
+        .option('version', {
+            description: 'Explicit version specifier to use, if overriding conventional commits',
+            type: 'string',
+        })
+        .option('dry-run', {
+            alias: 'd',
+            description:
+                'Whether or not to perform a dry-run of the release process, defaults to true',
+            type: 'boolean',
+            default: true,
+        })
+        .option('verbose', {
+            description: 'Whether or not to enable verbose logging, defaults to false',
+            type: 'boolean',
+            default: false,
+        })
+        .parseAsync();
+
+    const {workspaceVersion, projectsVersionData} = await releaseVersion({
+        specifier: options.version,
+        // stage package.json updates to be committed later by the changelog command
+        // stageChanges: true,
+        dryRun: options.dryRun,
+        verbose: options.verbose,
+    });
+
+    await releaseChangelog({
+        versionData: projectsVersionData,
+        version: workspaceVersion,
+        dryRun: options.dryRun,
+        verbose: options.verbose,
+    });
+    /*
+    const proc = $({
+        stdio: 'inherit',
+        all: true,
+    })`npm exec -- nx run-many -t build -p @datana-smart/*`;
+
+    await proc;
+
+
+    await gitPushWithTagsAndUpstream(options.dryRun);
+  */
+    const releaseStatus = await releasePublish({
+        dryRun: options.dryRun,
+        verbose: options.verbose,
+    });
+
+    process.exit(releaseStatus);
+})().catch(error => {
+    console.error(`\n${logSymbols.error} ${error.message}`);
+    process.exit(1);
+});

Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,6 @@`
`10`	`10`	`"zone.js",`
`11`	`11`	`"@angular/ssr",`
`12`	`12`	`"ngx-cookie"`
`13`		`- ]`
	`13`	`+ ],`
	`14`	`+ "dest": "../../dist/libs/ab"`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"extends": "./tsconfig.json",`
`3`	`3`	`"composite": true,`
`4`	`4`	`"compilerOptions": {`
`5`		`- "outDir": "../../dist/e2e",`
	`5`	`+ "outDir": "../../dist/ab",`
`6`	`6`	`"lib": ["dom", "es2022"]`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,6 @@`
`2`	`2`	`"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",`
`3`	`3`	`"lib": {`
`4`	`4`	`"entryFile": "src/index.ts"`
`5`		`- }`
	`5`	`+ },`
	`6`	`+ "dest": "../../dist/libs/api"`
`6`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,6 @@`
`3`	`3`	`"lib": {`
`4`	`4`	`"entryFile": "src/index.ts"`
`5`	`5`	`},`
`6`		`- "allowedNonPeerDependencies": ["ngx-cookie"]`
	`6`	`+ "allowedNonPeerDependencies": ["ngx-cookie"],`
	`7`	`+ "dest": "../../dist/libs/auth"`
`7`	`8`	`}`