Skip to content

Commit 9e07ae4

Browse files
committed
Merge branch 'dev' into bugfix/uui-loader-circle
2 parents 7611eb2 + 403d7a8 commit 9e07ae4

File tree

188 files changed

+1483
-2053
lines changed

Some content is hidden

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

188 files changed

+1483
-2053
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;

package-lock.json

Lines changed: 1271 additions & 1186 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"custom-elements"
2020
],
2121
"scripts": {
22-
"lint:eslint": "eslint --ext .ts,.html . --ignore-path .gitignore",
23-
"format:eslint": "eslint --ext .ts,.html . --fix --ignore-path .gitignore",
24-
"lint:prettier": "prettier \"**/*.js\" \"**/*.ts\" --check --ignore-path .gitignore",
25-
"format:prettier": "prettier \"**/*.js\" \"**/*.ts\" --write --ignore-path .gitignore",
22+
"lint:eslint": "eslint --ext .ts,.html,.mjs,.cjs . --ignore-path .gitignore",
23+
"format:eslint": "eslint --ext .ts,.html,.mjs,.cjs . --fix --ignore-path .gitignore",
24+
"lint:prettier": "prettier \"**/*.js\" \"**/*.ts\" \"**/*.mjs\" --check --ignore-path .gitignore",
25+
"format:prettier": "prettier \"**/*.js\" \"**/*.ts\" \"**/*.mjs\" --write --ignore-path .gitignore",
2626
"lint": "npm run lint:eslint && npm run lint:prettier",
2727
"format": "npm run format:eslint && npm run format:prettier",
2828
"storybook": "npm run bootstrap && npm run storybook:analyze && start-storybook -p 6006 -s ./.storybook/images",
@@ -33,16 +33,16 @@
3333
"test:coverage": "web-test-runner --node-resolve --coverage",
3434
"test:coverage-for": "node ./scripts/test-coverage-package.js",
3535
"dev": "npm run clean && npm run storybook",
36-
"build": "lerna run --scope @umbraco-ui/uui-css build && lerna run build",
37-
"build:prod": "npm run clean && npm run build && npm run test",
38-
"clean": "lerna run clean --parallel",
36+
"build": "lerna run --scope @umbraco-ui/uui-css build && turbo run build",
37+
"build:prod": "npm run clean && npm run build",
38+
"clean": "turbo run clean --parallel",
3939
"lerna:publish": "npm run build:prod && npm whoami && lerna publish from-package --yes && npm run lerna-fix",
4040
"lerna:version": "lerna version --no-push --exact --no-git-tag-version && rimraf package-lock.json && npm i",
4141
"lerna:diff": "lerna diff",
4242
"lerna-fix": "lerna exec -- node ../../scripts/lerna-fix.mjs",
4343
"lerna:modify-package": "lerna exec -- node ../../scripts/modify-pkgjson.mjs",
4444
"postinstall": "npm run bootstrap",
45-
"bootstrap": "lerna run --scope @umbraco-ui/uui-css build && node ./scripts/generate-ts-config.js",
45+
"bootstrap": "lerna run --scope @umbraco-ui/uui-css clean && lerna run --scope @umbraco-ui/uui-css build && node ./scripts/generate-ts-config.js",
4646
"prepare": "husky install",
4747
"new-package": "plop && npm i",
4848
"pack-all": "npm run build:prod && node ./scripts/pack-packages.js",
@@ -60,11 +60,11 @@
6060
"@babel/core": "7.15.0",
6161
"@open-wc/testing": "2.5.33",
6262
"@rollup/plugin-node-resolve": "13.0.5",
63-
"@storybook/addon-a11y": "6.4.14",
64-
"@storybook/addon-actions": "6.4.14",
65-
"@storybook/addon-essentials": "6.4.14",
66-
"@storybook/addon-links": "6.4.14",
67-
"@storybook/web-components": "6.4.14",
63+
"@storybook/addon-a11y": "6.4.18",
64+
"@storybook/addon-actions": "6.4.18",
65+
"@storybook/addon-essentials": "6.4.18",
66+
"@storybook/addon-links": "6.4.18",
67+
"@storybook/web-components": "6.4.18",
6868
"@types/chai": "^4.3.0",
6969
"@typescript-eslint/eslint-plugin": "5.7.0",
7070
"@typescript-eslint/parser": "5.7.0",
@@ -81,6 +81,7 @@
8181
"eslint-plugin-import": "2.24.2",
8282
"eslint-plugin-lit": "1.5.1",
8383
"eslint-plugin-lit-a11y": "1.1.0-next.1",
84+
"eslint-plugin-storybook": "^0.5.6",
8485
"husky": "7.0.4",
8586
"lerna": "4.0.0",
8687
"lint-staged": "10.5.4",
@@ -102,8 +103,9 @@
102103
"rollup-plugin-import-css": "3.0.2",
103104
"rollup-plugin-minify-html-literals": "1.2.6",
104105
"rollup-plugin-postcss": "4.0.2",
105-
"storybook-builder-vite": "0.1.13",
106+
"storybook-builder-vite": "0.1.14",
106107
"tsc-files": "1.1.2",
108+
"turbo": "*",
107109
"typescript": "4.5.2",
108110
"vite": "2.6.14",
109111
"vite-tsconfig-paths": "3.3.17",
@@ -113,8 +115,9 @@
113115
"./packages/*"
114116
],
115117
"lint-staged": {
116-
"**/*.ts": "tsc-files --project tsconfig-lint-staged.json",
117-
"**/*.{mjs}": "eslint --cache --fix -c .eslintrc.js",
118+
"*.ts": "tsc-files --project tsconfig-lint-staged.json",
119+
"*.{js,ts,mjs,cjs,html}": "eslint --cache --fix -c .eslintrc.js",
118120
"*": "prettier --ignore-unknown --write"
119-
}
121+
},
122+
"packageManager": "[email protected]"
120123
}

packages/rollup-package.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ const createEsModulesConfig = (entryPoints = []) => {
2424
file: `./lib/${name}.js`,
2525
format: 'es',
2626
},
27+
external: [/^lit/, /^@umbraco-ui/],
2728
plugins: [
2829
importCss({ from: undefined }),
2930
processLitCSSPlugin(),
@@ -83,7 +84,7 @@ export const UUIProdConfig = ({
8384
entryPoints = [],
8485
cssFiles = [],
8586
bundle,
86-
namespace = 'uui',
87+
namespace = '',
8788
}) => {
8889
const cssFilesConfig = createCSSFilesConfig(cssFiles);
8990
const esModulesConfig = createEsModulesConfig(entryPoints);

0 commit comments

Comments
 (0)