From d35728f67c8d153ed39200c4d584fa7f4022b70e Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 18 Jul 2023 17:39:00 +0200 Subject: [PATCH 1/2] feat(tools): re-generate react-components.api.md when preparing 1st stable release --- tools/generators/prepare-initial-release/index.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/generators/prepare-initial-release/index.ts b/tools/generators/prepare-initial-release/index.ts index 1ce0425b0b100..3f36a2a85cffd 100644 --- a/tools/generators/prepare-initial-release/index.ts +++ b/tools/generators/prepare-initial-release/index.ts @@ -11,6 +11,7 @@ import { installPackagesTask, readJson, stripIndents, + workspaceRoot, } from '@nrwl/devkit'; import * as tsquery from '@phenomnomnominal/tsquery'; @@ -236,9 +237,10 @@ async function stableRelease(tree: Tree, options: NormalizedSchema) { tree.rename(options.projectConfig.root, newPackage.root); return (_tree: Tree) => { + installPackagesTask(tree, true); generateChangefileTask(tree, newPackage.name, { message: 'feat: release stable' }); generateChangefileTask(tree, suitePackageName, { message: `feat: add ${newPackage.name} to suite` }); - installPackagesTask(tree); + generateApiMarkdownTask(tree, suitePackageName); }; } @@ -280,7 +282,12 @@ async function getProjectThatNeedsToBeUpdated(tree: Tree, options: NormalizedSch function generateChangefileTask(tree: Tree, projectName: string, options: { message: string }) { const cmd = `yarn change --message '${options.message}' --type minor --package ${projectName}`; - return execSync(cmd); + return execSync(cmd, { cwd: workspaceRoot, stdio: 'inherit' }); +} + +function generateApiMarkdownTask(tree: Tree, projectName: string) { + const cmd = `yarn lage generate-api --to ${projectName}`; + return execSync(cmd, { cwd: workspaceRoot, stdio: 'inherit' }); } function assertProject(tree: Tree, options: NormalizedSchema) { From 1ebfccb132146393de0060fcea42e3d630e0b911 Mon Sep 17 00:00:00 2001 From: Martin Hochel Date: Tue, 18 Jul 2023 17:49:23 +0200 Subject: [PATCH 2/2] fixup! feat(tools): re-generate react-components.api.md when preparing 1st stable release --- .../prepare-initial-release/index.spec.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tools/generators/prepare-initial-release/index.spec.ts b/tools/generators/prepare-initial-release/index.spec.ts index abcd4ec7a5cdc..d8c5b1ee08251 100644 --- a/tools/generators/prepare-initial-release/index.spec.ts +++ b/tools/generators/prepare-initial-release/index.spec.ts @@ -8,6 +8,7 @@ import { readJson, updateJson, ProjectGraph, + workspaceRoot, } from '@nrwl/devkit'; import * as devkit from '@nrwl/devkit'; import * as childProcess from 'child_process'; @@ -120,6 +121,10 @@ describe('prepare-initial-release generator', () => { expect(execSyncSpy.mock.calls.flat()).toMatchInlineSnapshot(` Array [ "yarn change --message 'feat: release preview package' --type minor --package @proj/react-one-preview", + Object { + "cwd": "${workspaceRoot}", + "stdio": "inherit", + }, ] `); }); @@ -285,7 +290,20 @@ describe('prepare-initial-release generator', () => { expect(execSyncSpy.mock.calls.flat()).toMatchInlineSnapshot(` Array [ "yarn change --message 'feat: release stable' --type minor --package @proj/react-one", + Object { + "cwd": "${workspaceRoot}", + "stdio": "inherit", + }, "yarn change --message 'feat: add @proj/react-one to suite' --type minor --package @proj/react-components", + Object { + "cwd": "${workspaceRoot}", + "stdio": "inherit", + }, + "yarn lage generate-api --to @proj/react-components", + Object { + "cwd": "${workspaceRoot}", + "stdio": "inherit", + }, ] `); expect(installPackagesTaskSpy).toHaveBeenCalled();