From cad9aa8ddbc3fc93a4e73d290393d56c7c520291 Mon Sep 17 00:00:00 2001 From: Don McCurdy Date: Mon, 7 Oct 2024 17:43:21 -0400 Subject: [PATCH 01/16] chore(dev): Add postversion script --- package.json | 9 ++++++--- scripts/postversion-commit.js | 30 ++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 scripts/postversion-commit.js diff --git a/package.json b/package.json index 6b3207e..63fa0ce 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,12 @@ "lint": "lerna run lint", "test": "lerna run test", "clean": "rimraf --glob 'packages/*/dist/*' 'sandbox/*'", - "preversion": "yarn lint", - "version": "yarn clean && yarn build", - "postversion": "git push && git push --tags" + "postversion": "yarn postversion:check && yarn postversion:commit && yarn postversion:push", + "postversion:check": "yarn lint && yarn test", + "postversion:commit": "node scripts/postversion-commit.js", + "postversion:push": "git push && git push --tags", + "prepublish": "yarn lint && yarn test", + "prepack": "yarn clean && yarn build" }, "devDependencies": { "@types/meow": "^6.0.0", diff --git a/scripts/postversion-commit.js b/scripts/postversion-commit.js new file mode 100644 index 0000000..865a623 --- /dev/null +++ b/scripts/postversion-commit.js @@ -0,0 +1,30 @@ +import { execSync } from 'node:child_process'; +import { readFile } from 'node:fs/promises'; +import { resolve } from 'node:path'; +import { valid } from 'semver'; + +/** + * Utility for committing and tagging a release commit in + * git, called as part of the `yarn postversion` script. + */ + +// Read and validate pkg.version. +const pkgJSON = await readFile( + resolve('./packages/create-react/package.json'), + 'utf-8', +); +const version = 'v' + JSON.parse(pkgJSON).version; +if (!valid(version)) { + throw new Error(`Invalid version, "${version}"`); +} + +// Check out a branch if cutting a version from 'main'. +const branch = execSync('git rev-parse --abbrev-ref HEAD').toString().trim(); +if (branch === 'main') { + execSync(`git checkout -b 'release/${version}'`); +} + +// Commit and tag. +execSync('git add -u'); +execSync(`git commit -m 'chore(release): ${version}'`); +execSync(`git tag -a ${version} -m ${version}`); From 96addd15bebfff9d8de9d90267e88fe48babd8e6 Mon Sep 17 00:00:00 2001 From: Don McCurdy Date: Mon, 7 Oct 2024 17:43:57 -0400 Subject: [PATCH 02/16] v0.1.2-alpha.1 --- lerna.json | 2 +- packages/create-angular/package.json | 4 ++-- packages/create-common/package.json | 2 +- packages/create-react/package.json | 4 ++-- packages/create-vue/package.json | 4 ++-- yarn.lock | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lerna.json b/lerna.json index b3fc778..6687e65 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "0.1.2-alpha.0", + "version": "0.1.2-alpha.1", "packages": ["packages/*"], "npmClient": "yarn" } diff --git a/packages/create-angular/package.json b/packages/create-angular/package.json index a4b6522..297b782 100644 --- a/packages/create-angular/package.json +++ b/packages/create-angular/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.0", + "version": "0.1.2-alpha.1", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -25,7 +25,7 @@ "@angular/router": "^18.2.5", "@auth0/auth0-angular": "^2.2.3", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.0", + "@carto/create-common": "^0.1.2-alpha.1", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/packages/create-common/package.json b/packages/create-common/package.json index 6af577b..5845ba9 100644 --- a/packages/create-common/package.json +++ b/packages/create-common/package.json @@ -2,7 +2,7 @@ "name": "@carto/create-common", "packageManager": "yarn@4.2.2", "author": "Don McCurdy ", - "version": "0.1.2-alpha.0", + "version": "0.1.2-alpha.1", "license": "MIT", "type": "module", "sideEffects": false, diff --git a/packages/create-react/package.json b/packages/create-react/package.json index 3d9f667..1e3f0b1 100644 --- a/packages/create-react/package.json +++ b/packages/create-react/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.0", + "version": "0.1.2-alpha.1", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -17,7 +17,7 @@ "dependencies": { "@auth0/auth0-react": "^2.2.4", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.0", + "@carto/create-common": "^0.1.2-alpha.1", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/packages/create-vue/package.json b/packages/create-vue/package.json index fc4aa16..7ea7823 100644 --- a/packages/create-vue/package.json +++ b/packages/create-vue/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.0", + "version": "0.1.2-alpha.1", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -16,7 +16,7 @@ "dependencies": { "@auth0/auth0-vue": "^2.3.3", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.0", + "@carto/create-common": "^0.1.2-alpha.1", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/yarn.lock b/yarn.lock index 09ef7db..597d004 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2442,7 +2442,7 @@ __metadata: "@angular/router": "npm:^18.2.5" "@auth0/auth0-angular": "npm:^2.2.3" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.0" + "@carto/create-common": "npm:^0.1.2-alpha.1" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" @@ -2464,7 +2464,7 @@ __metadata: languageName: unknown linkType: soft -"@carto/create-common@npm:^0.1.2-alpha.0, @carto/create-common@workspace:packages/create-common": +"@carto/create-common@npm:^0.1.2-alpha.1, @carto/create-common@workspace:packages/create-common": version: 0.0.0-use.local resolution: "@carto/create-common@workspace:packages/create-common" dependencies: @@ -2484,7 +2484,7 @@ __metadata: dependencies: "@auth0/auth0-react": "npm:^2.2.4" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.0" + "@carto/create-common": "npm:^0.1.2-alpha.1" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" @@ -2524,7 +2524,7 @@ __metadata: dependencies: "@auth0/auth0-vue": "npm:^2.3.3" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.0" + "@carto/create-common": "npm:^0.1.2-alpha.1" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" From 4ae520071fa681fc82df51e7727732bd73aae00b Mon Sep 17 00:00:00 2001 From: Don McCurdy Date: Mon, 7 Oct 2024 17:55:54 -0400 Subject: [PATCH 03/16] let lerna handle the commit --- lerna.json | 7 ++++++- package.json | 3 +-- scripts/postversion-commit.js | 30 ------------------------------ 3 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 scripts/postversion-commit.js diff --git a/lerna.json b/lerna.json index 6687e65..deeecbd 100644 --- a/lerna.json +++ b/lerna.json @@ -2,5 +2,10 @@ "$schema": "node_modules/lerna/schemas/lerna-schema.json", "version": "0.1.2-alpha.1", "packages": ["packages/*"], - "npmClient": "yarn" + "npmClient": "yarn", + "command": { + "version": { + "message": "chore(release): publish %s" + } + } } diff --git a/package.json b/package.json index 63fa0ce..8dc6ae1 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,8 @@ "lint": "lerna run lint", "test": "lerna run test", "clean": "rimraf --glob 'packages/*/dist/*' 'sandbox/*'", - "postversion": "yarn postversion:check && yarn postversion:commit && yarn postversion:push", + "postversion": "yarn postversion:check && yarn postversion:push", "postversion:check": "yarn lint && yarn test", - "postversion:commit": "node scripts/postversion-commit.js", "postversion:push": "git push && git push --tags", "prepublish": "yarn lint && yarn test", "prepack": "yarn clean && yarn build" diff --git a/scripts/postversion-commit.js b/scripts/postversion-commit.js deleted file mode 100644 index 865a623..0000000 --- a/scripts/postversion-commit.js +++ /dev/null @@ -1,30 +0,0 @@ -import { execSync } from 'node:child_process'; -import { readFile } from 'node:fs/promises'; -import { resolve } from 'node:path'; -import { valid } from 'semver'; - -/** - * Utility for committing and tagging a release commit in - * git, called as part of the `yarn postversion` script. - */ - -// Read and validate pkg.version. -const pkgJSON = await readFile( - resolve('./packages/create-react/package.json'), - 'utf-8', -); -const version = 'v' + JSON.parse(pkgJSON).version; -if (!valid(version)) { - throw new Error(`Invalid version, "${version}"`); -} - -// Check out a branch if cutting a version from 'main'. -const branch = execSync('git rev-parse --abbrev-ref HEAD').toString().trim(); -if (branch === 'main') { - execSync(`git checkout -b 'release/${version}'`); -} - -// Commit and tag. -execSync('git add -u'); -execSync(`git commit -m 'chore(release): ${version}'`); -execSync(`git tag -a ${version} -m ${version}`); From d775c2dca2ac7f72ba3f3468097d1963b3aa5259 Mon Sep 17 00:00:00 2001 From: Don McCurdy Date: Mon, 7 Oct 2024 17:56:20 -0400 Subject: [PATCH 04/16] chore(release): publish v0.1.2-alpha.2 --- lerna.json | 2 +- packages/create-angular/package.json | 4 ++-- packages/create-common/package.json | 2 +- packages/create-react/package.json | 4 ++-- packages/create-vue/package.json | 4 ++-- yarn.lock | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lerna.json b/lerna.json index deeecbd..6953964 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "0.1.2-alpha.1", + "version": "0.1.2-alpha.2", "packages": ["packages/*"], "npmClient": "yarn", "command": { diff --git a/packages/create-angular/package.json b/packages/create-angular/package.json index 297b782..e0f692f 100644 --- a/packages/create-angular/package.json +++ b/packages/create-angular/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.1", + "version": "0.1.2-alpha.2", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -25,7 +25,7 @@ "@angular/router": "^18.2.5", "@auth0/auth0-angular": "^2.2.3", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.1", + "@carto/create-common": "^0.1.2-alpha.2", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/packages/create-common/package.json b/packages/create-common/package.json index 5845ba9..dfdacc9 100644 --- a/packages/create-common/package.json +++ b/packages/create-common/package.json @@ -2,7 +2,7 @@ "name": "@carto/create-common", "packageManager": "yarn@4.2.2", "author": "Don McCurdy ", - "version": "0.1.2-alpha.1", + "version": "0.1.2-alpha.2", "license": "MIT", "type": "module", "sideEffects": false, diff --git a/packages/create-react/package.json b/packages/create-react/package.json index 1e3f0b1..43f97a1 100644 --- a/packages/create-react/package.json +++ b/packages/create-react/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.1", + "version": "0.1.2-alpha.2", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -17,7 +17,7 @@ "dependencies": { "@auth0/auth0-react": "^2.2.4", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.1", + "@carto/create-common": "^0.1.2-alpha.2", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/packages/create-vue/package.json b/packages/create-vue/package.json index 7ea7823..8dd6293 100644 --- a/packages/create-vue/package.json +++ b/packages/create-vue/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.1", + "version": "0.1.2-alpha.2", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -16,7 +16,7 @@ "dependencies": { "@auth0/auth0-vue": "^2.3.3", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.1", + "@carto/create-common": "^0.1.2-alpha.2", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/yarn.lock b/yarn.lock index 597d004..a430a6b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2442,7 +2442,7 @@ __metadata: "@angular/router": "npm:^18.2.5" "@auth0/auth0-angular": "npm:^2.2.3" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.1" + "@carto/create-common": "npm:^0.1.2-alpha.2" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" @@ -2464,7 +2464,7 @@ __metadata: languageName: unknown linkType: soft -"@carto/create-common@npm:^0.1.2-alpha.1, @carto/create-common@workspace:packages/create-common": +"@carto/create-common@npm:^0.1.2-alpha.2, @carto/create-common@workspace:packages/create-common": version: 0.0.0-use.local resolution: "@carto/create-common@workspace:packages/create-common" dependencies: @@ -2484,7 +2484,7 @@ __metadata: dependencies: "@auth0/auth0-react": "npm:^2.2.4" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.1" + "@carto/create-common": "npm:^0.1.2-alpha.2" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" @@ -2524,7 +2524,7 @@ __metadata: dependencies: "@auth0/auth0-vue": "npm:^2.3.3" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.1" + "@carto/create-common": "npm:^0.1.2-alpha.2" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" From 5e66029cb92a2782c81d84917d3b21641e307eb7 Mon Sep 17 00:00:00 2001 From: Don McCurdy Date: Mon, 7 Oct 2024 17:57:06 -0400 Subject: [PATCH 05/16] simplify commit message --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 6953964..6e91e8c 100644 --- a/lerna.json +++ b/lerna.json @@ -5,7 +5,7 @@ "npmClient": "yarn", "command": { "version": { - "message": "chore(release): publish %s" + "message": "chore(release): %s" } } } From d08248e21b7c82a4d53f0ba58534d8e2a073e049 Mon Sep 17 00:00:00 2001 From: Don McCurdy Date: Mon, 7 Oct 2024 18:02:05 -0400 Subject: [PATCH 06/16] fetch tags --- .github/workflows/release.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8cf6535..778d39c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,8 +17,12 @@ jobs: runs-on: ubuntu-22.04 steps: + # Lerna needs Git tags. https://stackoverflow.com/a/76181083 - name: Checkout uses: actions/checkout@v4 + with: + fetch-depth: 10 + fetch-tags: true # Read version from 'package.json'; git tags are lost on a merged PR. - name: Read package version From ae567c5be6d2fb05d27d6c69ae2f092a6c08f378 Mon Sep 17 00:00:00 2001 From: Don McCurdy Date: Mon, 7 Oct 2024 18:02:15 -0400 Subject: [PATCH 07/16] chore(release): v0.1.2-alpha.3 --- lerna.json | 2 +- packages/create-angular/package.json | 4 ++-- packages/create-common/package.json | 2 +- packages/create-react/package.json | 4 ++-- packages/create-vue/package.json | 4 ++-- yarn.lock | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lerna.json b/lerna.json index 6e91e8c..362cbd2 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "0.1.2-alpha.2", + "version": "0.1.2-alpha.3", "packages": ["packages/*"], "npmClient": "yarn", "command": { diff --git a/packages/create-angular/package.json b/packages/create-angular/package.json index e0f692f..548b6ef 100644 --- a/packages/create-angular/package.json +++ b/packages/create-angular/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.2", + "version": "0.1.2-alpha.3", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -25,7 +25,7 @@ "@angular/router": "^18.2.5", "@auth0/auth0-angular": "^2.2.3", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.2", + "@carto/create-common": "^0.1.2-alpha.3", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/packages/create-common/package.json b/packages/create-common/package.json index dfdacc9..bce3ee4 100644 --- a/packages/create-common/package.json +++ b/packages/create-common/package.json @@ -2,7 +2,7 @@ "name": "@carto/create-common", "packageManager": "yarn@4.2.2", "author": "Don McCurdy ", - "version": "0.1.2-alpha.2", + "version": "0.1.2-alpha.3", "license": "MIT", "type": "module", "sideEffects": false, diff --git a/packages/create-react/package.json b/packages/create-react/package.json index 43f97a1..4883d87 100644 --- a/packages/create-react/package.json +++ b/packages/create-react/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.2", + "version": "0.1.2-alpha.3", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -17,7 +17,7 @@ "dependencies": { "@auth0/auth0-react": "^2.2.4", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.2", + "@carto/create-common": "^0.1.2-alpha.3", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/packages/create-vue/package.json b/packages/create-vue/package.json index 8dd6293..e8d9e2e 100644 --- a/packages/create-vue/package.json +++ b/packages/create-vue/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.2", + "version": "0.1.2-alpha.3", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -16,7 +16,7 @@ "dependencies": { "@auth0/auth0-vue": "^2.3.3", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.2", + "@carto/create-common": "^0.1.2-alpha.3", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/yarn.lock b/yarn.lock index a430a6b..9dff8d1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2442,7 +2442,7 @@ __metadata: "@angular/router": "npm:^18.2.5" "@auth0/auth0-angular": "npm:^2.2.3" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.2" + "@carto/create-common": "npm:^0.1.2-alpha.3" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" @@ -2464,7 +2464,7 @@ __metadata: languageName: unknown linkType: soft -"@carto/create-common@npm:^0.1.2-alpha.2, @carto/create-common@workspace:packages/create-common": +"@carto/create-common@npm:^0.1.2-alpha.3, @carto/create-common@workspace:packages/create-common": version: 0.0.0-use.local resolution: "@carto/create-common@workspace:packages/create-common" dependencies: @@ -2484,7 +2484,7 @@ __metadata: dependencies: "@auth0/auth0-react": "npm:^2.2.4" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.2" + "@carto/create-common": "npm:^0.1.2-alpha.3" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" @@ -2524,7 +2524,7 @@ __metadata: dependencies: "@auth0/auth0-vue": "npm:^2.3.3" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.2" + "@carto/create-common": "npm:^0.1.2-alpha.3" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" From 4d1abf083bea6f3852331f1683139ed73eae11cb Mon Sep 17 00:00:00 2001 From: Don McCurdy Date: Mon, 7 Oct 2024 18:09:07 -0400 Subject: [PATCH 08/16] attempt fix npm auth issue --- .github/workflows/release.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 778d39c..981ebcf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,12 +65,23 @@ jobs: - name: Configure yarn to publish packages env: NPM_AUTH_TOKEN: ${{ secrets.NPM_CARTODB_AUTH_TOKEN }} - # Ignore changes to .yarnrc.yml, see https://github.com/lerna/lerna/issues/2329 run: | + # Ignore changes to .yarnrc.yml, see https://github.com/lerna/lerna/issues/2329 git update-index --assume-unchanged .yarnrc.yml + + # Update .yarnrc.yml yarn config set npmPublishRegistry "https://registry.npmjs.org/" yarn config set npmAuthToken "${NPM_AUTH_TOKEN}" + # Create .npmrc + # TODO: Why do both .npmrc and .yarnrc.yml need updates? + echo "@carto:registry=https://registry.npmjs.org/" > .npmrc + echo "//registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}" >> .npmrc + + # Check configuration + npm config get registry + npm view @carto/create-common versions + - name: Publish env: DIST_TAG: ${{ steps.dist-tag.outputs.result }} From 801f50afe6dbbd533f1c28dc6e531f520de39a43 Mon Sep 17 00:00:00 2001 From: Don McCurdy Date: Mon, 7 Oct 2024 18:09:27 -0400 Subject: [PATCH 09/16] chore(release): v0.1.2-alpha.4 --- lerna.json | 2 +- packages/create-angular/package.json | 4 ++-- packages/create-common/package.json | 2 +- packages/create-react/package.json | 4 ++-- packages/create-vue/package.json | 4 ++-- yarn.lock | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lerna.json b/lerna.json index 362cbd2..6f1c3d2 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "0.1.2-alpha.3", + "version": "0.1.2-alpha.4", "packages": ["packages/*"], "npmClient": "yarn", "command": { diff --git a/packages/create-angular/package.json b/packages/create-angular/package.json index 548b6ef..9e96f18 100644 --- a/packages/create-angular/package.json +++ b/packages/create-angular/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.3", + "version": "0.1.2-alpha.4", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -25,7 +25,7 @@ "@angular/router": "^18.2.5", "@auth0/auth0-angular": "^2.2.3", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.3", + "@carto/create-common": "^0.1.2-alpha.4", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/packages/create-common/package.json b/packages/create-common/package.json index bce3ee4..4b720c0 100644 --- a/packages/create-common/package.json +++ b/packages/create-common/package.json @@ -2,7 +2,7 @@ "name": "@carto/create-common", "packageManager": "yarn@4.2.2", "author": "Don McCurdy ", - "version": "0.1.2-alpha.3", + "version": "0.1.2-alpha.4", "license": "MIT", "type": "module", "sideEffects": false, diff --git a/packages/create-react/package.json b/packages/create-react/package.json index 4883d87..b995789 100644 --- a/packages/create-react/package.json +++ b/packages/create-react/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.3", + "version": "0.1.2-alpha.4", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -17,7 +17,7 @@ "dependencies": { "@auth0/auth0-react": "^2.2.4", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.3", + "@carto/create-common": "^0.1.2-alpha.4", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/packages/create-vue/package.json b/packages/create-vue/package.json index e8d9e2e..b659344 100644 --- a/packages/create-vue/package.json +++ b/packages/create-vue/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.3", + "version": "0.1.2-alpha.4", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -16,7 +16,7 @@ "dependencies": { "@auth0/auth0-vue": "^2.3.3", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.3", + "@carto/create-common": "^0.1.2-alpha.4", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/yarn.lock b/yarn.lock index 9dff8d1..a12fee4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2442,7 +2442,7 @@ __metadata: "@angular/router": "npm:^18.2.5" "@auth0/auth0-angular": "npm:^2.2.3" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.3" + "@carto/create-common": "npm:^0.1.2-alpha.4" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" @@ -2464,7 +2464,7 @@ __metadata: languageName: unknown linkType: soft -"@carto/create-common@npm:^0.1.2-alpha.3, @carto/create-common@workspace:packages/create-common": +"@carto/create-common@npm:^0.1.2-alpha.4, @carto/create-common@workspace:packages/create-common": version: 0.0.0-use.local resolution: "@carto/create-common@workspace:packages/create-common" dependencies: @@ -2484,7 +2484,7 @@ __metadata: dependencies: "@auth0/auth0-react": "npm:^2.2.4" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.3" + "@carto/create-common": "npm:^0.1.2-alpha.4" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" @@ -2524,7 +2524,7 @@ __metadata: dependencies: "@auth0/auth0-vue": "npm:^2.3.3" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.3" + "@carto/create-common": "npm:^0.1.2-alpha.4" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" From 0ea0df5287bdc4fac85eed4770e1ef94b813860d Mon Sep 17 00:00:00 2001 From: Don McCurdy Date: Mon, 7 Oct 2024 18:15:02 -0400 Subject: [PATCH 10/16] Update contributing guide --- CONTRIBUTING.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 10cf687..a93c9c1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,9 +33,12 @@ During local development, CSS styles are loaded from a shared `style.css` in the All packages are published together. To create a standard release: -1. Update changelog +1. Update changelog and commit changes -2. Create a new version: +2. Create a new version: `yarn lerna version [ major | minor | patch | prerelease ]` -- Release: `yarn lerna publish [ patch | minor | major ] --force-publish "*"` -- Prerelease: `yarn lerna publish prerelease --dist-tag alpha --force-publish "*"` +3. Push to GitHub: `yarn postversion` + +4. Publish + - If working on `main`, the previous step will automatically create and push a branch. Open a pull request, get any required approvals, and merge. Merged pull requests with commit messages beginning `chore(release)` will trigger a release automatically. + - If working on a branch, a commit for the release will be pushed to the branch. You'll then need to [manually run a workflow](https://docs.github.com/en/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/manually-running-a-workflow), “Release”, selecting the target branch in the menu. From 8c6c8cbe547133bb21a77216572a824d8ba7dbaa Mon Sep 17 00:00:00 2001 From: Don McCurdy Date: Mon, 7 Oct 2024 18:15:15 -0400 Subject: [PATCH 11/16] chore(release): v0.1.2-alpha.5 --- lerna.json | 2 +- packages/create-angular/package.json | 4 ++-- packages/create-common/package.json | 2 +- packages/create-react/package.json | 4 ++-- packages/create-vue/package.json | 4 ++-- yarn.lock | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lerna.json b/lerna.json index 6f1c3d2..88e07c0 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "0.1.2-alpha.4", + "version": "0.1.2-alpha.5", "packages": ["packages/*"], "npmClient": "yarn", "command": { diff --git a/packages/create-angular/package.json b/packages/create-angular/package.json index 9e96f18..e956f21 100644 --- a/packages/create-angular/package.json +++ b/packages/create-angular/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.4", + "version": "0.1.2-alpha.5", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -25,7 +25,7 @@ "@angular/router": "^18.2.5", "@auth0/auth0-angular": "^2.2.3", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.4", + "@carto/create-common": "^0.1.2-alpha.5", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/packages/create-common/package.json b/packages/create-common/package.json index 4b720c0..805b09f 100644 --- a/packages/create-common/package.json +++ b/packages/create-common/package.json @@ -2,7 +2,7 @@ "name": "@carto/create-common", "packageManager": "yarn@4.2.2", "author": "Don McCurdy ", - "version": "0.1.2-alpha.4", + "version": "0.1.2-alpha.5", "license": "MIT", "type": "module", "sideEffects": false, diff --git a/packages/create-react/package.json b/packages/create-react/package.json index b995789..3a6e84d 100644 --- a/packages/create-react/package.json +++ b/packages/create-react/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.4", + "version": "0.1.2-alpha.5", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -17,7 +17,7 @@ "dependencies": { "@auth0/auth0-react": "^2.2.4", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.4", + "@carto/create-common": "^0.1.2-alpha.5", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/packages/create-vue/package.json b/packages/create-vue/package.json index b659344..c18769f 100644 --- a/packages/create-vue/package.json +++ b/packages/create-vue/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.4", + "version": "0.1.2-alpha.5", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -16,7 +16,7 @@ "dependencies": { "@auth0/auth0-vue": "^2.3.3", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.4", + "@carto/create-common": "^0.1.2-alpha.5", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/yarn.lock b/yarn.lock index a12fee4..195032a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2442,7 +2442,7 @@ __metadata: "@angular/router": "npm:^18.2.5" "@auth0/auth0-angular": "npm:^2.2.3" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.4" + "@carto/create-common": "npm:^0.1.2-alpha.5" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" @@ -2464,7 +2464,7 @@ __metadata: languageName: unknown linkType: soft -"@carto/create-common@npm:^0.1.2-alpha.4, @carto/create-common@workspace:packages/create-common": +"@carto/create-common@npm:^0.1.2-alpha.5, @carto/create-common@workspace:packages/create-common": version: 0.0.0-use.local resolution: "@carto/create-common@workspace:packages/create-common" dependencies: @@ -2484,7 +2484,7 @@ __metadata: dependencies: "@auth0/auth0-react": "npm:^2.2.4" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.4" + "@carto/create-common": "npm:^0.1.2-alpha.5" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" @@ -2524,7 +2524,7 @@ __metadata: dependencies: "@auth0/auth0-vue": "npm:^2.3.3" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.4" + "@carto/create-common": "npm:^0.1.2-alpha.5" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" From 698cb159bc32c8589001458aab43086b4bc67b89 Mon Sep 17 00:00:00 2001 From: Don McCurdy Date: Mon, 7 Oct 2024 18:16:56 -0400 Subject: [PATCH 12/16] set --no-push on 'lerna version' --- lerna.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 88e07c0..3af1ae0 100644 --- a/lerna.json +++ b/lerna.json @@ -5,7 +5,8 @@ "npmClient": "yarn", "command": { "version": { - "message": "chore(release): %s" + "message": "chore(release): %s", + "push": false } } } From bc6d26c0b9469e599927e1f9b3e11fd7ae3ec40a Mon Sep 17 00:00:00 2001 From: Don McCurdy Date: Mon, 7 Oct 2024 18:17:05 -0400 Subject: [PATCH 13/16] chore(release): v0.1.2-alpha.6 --- lerna.json | 2 +- packages/create-angular/package.json | 4 ++-- packages/create-common/package.json | 2 +- packages/create-react/package.json | 4 ++-- packages/create-vue/package.json | 4 ++-- yarn.lock | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lerna.json b/lerna.json index 3af1ae0..d89de44 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "0.1.2-alpha.5", + "version": "0.1.2-alpha.6", "packages": ["packages/*"], "npmClient": "yarn", "command": { diff --git a/packages/create-angular/package.json b/packages/create-angular/package.json index e956f21..471c30c 100644 --- a/packages/create-angular/package.json +++ b/packages/create-angular/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.5", + "version": "0.1.2-alpha.6", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -25,7 +25,7 @@ "@angular/router": "^18.2.5", "@auth0/auth0-angular": "^2.2.3", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.5", + "@carto/create-common": "^0.1.2-alpha.6", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/packages/create-common/package.json b/packages/create-common/package.json index 805b09f..834cc5c 100644 --- a/packages/create-common/package.json +++ b/packages/create-common/package.json @@ -2,7 +2,7 @@ "name": "@carto/create-common", "packageManager": "yarn@4.2.2", "author": "Don McCurdy ", - "version": "0.1.2-alpha.5", + "version": "0.1.2-alpha.6", "license": "MIT", "type": "module", "sideEffects": false, diff --git a/packages/create-react/package.json b/packages/create-react/package.json index 3a6e84d..6112021 100644 --- a/packages/create-react/package.json +++ b/packages/create-react/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.5", + "version": "0.1.2-alpha.6", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -17,7 +17,7 @@ "dependencies": { "@auth0/auth0-react": "^2.2.4", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.5", + "@carto/create-common": "^0.1.2-alpha.6", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/packages/create-vue/package.json b/packages/create-vue/package.json index c18769f..ef90fc8 100644 --- a/packages/create-vue/package.json +++ b/packages/create-vue/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.5", + "version": "0.1.2-alpha.6", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -16,7 +16,7 @@ "dependencies": { "@auth0/auth0-vue": "^2.3.3", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.5", + "@carto/create-common": "^0.1.2-alpha.6", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/yarn.lock b/yarn.lock index 195032a..59efbd7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2442,7 +2442,7 @@ __metadata: "@angular/router": "npm:^18.2.5" "@auth0/auth0-angular": "npm:^2.2.3" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.5" + "@carto/create-common": "npm:^0.1.2-alpha.6" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" @@ -2464,7 +2464,7 @@ __metadata: languageName: unknown linkType: soft -"@carto/create-common@npm:^0.1.2-alpha.5, @carto/create-common@workspace:packages/create-common": +"@carto/create-common@npm:^0.1.2-alpha.6, @carto/create-common@workspace:packages/create-common": version: 0.0.0-use.local resolution: "@carto/create-common@workspace:packages/create-common" dependencies: @@ -2484,7 +2484,7 @@ __metadata: dependencies: "@auth0/auth0-react": "npm:^2.2.4" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.5" + "@carto/create-common": "npm:^0.1.2-alpha.6" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" @@ -2524,7 +2524,7 @@ __metadata: dependencies: "@auth0/auth0-vue": "npm:^2.3.3" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.5" + "@carto/create-common": "npm:^0.1.2-alpha.6" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" From 6ae495ccf6cd82a099f0c7491c4914bdd74e7ed2 Mon Sep 17 00:00:00 2001 From: Don McCurdy Date: Mon, 7 Oct 2024 18:22:52 -0400 Subject: [PATCH 14/16] handle commit and push manually --- lerna.json | 3 ++- package.json | 3 ++- scripts/postversion-commit.js | 30 ++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 scripts/postversion-commit.js diff --git a/lerna.json b/lerna.json index d89de44..9530079 100644 --- a/lerna.json +++ b/lerna.json @@ -6,7 +6,8 @@ "command": { "version": { "message": "chore(release): %s", - "push": false + "push": false, + "gitTagVersion": false } } } diff --git a/package.json b/package.json index 8dc6ae1..63fa0ce 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,9 @@ "lint": "lerna run lint", "test": "lerna run test", "clean": "rimraf --glob 'packages/*/dist/*' 'sandbox/*'", - "postversion": "yarn postversion:check && yarn postversion:push", + "postversion": "yarn postversion:check && yarn postversion:commit && yarn postversion:push", "postversion:check": "yarn lint && yarn test", + "postversion:commit": "node scripts/postversion-commit.js", "postversion:push": "git push && git push --tags", "prepublish": "yarn lint && yarn test", "prepack": "yarn clean && yarn build" diff --git a/scripts/postversion-commit.js b/scripts/postversion-commit.js new file mode 100644 index 0000000..865a623 --- /dev/null +++ b/scripts/postversion-commit.js @@ -0,0 +1,30 @@ +import { execSync } from 'node:child_process'; +import { readFile } from 'node:fs/promises'; +import { resolve } from 'node:path'; +import { valid } from 'semver'; + +/** + * Utility for committing and tagging a release commit in + * git, called as part of the `yarn postversion` script. + */ + +// Read and validate pkg.version. +const pkgJSON = await readFile( + resolve('./packages/create-react/package.json'), + 'utf-8', +); +const version = 'v' + JSON.parse(pkgJSON).version; +if (!valid(version)) { + throw new Error(`Invalid version, "${version}"`); +} + +// Check out a branch if cutting a version from 'main'. +const branch = execSync('git rev-parse --abbrev-ref HEAD').toString().trim(); +if (branch === 'main') { + execSync(`git checkout -b 'release/${version}'`); +} + +// Commit and tag. +execSync('git add -u'); +execSync(`git commit -m 'chore(release): ${version}'`); +execSync(`git tag -a ${version} -m ${version}`); From 0f7797df5480792c747828818e1df6613c056aa9 Mon Sep 17 00:00:00 2001 From: Don McCurdy Date: Mon, 7 Oct 2024 18:23:34 -0400 Subject: [PATCH 15/16] chore(release): v0.1.2-alpha.7 --- lerna.json | 8 +++++--- packages/create-angular/package.json | 4 ++-- packages/create-common/package.json | 2 +- packages/create-react/package.json | 4 ++-- packages/create-vue/package.json | 4 ++-- yarn.lock | 8 ++++---- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/lerna.json b/lerna.json index 9530079..e98a63e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,9 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "0.1.2-alpha.6", - "packages": ["packages/*"], + "version": "0.1.2-alpha.7", + "packages": [ + "packages/*" + ], "npmClient": "yarn", "command": { "version": { @@ -10,4 +12,4 @@ "gitTagVersion": false } } -} +} \ No newline at end of file diff --git a/packages/create-angular/package.json b/packages/create-angular/package.json index 471c30c..33173f9 100644 --- a/packages/create-angular/package.json +++ b/packages/create-angular/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.6", + "version": "0.1.2-alpha.7", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -25,7 +25,7 @@ "@angular/router": "^18.2.5", "@auth0/auth0-angular": "^2.2.3", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.6", + "@carto/create-common": "^0.1.2-alpha.7", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/packages/create-common/package.json b/packages/create-common/package.json index 834cc5c..f65386f 100644 --- a/packages/create-common/package.json +++ b/packages/create-common/package.json @@ -2,7 +2,7 @@ "name": "@carto/create-common", "packageManager": "yarn@4.2.2", "author": "Don McCurdy ", - "version": "0.1.2-alpha.6", + "version": "0.1.2-alpha.7", "license": "MIT", "type": "module", "sideEffects": false, diff --git a/packages/create-react/package.json b/packages/create-react/package.json index 6112021..de10e10 100644 --- a/packages/create-react/package.json +++ b/packages/create-react/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.6", + "version": "0.1.2-alpha.7", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -17,7 +17,7 @@ "dependencies": { "@auth0/auth0-react": "^2.2.4", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.6", + "@carto/create-common": "^0.1.2-alpha.7", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/packages/create-vue/package.json b/packages/create-vue/package.json index ef90fc8..d92875a 100644 --- a/packages/create-vue/package.json +++ b/packages/create-vue/package.json @@ -4,7 +4,7 @@ "repository": "github:CartoDB/carto-app-templates", "author": "Don McCurdy ", "license": "MIT", - "version": "0.1.2-alpha.6", + "version": "0.1.2-alpha.7", "type": "module", "bin": "./scripts/create.js", "scripts": { @@ -16,7 +16,7 @@ "dependencies": { "@auth0/auth0-vue": "^2.3.3", "@carto/api-client": "^0.2.1", - "@carto/create-common": "^0.1.2-alpha.6", + "@carto/create-common": "^0.1.2-alpha.7", "@deck.gl/aggregation-layers": "^9.0.24", "@deck.gl/carto": "^9.0.24", "@deck.gl/core": "^9.0.24", diff --git a/yarn.lock b/yarn.lock index 59efbd7..fb810a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2442,7 +2442,7 @@ __metadata: "@angular/router": "npm:^18.2.5" "@auth0/auth0-angular": "npm:^2.2.3" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.6" + "@carto/create-common": "npm:^0.1.2-alpha.7" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" @@ -2464,7 +2464,7 @@ __metadata: languageName: unknown linkType: soft -"@carto/create-common@npm:^0.1.2-alpha.6, @carto/create-common@workspace:packages/create-common": +"@carto/create-common@npm:^0.1.2-alpha.7, @carto/create-common@workspace:packages/create-common": version: 0.0.0-use.local resolution: "@carto/create-common@workspace:packages/create-common" dependencies: @@ -2484,7 +2484,7 @@ __metadata: dependencies: "@auth0/auth0-react": "npm:^2.2.4" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.6" + "@carto/create-common": "npm:^0.1.2-alpha.7" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" @@ -2524,7 +2524,7 @@ __metadata: dependencies: "@auth0/auth0-vue": "npm:^2.3.3" "@carto/api-client": "npm:^0.2.1" - "@carto/create-common": "npm:^0.1.2-alpha.6" + "@carto/create-common": "npm:^0.1.2-alpha.7" "@deck.gl/aggregation-layers": "npm:^9.0.24" "@deck.gl/carto": "npm:^9.0.24" "@deck.gl/core": "npm:^9.0.24" From e563e00f33f041a707ed0c4d59adeca71d5b26c4 Mon Sep 17 00:00:00 2001 From: Don McCurdy Date: Mon, 7 Oct 2024 18:24:48 -0400 Subject: [PATCH 16/16] clean up --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 981ebcf..59407f8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,6 +62,7 @@ jobs: - name: Build run: yarn build + # TODO: Why do both .npmrc and .yarnrc.yml need updates? - name: Configure yarn to publish packages env: NPM_AUTH_TOKEN: ${{ secrets.NPM_CARTODB_AUTH_TOKEN }} @@ -74,7 +75,6 @@ jobs: yarn config set npmAuthToken "${NPM_AUTH_TOKEN}" # Create .npmrc - # TODO: Why do both .npmrc and .yarnrc.yml need updates? echo "@carto:registry=https://registry.npmjs.org/" > .npmrc echo "//registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}" >> .npmrc