Skip to content

Commit

Permalink
Merge branch 'develop' into fix/1119_increase-clickable-area-input
Browse files Browse the repository at this point in the history
  • Loading branch information
bar-tay authored Jul 4, 2024
2 parents 4844904 + 2f9be81 commit 70dc603
Show file tree
Hide file tree
Showing 381 changed files with 4,392 additions and 4,597 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,5 @@ jobs:
- name: Install modules
run: yarn

- name: Generate tokens
run: yarn tokens:generate

- name: Run Compile
run: yarn compile
run: yarn build:ui-library
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
18.18.0
4 changes: 3 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"runem.lit-plugin",
"bierner.comment-tagged-templates"
"bierner.comment-tagged-templates",
"stylelint.vscode-stylelint",
"styled-components.vscode-styled-components"
]
}
18 changes: 18 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Launch Example App",
"skipFiles": ["<node_internals>/**"],
"args": ["./dist/server.js"],
"runtimeArgs": ["--enable-source-maps", "--conditions=development", "--watch"],
"preLaunchTask": "js-example-app::build:dev",
"cwd": "${workspaceFolder}/packages/js-example-app"
}
]
}
4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,7 @@
120 // prettier print width
],
"lit-plugin.rules.no-missing-import": "off",
"lit-plugin.strict": true
"lit-plugin.strict": true,
"lit-plugin.cssTemplateTags": [],
"stylelint.validate": ["typescript"]
}
16 changes: 16 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "shell",
"command": "yarn build:dev --watch",
"options": {
"cwd": "packages/js-example-app"
},
"group": "build",
"problemMatcher": ["$tsc-watch"],
"label": "js-example-app::build:dev",
"isBackground": true
}
]
}
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ component can also be viewed
```
5. Now start up your app
```sh
$ yarn start
$ yarn start:storybook
```

> Note: This command will also open up Storybook locally. This provides you with a full list of available components
Expand Down Expand Up @@ -260,7 +260,7 @@ your first icon:
```
2. To check that your icon has been added run your project locally and inspect the Icons tab:
```sh
$ yarn start
$ yarn start:storybook
```
#### Changing Icons
Expand All @@ -271,8 +271,7 @@ It is also possible to just change existing icon file without renaming it.
3. Replace the `<svg>` and `<path>` tags with yours
4. Compile and run your project locally with:
```sh
$ yarn compile:icons
$ yarn start
$ yarn start:storybook
```
5. If now you navigate to the local Storybook and inspect Icons tab, you will see that the icon `blrBook` is updated
Expand Down Expand Up @@ -310,7 +309,7 @@ const defaultParams: BlrCheckboxType ={
To check that changes have applied do the following:
1. Run you project locally with:
```sh
$ yarn start
$ yarn start:storybook
```
2. Navigate to the Checkbox tab in your local Storybook
3. Check the checkbox
Expand Down
2 changes: 1 addition & 1 deletion docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Please, before submitting any contribution, be sure that your branch is passing

```bash
yarn test
yarn compile
yarn build:ui-library
```


Expand Down
37 changes: 14 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,18 @@
"main": "",
"types": "",
"scripts": {
"start": "yarn tokens:generate && yarn workspace @boiler/ui-library start:storybook",
"build:storybook-and-js-example": "yarn build:storybook && yarn build:js-example:prod",
"join-publish:storybook-and-js-example": "cp -R packages/ui-library/storybook-static dist && cp -R packages/js-example-app/dist dist/js-example-app",
"build:storybook": "yarn workspace @boiler/ui-library build:storybook",
"serve:js-example": "yarn workspace @boiler/js-example-app serve",
"build:ui-library": "yarn workspace @boiler/ui-library build && yarn workspace @boiler/ui-library compile",
"build:js-example": "yarn build:ui-library && yarn workspace @boiler/js-example-app build",
"build:js-example:prod": "yarn build:ui-library && yarn workspace @boiler/js-example-app build:prod",
"start:storybook": "yarn tokens:generate && yarn compile:icons && yarn workspace @boiler/ui-library start:storybook",
"build:js-example-app": "yarn workspace @boiler/js-example-app build:dev",
"start:js-example-app": "yarn workspace @boiler/js-example-app start:dev",
"build:storybook": "yarn tokens:generate && yarn compile:icons && yarn workspace @boiler/ui-library build:storybook",
"build:ui-library": "yarn tokens:generate && yarn compile:icons && yarn workspace @boiler/ui-library build && yarn workspace @boiler/ui-library compile",
"lint": "yarn workspace @boiler/ui-library lint",
"format": "yarn workspace @boiler/ui-library format:eslint && yarn workspace @boiler/ui-library format:prettier",
"test:ui-library": "yarn workspace @boiler/ui-library test",
"build-and-test:ui-library": "yarn build:ui-library && yarn workspace @boiler/ui-library test",
"test": "yarn build-and-test:ui-library",
"test": "yarn build:ui-library && yarn workspace @boiler/ui-library test",
"doc:install": "deven-documentation-skeleton install",
"doc:check": "deven-documentation-skeleton check",
"doc:update": "deven-documentation-skeleton update",
"compile:icons": "yarn workspace @boiler/icons compile:icons",
"compile": "yarn workspace @boiler/ui-library compile",
"analyze": "yarn workspace @boiler/ui-library analyze",
"tokens:generate": "yarn workspace @boiler/figma-design-tokens tokens:generate",
"prepare": "husky install"
Expand All @@ -47,7 +41,6 @@
"@babel/plugin-transform-class-properties": "^7.23.0",
"@babel/preset-env": "^7.23.0",
"@babel/preset-typescript": "^7.23.0",
"@boiler/figma-design-tokens": "0.0.1",
"@commitlint/cli": "17.4.2",
"@commitlint/config-conventional": "17.4.2",
"@deven-org/documentation-skeleton": "^2.1.0",
Expand Down Expand Up @@ -80,38 +73,36 @@
"husky": "^8.0.0",
"lint-staged": "^13.1.0",
"lit-analyzer": "^2.0.2",
"lit-html": "^2.6.1",
"lodash.camelcase": "4.3.0",
"mini-css-extract-plugin": "^2.7.2",
"pa11y-ci": "3.0.1",
"postcss-lit": "^1.0.1",
"prettier": "2.8.3",
"postcss-styled-syntax": "^0.6.4",
"prettier": "3.2.5",
"query-selector-shadow-dom": "^1.0.1",
"raw-loader": "^4.0.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sass": "^1.57.1",
"sass-loader": "^13.2.0",
"style-loader": "^3.3.1",
"stylelint": "^14.16.1",
"stylelint-config-standard": "^29.0.0",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^35.0.0",
"svgo": "^3.0.2",
"ts-lit-plugin": "^2.0.1",
"ts-node": "^10.9.1",
"typescript": "^5.3.0",
"webpack": "^5.75.0",
"webpack-cli": "^5.0.1"
"webpack-cli": "^5.0.1",
"webpack-merge": "^5.10.0",
"webpack-node-externals": "^3.0.0"
},
"dependencies": {
"@geometricpanda/storybook-addon-badges": "^2.0.2",
"@lit-labs/react": "^1.1.1",
"http-server": "^14.1.1",
"lit": "^2.7.4",
"nested-css-to-flat": "^1.0.5",
"rimraf": "^5.0.5"
},
"engines": {
"node": "^18",
"node": "18.18.0",
"yarn": "^4.1.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ themes.array.map((theme) => {
(item) => `export {${convertToCamelCase(item.split('.')[0])}Wrapped as ${convertToCamelCase(item.split('.')[0])}}`
);

const fileOutPut = `import {wrapValuesWithCss} from '../../utils/wrap-values-with-css';
const fileOutPut = `import {wrapValuesWithCss} from '../../utils/wrap-values-with-css.js';
${importsPart.join('\n')}
${constsPart.join('\n')}
Expand Down
2 changes: 2 additions & 0 deletions packages/icons/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
icons-optimized
*.generated.*
1 change: 0 additions & 1 deletion packages/icons/icons-optimized/360_lg.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/360_md.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/360_sm.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/360_xl.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/360_xs.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/360_xxs.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_down_lg.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_down_md.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_down_sm.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_down_xl.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_down_xs.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_down_xxs.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_left_lg.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_left_md.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_left_sm.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_left_xl.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_left_xs.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_left_xxs.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_right_lg.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_right_md.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_right_sm.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_right_xl.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_right_xs.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_right_xxs.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_up_lg.svg

This file was deleted.

1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_up_md.svg
Diff not rendered.
1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_up_sm.svg
Diff not rendered.
1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_up_xl.svg
Diff not rendered.
1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_up_xs.svg
Diff not rendered.
1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Arrow_up_xxs.svg
Diff not rendered.
1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Checkmark_lg.svg
Diff not rendered.
1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Checkmark_md.svg
Diff not rendered.
1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Checkmark_sm.svg
Diff not rendered.
1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Checkmark_xl.svg
Diff not rendered.
1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Checkmark_xs.svg
Diff not rendered.
1 change: 0 additions & 1 deletion packages/icons/icons-optimized/Checkmark_xxs.svg
Diff not rendered.
Loading

0 comments on commit 70dc603

Please sign in to comment.