Merge remote-tracking branch 'origin/dev' into feature/package-barrels

Author: iOvergaard

docs/RELEASE_INSTRUCTION.md

@@ -1,22 +1,25 @@
 # UI Library Release workflow
 
-1. Create a new branch for the release. We need a good naming convention: `Release/<patch/minor/major>-<YYMMDD>` (example: `Release/Patch-220128`)
-1. Review new release PR (either [on GitHub](https://github.com/umbraco/Umbraco.UI/compare/) or through `npm run lerna:diff`)
-1. Make a PR from the new branch to the main branch
+1. Create a new branch for the release. We need a good naming convention: `Release/<patch/minor/major>-<YYMMDD>` (example: `Release/Patch-220128`).
+1. Review new release PR (either [on GitHub](https://github.com/umbraco/Umbraco.UI/compare/) or through `npm run lerna:diff`).
+1. Make a PR from the new branch to the main branch.
 1. Wait for GitHub checks to pass.
-1. Run `npm run lerna:version`
-1. Select new version number for every package in the terminal
-1. Confirm the new versions - **this step is irreversible**. It will create tags and commit those to the remote. [Check how to clear tags.](#How-to-clear-tags)
-1. Commit `package-lock.json` to your release branch
+1. Run `npm run lerna:version`.
+1. Select new version number for every package in the terminal.
+1. Confirm the new versions - **this step is irreversible**. It will create tags and commit those to the remote. [Check how to clear tags.](#How-to-clear-tags).
+1. (TODO: Test the new setup works (by adding --no-push and no tag creation)... we haven't tried out jet, but it should fix the problem metnioned below by having a commit without the package-lock begin up to date.. If everything works then remove all tags from repo..).
+1. Commit changes and `package-lock.json` to your release branch.
 1. Wait for GitHub checks to pass. There will be one check that fails and this is the one triggered by a commit made by `npm run lerna:version` command. This fails because it runs build with old `package-lock.json` that does not have updated versions of the packages. After you commit the new package-lock the check should pass.
-1. Merge PR into main - this will trigger two actions - `Publish`, and `Azure Static Web Apps CI/CD`. The `Publish` workflow is responsible for publishing packages to NPM. It will only publish the packages that have higher version that previously published ones. The azure workflow will build and publish UI library Storybook
-1. Merge main branch into dev branch
+1. Github will post a comment with a test link to try out that the release works in Storybook. Please check that it works.
+1. Merge PR into main - this will trigger two actions - `Publish`, and `Azure Static Web Apps CI/CD`. The `Publish` workflow is responsible for publishing packages to NPM. It will only publish the packages that have higher version that previously published ones. The azure workflow will build and publish UI library Storybook.
+1. Merge main branch into dev branch.
 
-## How to clear tags
+## How to clear tags (maybe not relevant after update mentioned above...)
 
-If something goes wrong during the publish workflow, you might end up with tag numbers not corresponding to the current versions of the packages. Tags are stored both on remote and on local repository. Go to Github and remove all tags with higher versions then the last published version.
+If something goes wrong during the publish workflow, you might end up with tag numbers not corresponding to the current versions of the packages. Tags are stored both on remote and on local repository.
 
-Then delete all your local tags and replace them with the tags from the remote. To do that run the following inside your local repository.
+1. Go to Github and remove all tags with higher versions then the last published version.
+2. Then delete all your local tags and replace them with the tags from the remote. To do that run the following inside your local repository.
 
 OSX
 

package-lock.json

@@ -35,7 +35,7 @@
     "build:prod": "npm run clean && npm run build && npm run test",
     "clean": "lerna run clean --parallel",
     "lerna:publish": "npm run build:prod && npm whoami && lerna publish from-package --yes && npm run lerna-fix",
-    "lerna:version": "lerna version --exact && rimraf package-lock.json && npm i",
+    "lerna:version": "lerna version --no-push --exact --no-git-tag-version && rimraf package-lock.json && npm i",
     "lerna:diff": "lerna diff",
     "lerna-fix": "lerna exec -- node ../../scripts/lerna-fix.mjs",
     "lerna:modify-package": "lerna exec -- node ../../scripts/modify-pkgjson.mjs",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umbraco-ui/uui-action-bar",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "license": "MIT",
   "keywords": [
     "Umbraco",
@@ -30,8 +30,8 @@
     "custom-elements.json"
   ],
   "dependencies": {
-    "@umbraco-ui/uui-base": "0.0.14",
-    "@umbraco-ui/uui-button-group": "0.0.9"
+    "@umbraco-ui/uui-base": "0.0.15",
+    "@umbraco-ui/uui-button-group": "0.0.10"
   },
   "scripts": {
     "build": "npm run analyze && tsc --build --force && rollup -c rollup.config.js",

packages/uui-action-bar/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umbraco-ui/uui-avatar-group",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "license": "MIT",
   "keywords": [
     "Umbraco",
@@ -30,7 +30,7 @@
     "custom-elements.json"
   ],
   "dependencies": {
-    "@umbraco-ui/uui-base": "0.0.14"
+    "@umbraco-ui/uui-base": "0.0.15"
   },
   "scripts": {
     "build": "npm run analyze && tsc --build --force && rollup -c rollup.config.js",

packages/uui-avatar-group/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umbraco-ui/uui-avatar",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "license": "MIT",
   "description": "An avatar web component for displaying user avatars.",
   "keywords": [
@@ -30,7 +30,7 @@
     "custom-elements.json"
   ],
   "dependencies": {
-    "@umbraco-ui/uui-base": "0.0.14"
+    "@umbraco-ui/uui-base": "0.0.15"
   },
   "scripts": {
     "build": "npm run analyze && tsc --build --force && rollup -c rollup.config.js",

packages/uui-avatar/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umbraco-ui/uui-badge",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "license": "MIT",
   "description": "A badge to notify that there is something that requires attention of the user.",
   "keywords": [
@@ -30,7 +30,7 @@
     "custom-elements.json"
   ],
   "dependencies": {
-    "@umbraco-ui/uui-base": "0.0.14"
+    "@umbraco-ui/uui-base": "0.0.15"
   },
   "scripts": {
     "build": "npm run analyze && tsc --build --force && rollup -c rollup.config.js",

packages/uui-badge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umbraco-ui/uui-base",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "license": "MIT",
   "keywords": [
     "Umbraco",

packages/uui-base/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umbraco-ui/uui-boolean-input",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "license": "MIT",
   "keywords": [
     "Umbraco",
@@ -30,7 +30,7 @@
     "custom-elements.json"
   ],
   "dependencies": {
-    "@umbraco-ui/uui-base": "0.0.14"
+    "@umbraco-ui/uui-base": "0.0.15"
   },
   "scripts": {
     "build": "npm run analyze && tsc --build --force && rollup -c rollup.config.js",

packages/uui-boolean-input/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umbraco-ui/uui-box",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "license": "MIT",
   "description": "A box web component for grouping elements",
   "keywords": [
@@ -29,7 +29,7 @@
     "custom-elements.json"
   ],
   "dependencies": {
-    "@umbraco-ui/uui-base": "0.0.14"
+    "@umbraco-ui/uui-base": "0.0.15"
   },
   "scripts": {
     "build": "npm run analyze && tsc --build --force && rollup -c rollup.config.js",