Skip to content

Commit

Permalink
Merge branch 'develop' into 6167-todo-remove-samples-to-template-repo…
Browse files Browse the repository at this point in the history
…sitory

# Conflicts:
#	packages/samples/angular/package.json
#	packages/samples/library/app/package.json
#	packages/samples/library/components/adapters/angular/package.json
#	packages/samples/library/components/adapters/react/package.json
#	packages/samples/library/components/adapters/vue/package.json
#	packages/samples/library/components/package.json
#	packages/samples/library/schema/package.json
#	packages/samples/library/theme/package.json
#	packages/samples/ssr/package.json
#	packages/samples/vite/package.json
#	pnpm-lock.yaml
  • Loading branch information
laske185 committed Mar 8, 2024
2 parents 05b9fee + a3931ea commit 68c02c1
Show file tree
Hide file tree
Showing 180 changed files with 7,791 additions and 3,797 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
"lint-staged": "15.2.2",
"npm-check-updates": "16.14.15",
"npm-run-all": "4.1.5",
"pnpm": "8.15.3",
"pnpm": "8.15.4",
"prettier": "3.2.5",
"rimraf": "3.0.2",
"ts-node": "10.9.2",
"ts-prune": "0.10.3",
"typescript": "5.3.3"
"typescript": "5.4.2"
}
}
6 changes: 3 additions & 3 deletions packages/adapters/angular/v17/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
"import": "./dist/index.js"
},
"devDependencies": {
"@angular/compiler": "17.2.1",
"@angular/compiler-cli": "17.2.1",
"@angular/core": "17.2.1",
"@angular/compiler": "17.2.4",
"@angular/compiler-cli": "17.2.4",
"@angular/core": "17.2.4",
"@public-ui/components": "2.0.8",
"@types/minimatch": "5.1.2",
"@types/minimist": "1.2.5",
Expand Down
3 changes: 2 additions & 1 deletion packages/adapters/react/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ register(DEFAULT, defineCustomElements)
Then, you can import any component from `@public-ui/react` and render it within React components:

```tsx
import React, { FC } from 'react';
import React from 'react';
import type { FC } from 'react';
import { KolButton } from '@public-ui/react';

export default (): FC => <KolButton _label="Hello World" />;
Expand Down
4 changes: 2 additions & 2 deletions packages/adapters/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
"@types/minimist": "1.2.5",
"@types/node": "ts5.3",
"@types/normalize-package-data": "2.4.4",
"@types/react": "18.2.57",
"@types/react-dom": "18.2.19",
"@types/react": "18.2.64",
"@types/react-dom": "18.2.21",
"react": "18.2.0",
"react-dom": "18.2.0",
"typescript": "5.3.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/adapters/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@
"prepack": "unbuild"
},
"devDependencies": {
"@babel/types": "7.23.9",
"@babel/types": "7.24.0",
"@public-ui/components": "2.0.8",
"@types/minimatch": "5.1.2",
"@types/minimist": "1.2.5",
"@types/node": "ts5.3",
"@types/normalize-package-data": "2.4.4",
"typescript": "5.3.3",
"unbuild": "1.2.1",
"vue": "3.4.19"
"vue": "3.4.21"
},
"peerDependencies": {
"@public-ui/components": "2.0.8",
Expand Down
28 changes: 14 additions & 14 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@
"dependencies": {
"@floating-ui/dom": "1.6.3",
"@public-ui/schema": "2.0.8",
"adopted-style-sheets": "1.1.3",
"i18next": "23.9.0",
"adopted-style-sheets": "1.1.4",
"i18next": "23.10.0",
"markdown-it": "14.0.0"
},
"devDependencies": {
"@stencil/angular-output-target": "0.8.4",
"@stencil/core": "4.12.3",
"@stencil/core": "4.12.5",
"@stencil/postcss": "2.1.0",
"@stencil/sass": "3.0.9",
"@stencil/sass": "3.0.10",
"@stencil/react-output-target": "0.5.3",
"@stencil/solid-output-target": "file:node_martin/stencil-solid-output-target-0.0.1.tgz",
"@stencil/vue-output-target": "0.8.7",
Expand All @@ -87,31 +87,31 @@
"@types/node": "ts5.3",
"@types/pug": "2.0.10",
"@types/twig": "1.12.16",
"@typescript-eslint/eslint-plugin": "7.0.2",
"@typescript-eslint/parser": "7.0.2",
"autoprefixer": "10.4.17",
"@typescript-eslint/eslint-plugin": "7.1.1",
"@typescript-eslint/parser": "7.1.1",
"autoprefixer": "10.4.18",
"color-rgba": "2.4.0",
"cross-env": "7.0.3",
"clsx": "2.1.0",
"cssnano": "6.0.3",
"eslint": "8.56.0",
"cssnano": "6.1.0",
"eslint": "8.57.0",
"eslint-plugin-html": "8.0.0",
"eslint-plugin-jsdoc": "48.1.0",
"eslint-plugin-jsdoc": "48.2.1",
"eslint-plugin-json": "3.1.0",
"eslint-plugin-jsx-a11y": "6.8.0",
"eslint-plugin-no-loops": "0.3.0",
"eslint-plugin-react": "7.33.2",
"eslint-plugin-react": "7.34.0",
"jest": "26.6.3",
"knip": "5.0.1",
"lighthouse": "11.5.0",
"knip": "5.0.3",
"lighthouse": "11.6.0",
"mustache": "4.2.0",
"postcss": "8.4.35",
"postcss-sorting": "8.0.2",
"prettier": "2.8.8",
"pug": "3.0.2",
"rimraf": "5.0.5",
"stencil-awesome-test": "1.0.6",
"terser": "5.27.2",
"terser": "5.29.1",
"tslib": "2.6.2",
"twig": "1.17.1",
"typescript": "5.3.3"
Expand Down
4 changes: 2 additions & 2 deletions packages/components/src/components/@shared/form-field-msg.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type FormFieldMsgProps = {
};

export const FormFieldMsg: FunctionalComponent<FormFieldMsgProps> = ({ _alert, _error, _hideError, _id }) => (
<kol-alert
<kol-alert-wc
/**
* This message is read out by screen readers if the input field
* refers to the message using the <code>aria-describedby</code>
Expand All @@ -27,5 +27,5 @@ export const FormFieldMsg: FunctionalComponent<FormFieldMsgProps> = ({ _alert, _
}}
>
{_error}
</kol-alert>
</kol-alert-wc>
);
24 changes: 24 additions & 0 deletions packages/components/src/components/@shared/kol-alert-mixin.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
@import '../style';
@import '../host-display-block';

@mixin kol-alert-styles {
@layer kol-component {
.kol-alert-wc {
display: grid;
}

.kol-alert-wc .heading {
display: flex;
place-items: center;
}

.kol-alert-wc .heading > div {
flex-grow: 1;
}

.close {
/* Visible with forced colors */
outline: transparent solid 1px;
}
}
}
23 changes: 2 additions & 21 deletions packages/components/src/components/alert/style.scss
Original file line number Diff line number Diff line change
@@ -1,22 +1,3 @@
@import '../style';
@import '../host-display-block';
@import '../@shared/kol-alert-mixin.scss';

@layer kol-component {
.kol-alert-wc {
display: grid;
}

.kol-alert-wc .heading {
display: flex;
place-items: center;
}

.kol-alert-wc .heading > div {
flex-grow: 1;
}

.close {
/* Visible with forced colors */
outline: transparent solid 1px;
}
}
@include kol-alert-styles;
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
position: absolute;
z-index: 1;
}

&:not(.checked):not(.indeterminate) .icon::part(icon) {
display: none;
}
Expand Down
3 changes: 3 additions & 0 deletions packages/components/src/components/input-checkbox/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@
@import 'button';
@import 'checkbox';
@import 'switch';
@import '../@shared/kol-alert-mixin.scss';

@include kol-alert-styles;
3 changes: 3 additions & 0 deletions packages/components/src/components/input-color/style.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
@import '../input-line';
@import '../@shared/kol-alert-mixin.scss';

@include kol-alert-styles;

@layer kol-component {
div.input {
Expand Down
3 changes: 3 additions & 0 deletions packages/components/src/components/input-date/style.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
@import '../input-line';
@import '../@shared/kol-alert-mixin.scss';

@include kol-alert-styles;

@layer kol-component {
.kol-input-number {
Expand Down
3 changes: 3 additions & 0 deletions packages/components/src/components/input-email/style.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
@import '../input-line';
@import '../@shared/kol-alert-mixin.scss';

@include kol-alert-styles;

@layer kol-component {
}
3 changes: 3 additions & 0 deletions packages/components/src/components/input-file/style.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
@import '../input-line';
@import '../@shared/kol-alert-mixin.scss';

@include kol-alert-styles;

@layer kol-component {
label input[type='file']::-webkit-file-upload-button {
Expand Down
3 changes: 3 additions & 0 deletions packages/components/src/components/input-number/style.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
@import '../input-line';
@import '../@shared/kol-alert-mixin.scss';

@include kol-alert-styles;

@layer kol-component {
}
3 changes: 3 additions & 0 deletions packages/components/src/components/input-password/style.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
@import '../input-line';
@import '../@shared/kol-alert-mixin.scss';

@include kol-alert-styles;

@layer kol-component {
}
3 changes: 3 additions & 0 deletions packages/components/src/components/input-radio/style.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
@import '../input';
@import '../@shared/kol-alert-mixin.scss';

@include kol-alert-styles;

@layer kol-component {
:host {
Expand Down
3 changes: 3 additions & 0 deletions packages/components/src/components/input-range/style.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
@import '../input-line';
@import '../@shared/kol-alert-mixin.scss';

@include kol-alert-styles;

@layer kol-component {
.inputs-wrapper {
Expand Down
3 changes: 3 additions & 0 deletions packages/components/src/components/input-text/style.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
@import '../input-line';
@import '../@shared/kol-alert-mixin.scss';

@include kol-alert-styles;

@layer kol-component {
}
3 changes: 3 additions & 0 deletions packages/components/src/components/input/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import '../@shared/kol-alert-mixin.scss';

@include kol-alert-styles;
2 changes: 1 addition & 1 deletion packages/create-kolibri/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
},
"devDependencies": {
"@types/node": "ts5.3",
"knip": "5.0.2",
"knip": "5.0.3",
"prettier": "3.2.5",
"rimraf": "3.0.2",
"tsup": "8.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-kolibri/templates/angular-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@ngtools/webpack": "17.2.1",
"@unocss/preset-mini": "0.47.6",
"@unocss/webpack": "0.47.6",
"chromedriver": "122.0.3",
"chromedriver": "122.0.4",
"cpy-cli": "5.0.0",
"knip": "5.0.2",
"eslint-plugin-jsx-a11y": "6.8.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-kolibri/templates/astro-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@types/node": "18.11.17",
"@types/react-dom": "18.0.9",
"astro": "1.7.2",
"chromedriver": "121.0.0",
"chromedriver": "122.0.4",
"cpy-cli": "5.0.0",
"nightwatch-axe-verbose": "2.3.0",
"npm-check-updates": "16.6.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-kolibri/templates/preact-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@leanup/stack-webpack": "1.3.49",
"@unocss/preset-mini": "0.47.6",
"@unocss/webpack": "0.47.6",
"chromedriver": "122.0.3",
"chromedriver": "122.0.4",
"cpy-cli": "5.0.0",
"knip": "5.0.2",
"eslint-plugin-jsx-a11y": "6.8.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-kolibri/templates/react-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@types/react-dom": "18.2.19",
"@unocss/preset-mini": "0.58.5",
"@unocss/webpack": "0.58.5",
"chromedriver": "122.0.3",
"chromedriver": "122.0.4",
"cpy-cli": "5.0.0",
"eslint-plugin-jsx-a11y": "6.8.0",
"eslint-plugin-react": "7.33.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-kolibri/templates/solid-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@leanup/stack-webpack": "1.3.49",
"@unocss/preset-mini": "0.47.6",
"@unocss/webpack": "0.47.6",
"chromedriver": "121.0.0",
"chromedriver": "122.0.4",
"cpy-cli": "4.2.0",
"nightwatch-axe-verbose": "2.3.0",
"npm-check-updates": "16.6.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-kolibri/templates/vue-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@leanup/stack-vue3": "1.3.49",
"@unocss/preset-mini": "0.58.5",
"@unocss/webpack": "0.58.5",
"chromedriver": "122.0.3",
"chromedriver": "122.0.4",
"cpy-cli": "5.0.0",
"npm-check-updates": "16.14.15",
"npm-run-all": "4.1.5",
Expand Down
6 changes: 3 additions & 3 deletions packages/designer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@public-ui/components": "2.0.8",
"@public-ui/solid": "2.0.8",
"@public-ui/themes": "2.0.8",
"adopted-style-sheets": "1.1.3",
"adopted-style-sheets": "1.1.4",
"monaco-editor": "0.46.0",
"monaco-editor-webpack-plugin": "7.1.0",
"prettier": "2.8.8",
Expand All @@ -50,14 +50,14 @@
"@unocss/preset-mini": "0.58.5",
"@unocss/webpack": "0.58.5",
"ajv": "8.12.0",
"chromedriver": "121.0.2",
"chromedriver": "122.0.4",
"cpy-cli": "5.0.0",
"depcheck": "1.4.7",
"eslint-plugin-jsx-a11y": "6.8.0",
"eslint-plugin-no-loops": "0.3.0",
"nightwatch-axe-verbose": "2.3.0",
"npm-run-all": "4.1.5",
"playwright": "1.41.2",
"playwright": "1.42.1",
"react-dev-utils": "12.0.1",
"rimraf": "3.0.2",
"ts-prune": "0.10.3",
Expand Down
Loading

0 comments on commit 68c02c1

Please sign in to comment.