Skip to content

Commit 419f9e5

Browse files
committed
Merge remote-tracking branch 'origin/dev' into feature/uui-dialog-layout
# Conflicts: # package-lock.json
2 parents 01862ef + efd4163 commit 419f9e5

File tree

194 files changed

+36501
-34166
lines changed

Some content is hidden

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

194 files changed

+36501
-34166
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: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ 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

.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;

0 commit comments

Comments
 (0)