Skip to content

Commit 6fbddfc

Browse files
authored
Merge pull request #141 from umbraco/Release/Patch-220218
2 parents 2a640ce + 3edecdb commit 6fbddfc

File tree

467 files changed

+9145
-7620
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

467 files changed

+9145
-7620
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
node_modules/
2+
.eslintrc.js

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ module.exports = {
1010
'plugin:@typescript-eslint/recommended',
1111
'plugin:lit/recommended',
1212
'plugin:lit-a11y/recommended',
13+
'plugin:storybook/recommended',
1314
],
1415
rules: {
1516
// disable the rule for all files

.github/workflows/azure-static-web-apps-delightful-beach-055ecb503.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ jobs:
2828
uses: actions/setup-node@v2
2929
with:
3030
node-version: ${{ matrix.node-version }}
31-
- run: npm ci
31+
cache: 'npm'
32+
- run: npm install
3233
- run: npm run lint
34+
- run: npm run test
3335
- run: npm run build:prod
3436

3537
build_and_deploy_job:

.github/workflows/tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ jobs:
3030
uses: actions/setup-node@v2
3131
with:
3232
node-version: ${{ matrix.node-version }}
33+
cache: 'npm'
3334
- run: npm install
3435
- run: npm run lint
36+
- run: npm run test
3537
- run: npm run build:prod

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ tsconfig.tsbuildinfo
2727

2828

2929
custom-elements.json
30-
/packages/uui-css/custom-properties.js
31-
/packages/uui-css/custom-properties.module.js
30+
/packages/uui-css/custom-properties.*
3231
storybook-static
3332
debug.log
3433
out-css
3534
*.log
3635
.eslintcache
3736
*.tgz
37+
.turbo
3838

3939
# old source
40-
/src/**/*
40+
/src

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.hbs

.storybook/main.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ module.exports = {
2727
config.optimizeDeps.include.push('lit/directives/style-map.js');
2828
config.optimizeDeps.include.push('lit/directives/if-defined.js');
2929
config.optimizeDeps.include.push('lit/directives/unsafe-html.js');
30+
config.optimizeDeps.include.push('element-internals-polyfill');
3031
}
3132

3233
return config;

.storybook/preview-body.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<script>
2-
document.body.classList.add('uui-root');
2+
document.body.classList.add('uui-font');
33
document.body.classList.add('uui-text');
44
</script>

.storybook/preview.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { setCustomElements } from '@storybook/web-components';
22
import customElements from '../custom-elements.json';
33
import '../packages/uui-css/lib/uui-css.css';
4-
import 'https://cdn.skypack.dev/element-internals-polyfill';
4+
import 'element-internals-polyfill';
55

66
const sort = (a, b) => {
77
if (a[1].name === 'Overview') {

docs/RELEASE_INSTRUCTION.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
# UI Library Release workflow
22

3-
1. Create a new branch for the release. We need a good naming convention: `Release/<patch/minor/major>-<YYMMDD>` (example: `Release/Patch-220128`)
4-
1. Review new release PR (either [on GitHub](https://github.com/umbraco/Umbraco.UI/compare/) or through `npm run lerna:diff`)
5-
1. Make a PR from the new branch to the main branch
3+
1. Create a new branch for the release. We need a good naming convention: `Release/<patch/minor/major>-<YYMMDD>` (example: `Release/Patch-220128`).
4+
1. Review new release PR (either [on GitHub](https://github.com/umbraco/Umbraco.UI/compare/) or through `npm run lerna:diff`).
5+
1. Make a PR from the new branch to the main branch.
66
1. Wait for GitHub checks to pass.
7-
1. Run `npm run lerna:version`
8-
1. Select new version number for every package in the terminal
9-
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)
10-
1. Commit `package-lock.json` to your release branch
7+
1. Run `npm run lerna:version`.
8+
1. Select new version number for every package in the terminal.
9+
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).
10+
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..).
11+
1. Commit changes and `package-lock.json` to your release branch.
1112
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.
12-
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
13-
1. Merge main branch into dev branch
13+
1. Github will post a comment with a test link to try out that the release works in Storybook. Please check that it works.
14+
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.
15+
1. Merge main branch into dev branch.
1416

15-
## How to clear tags
17+
## How to clear tags (maybe not relevant after update mentioned above...)
1618

1719
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.
1820

0 commit comments

Comments
 (0)