Skip to content

Commit 161d5bd

Browse files
committed
Merge branch 'dev' into bugfix/breadcrumbs
2 parents f1d722e + d63e274 commit 161d5bd

File tree

477 files changed

+44019
-27053
lines changed

Some content is hidden

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

477 files changed

+44019
-27053
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules/

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
module.exports = {
2+
ignorePatterns: ['vite.*.js'],
23
root: true,
34
parser: '@typescript-eslint/parser',
45
plugins: ['@typescript-eslint', 'html', 'import'],

.github/pull_request_template.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<!--- Provide a general summary of your changes in the Title above -->
2+
3+
## Description
4+
5+
<!--- Describe the changes in detail -->
6+
7+
## Types of changes
8+
9+
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
10+
11+
- [ ] Bug fix (non-breaking change which fixes an issue)
12+
- [ ] New feature (non-breaking change which adds functionality)
13+
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
14+
- [ ] Chore (minor updates related to the tooling or maintenance of the repository, does not impact compiled assets)
15+
16+
## Motivation and context
17+
18+
<!--- Why is this change required? What problem does it solve? -->
19+
20+
## How to test?
21+
22+
## Screenshots (if appropriate)
23+
24+
## Checklist
25+
26+
<!--- Go over all the following points, and put an `x` in all the boxes that apply. If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
27+
28+
- [ ] If my change required a change to the documentation, I have updated the documentation in this pull request.
29+
- [ ] I have read the **[CONTRIBUTING](<(https://github.com/umbraco/Umbraco.UI/blob/dev/docs/CONTRIBUTING.md)>)** document.
30+
- [ ] I have added tests to cover my changes.
31+
- [ ] All new and existing tests passed.
Lines changed: 68 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,68 @@
1-
name: Azure Static Web Apps CI/CD
2-
3-
on:
4-
push:
5-
branches:
6-
- main
7-
pull_request:
8-
types: [opened, synchronize, reopened, closed]
9-
branches:
10-
- main
11-
12-
jobs:
13-
build_and_deploy_job:
14-
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
15-
runs-on: ubuntu-latest
16-
name: Build and Deploy Job
17-
steps:
18-
- uses: actions/checkout@v2
19-
with:
20-
submodules: true
21-
- name: Build And Deploy
22-
id: builddeploy
23-
uses: Azure/static-web-apps-deploy@v1
24-
with:
25-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_DELIGHTFUL_BEACH_055ECB503 }}
26-
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
27-
action: "upload"
28-
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
29-
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
30-
app_location: "/" # App source code path
31-
app_build_command: "npm ci && npm run storybook:build"
32-
api_location: "" # Api source code path - optional
33-
output_location: "/storybook-static" # Built app content directory - optional
34-
###### End of Repository/Build Configurations ######
35-
36-
close_pull_request_job:
37-
if: github.event_name == 'pull_request' && github.event.action == 'closed'
38-
runs-on: ubuntu-latest
39-
name: Close Pull Request Job
40-
steps:
41-
- name: Close Pull Request
42-
id: closepullrequest
43-
uses: Azure/static-web-apps-deploy@v1
44-
with:
45-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_DELIGHTFUL_BEACH_055ECB503 }}
46-
action: "close"
1+
name: Azure Static Web Apps CI/CD
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
types: [opened, synchronize, reopened, closed]
9+
branches:
10+
- main
11+
12+
jobs:
13+
14+
test:
15+
# The type of runner that the job will run on
16+
runs-on: ubuntu-latest
17+
18+
strategy:
19+
matrix:
20+
node-version: [16.x]
21+
22+
# Steps represent a sequence of tasks that will be executed as part of the job
23+
steps:
24+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
25+
- uses: actions/checkout@v2
26+
- name: Use Node.js ${{ matrix.node-version }}
27+
uses: actions/setup-node@v2
28+
with:
29+
node-version: ${{ matrix.node-version }}
30+
- run: npm ci
31+
- run: npm run build:prod
32+
33+
build_and_deploy_job:
34+
needs: test
35+
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
36+
runs-on: ubuntu-latest
37+
name: Build and Deploy Job
38+
steps:
39+
- uses: actions/checkout@v2
40+
with:
41+
submodules: true
42+
43+
- name: Build And Deploy
44+
id: builddeploy
45+
uses: Azure/static-web-apps-deploy@v1
46+
with:
47+
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_DELIGHTFUL_BEACH_055ECB503 }}
48+
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
49+
action: "upload"
50+
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
51+
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
52+
app_location: "/" # App source code path
53+
app_build_command: "npm run storybook:build"
54+
api_location: "" # Api source code path - optional
55+
output_location: "/storybook-static" # Built app content directory - optional
56+
###### End of Repository/Build Configurations ######
57+
58+
close_pull_request_job:
59+
if: github.event_name == 'pull_request' && github.event.action == 'closed'
60+
runs-on: ubuntu-latest
61+
name: Close Pull Request Job
62+
steps:
63+
- name: Close Pull Request
64+
id: closepullrequest
65+
uses: Azure/static-web-apps-deploy@v1
66+
with:
67+
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_DELIGHTFUL_BEACH_055ECB503 }}
68+
action: "close"

.github/workflows/publish.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,7 @@ jobs:
2222
# pulls all commits (needed for lerna / semantic release to correctly version)
2323
fetch-depth: "0"
2424

25-
- name: Configure CI Git User
26-
run: |
27-
git config --global user.name '@julczka'
28-
git config --global user.email '[email protected]'
29-
git remote set-url origin https://$GITHUB_ACTOR:[email protected]/umbraco/Umbraco.UI
30-
env:
31-
GITHUB_PAT: ${{ secrets.JULCZKA_PAT }}
32-
25+
3326
- name: Use Node.js ${{ matrix.node-version }}
3427
uses: actions/setup-node@v2
3528
with:
@@ -47,12 +40,10 @@ jobs:
4740
echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> .npmrc
4841
npm whoami
4942
env:
50-
NPM_TOKEN: ${{ secrets.JULCZKA_AUTOMATION_NPM_TOKEN}}
43+
NPM_TOKEN: ${{ secrets.UMBRACO_PUBLISH_NPM_TOKEN}}
5144

5245
- name: Publish package
5346
run: npm run lerna:publish
5447
env:
55-
GH_TOKEN: ${{ secrets.JULCZKA_PAT }}
56-
GITHUB_TOKEN: ${{ secrets.JULCZKA_PAT }}
57-
NPM_TOKEN: ${{ secrets.JULCZKA_AUTOMATION_NPM_TOKEN}}
48+
NPM_TOKEN: ${{ secrets.UMBRACO_PUBLISH_NPM_TOKEN}}
5849

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,14 @@
2323
/packages/**/lib/**/*.d.ts
2424
tsconfig.tsbuildinfo
2525
/out-tsc/
26+
/packages/**/node_modules/
2627

2728

2829
custom-elements.json
30+
/packages/uui-css/custom-properties.js
31+
/packages/uui-css/custom-properties.module.js
2932
storybook-static
3033
debug.log
3134
out-css
3235
*.log
36+
.eslintcache

.husky/.gitignore

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

.husky/pre-commit

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22
. "$(dirname "$0")/_/husky.sh"
33

4-
npm run format
4+
npx lint-staged

.storybook/images/UI_release-min.png

80.1 KB
Loading

.storybook/main.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
const tsconfigPaths = require('vite-tsconfig-paths').default;
2+
const processLitCSSPlugin =
3+
require('../scripts/vite.processLitCSSPlugin').default;
24

35
module.exports = {
46
stories: ['../packages/**/*.story.ts'],
@@ -11,16 +13,21 @@ module.exports = {
1113
async viteFinal(config, { configType }) {
1214
// customize the Vite config here
1315

16+
config.plugins.push(processLitCSSPlugin());
17+
1418
if (configType === 'DEVELOPMENT') {
1519
// add plugins
1620
config.plugins.push(tsconfigPaths());
1721

1822
// pre bundle dependencies for faster startup time
1923
config.optimizeDeps.include.push('@storybook/web-components');
24+
config.optimizeDeps.include.push('lit-element');
2025
config.optimizeDeps.include.push('lit-html');
2126
config.optimizeDeps.include.push('lit');
2227
config.optimizeDeps.include.push('lit/decorators.js');
2328
config.optimizeDeps.include.push('lit/directives/style-map.js');
29+
config.optimizeDeps.include.push('lit/directives/if-defined.js');
30+
config.optimizeDeps.include.push('lit/directives/unsafe-html.js');
2431
}
2532

2633
return config;

0 commit comments

Comments
 (0)