Skip to content

Commit

Permalink
Merge branch 'development' into OEL-2129-#default#
Browse files Browse the repository at this point in the history
  • Loading branch information
Tiberiu Dumitru committed Jul 16, 2024
2 parents 2f6667c + f1f6884 commit e477c41
Show file tree
Hide file tree
Showing 254 changed files with 6,229 additions and 5,022 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/gallium
lts/hydrogen
13 changes: 13 additions & 0 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,19 @@ export const parameters = {
paddingBlock: '5px',
}
},
[BADGE.DEPRECATED]: {
title: 'DEPRECATED',
styles: {
fontSize: '20',
paddingInline: '24px',
backgroundColor: '#ff0000',
borderColor: '#DCDCDC',
color: '#FFFFFF',
textTransform: 'lowercase',
borderWidth: '2px',
paddingBlock: '5px',
}
},
},
viewport: {
defaultViewport: "responsive",
Expand Down
71 changes: 68 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,77 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## 1.0.0 (2023-01-10)
## v1.2.2 (2024-07-10)

#### :nail_care: Enhancement
* [#590](https://github.com/openeuropa/bootstrap-component-library/pull/590) feat(security): Updated security packages. - OEL-3080 ([@tibi2303](https://github.com/tibi2303))
* [#578](https://github.com/openeuropa/bootstrap-component-library/pull/578) feat(renaming): Renaming and added deprecated badge. ([@tibi2303](https://github.com/tibi2303))

#### Committers: 1
- Dumitru Tiberiu-Andrei ([@tibi2303](https://github.com/tibi2303))

## v1.2.1 (2024-02-21)

#### :nail_care: Enhancement
* [#578](https://github.com/openeuropa/bootstrap-component-library/pull/578) feat(renaming): Renaming and added deprecated badge. ([@tibi2303](https://github.com/tibi2303))
* [#505](https://github.com/openeuropa/bootstrap-component-library/pull/505) feat(banner): Fixed height variant on banners - OEL-2164 ([@tibi2303](https://github.com/tibi2303))
* [#572](https://github.com/openeuropa/bootstrap-component-library/pull/572) feat(multiselect): Fixed multiselect overflow. - OEL-2784 ([@tibi2303](https://github.com/tibi2303))

#### Committers: 1
- Dumitru Tiberiu-Andrei ([@tibi2303](https://github.com/tibi2303))

## v1.2.0 (2023-08-24)

#### :bug: Bug Fix
* [#526](https://github.com/openeuropa/bootstrap-component-library/pull/526) feat(multiselect): Fixed valid/invalid icon for form-select on multiple. - OEL-2292 ([@tibi2303](https://github.com/tibi2303))
* [#521](https://github.com/openeuropa/bootstrap-component-library/pull/521) feat(inpage): Fixed inpage navigation for ucpkn and joinup - OEL-2265 ([@tibi2303](https://github.com/tibi2303))

#### :nail_care: Enhancement
* [#495](https://github.com/openeuropa/bootstrap-component-library/pull/495) feat(background): Changed background and text color classes - OEL-2146 ([@tibi2303](https://github.com/tibi2303))
* [#524](https://github.com/openeuropa/bootstrap-component-library/pull/524) feat(content-banner): Fix card margin inside content-banner. - OEL-2288 ([@tibi2303](https://github.com/tibi2303))
* [#508](https://github.com/openeuropa/bootstrap-component-library/pull/508) feat(improvements): Integrated patch for bcl 1.0.0 - OEL-2230 ([@tibi2303](https://github.com/tibi2303))
* [#534](https://github.com/openeuropa/bootstrap-component-library/pull/534) feat(prefix-styles): Added prefix config for styles. - OEL-2373 ([@tibi2303](https://github.com/tibi2303))
* [#523](https://github.com/openeuropa/bootstrap-component-library/pull/523) feat(offcanvas): Fixed offcanvas close button - OEL-2277 ([@tibi2303](https://github.com/tibi2303))
* [#512](https://github.com/openeuropa/bootstrap-component-library/pull/512) feat(icons): Added custom icons - OEL-2240 ([@tibi2303](https://github.com/tibi2303))
* [#478](https://github.com/openeuropa/bootstrap-component-library/pull/478) feat(landing): Added deprecated filter for story files - OEL-2090 ([@tibi2303](https://github.com/tibi2303))
* [#480](https://github.com/openeuropa/bootstrap-component-library/pull/480) feat(badges): Changed close icon on badge - OEL-2098 ([@tibi2303](https://github.com/tibi2303))

#### :house: Internal
* [#548](https://github.com/openeuropa/bootstrap-component-library/pull/548) feat(node): Updated node to 18 and dependencies. - OEL-2422 ([@tibi2303](https://github.com/tibi2303))
* [#549](https://github.com/openeuropa/bootstrap-component-library/pull/549) feat(chore): Updated flag-icons to 6.9.2. ([@tibi2303](https://github.com/tibi2303))

#### Committers: 2
- Dumitru Tiberiu-Andrei ([@tibi2303](https://github.com/tibi2303))
- Péter Keszthelyi ([@kp77](https://github.com/kp77))

## v1.1.1 (2023-10-10)

#### :bug: Bug Fix
* [#539](https://github.com/openeuropa/bootstrap-component-library/pull/539) chore(deps): fixed deps for builder.([@tibi2303](https://github.com/tibi2303))

#### Committers: 2
- Dumitru Tiberiu-Andrei ([@tibi2303](https://github.com/tibi2303))

## v1.1.0 (2023-07-07)

#### :bug: Bug Fix
* [#526](https://github.com/openeuropa/bootstrap-component-library/pull/526) feat(multiselect): Fixed valid/invalid icon for form-select on multiple. - OEL-2292 ([@tibi2303](https://github.com/tibi2303))
* [#521](https://github.com/openeuropa/bootstrap-component-library/pull/521) feat(inpage): Fixed inpage navigation for ucpkn and joinup - OEL-2265 ([@tibi2303](https://github.com/tibi2303))

#### :nail_care: Enhancement
* [#534](https://github.com/openeuropa/bootstrap-component-library/pull/534) feat(prefix-styles): Added prefix config for styles. - OEL-2373 ([@tibi2303](https://github.com/tibi2303))
* [#523](https://github.com/openeuropa/bootstrap-component-library/pull/523) feat(offcanvas): Fixed offcanvas close button - OEL-2277 ([@tibi2303](https://github.com/tibi2303))
* [#512](https://github.com/openeuropa/bootstrap-component-library/pull/512) feat(icons): Added custom icons - OEL-2240 ([@tibi2303](https://github.com/tibi2303))
* [#478](https://github.com/openeuropa/bootstrap-component-library/pull/478) feat(landing): Added deprecated filter for story files - OEL-2090 ([@tibi2303](https://github.com/tibi2303))
* [#480](https://github.com/openeuropa/bootstrap-component-library/pull/480) feat(badges): Changed close icon on badge - OEL-2098 ([@tibi2303](https://github.com/tibi2303))

#### Committers: 2
- Dumitru Tiberiu-Andrei ([@tibi2303](https://github.com/tibi2303))
- Péter Keszthelyi ([@kp77](https://github.com/kp77))

## 1.0.0 (2023-01-10)

#### :nail_care: Enhancement
* [#472](https://github.com/openeuropa/bootstrap-component-library/pull/472) feat(documentation): Updated documentation - OEL-2078 ([@tibi2303](https://github.com/tibi2303))
* [#475](https://github.com/openeuropa/bootstrap-component-library/pull/475) feat(badges): Link inclusion - OEL-2066 ([@tibi2303](https://github.com/tibi2303))
* [#497](https://github.com/openeuropa/bootstrap-component-library/pull/497) feat(gallery): Raw filter used and fixed more items - OEL-2093 ([@tibi2303](https://github.com/tibi2303))
Expand All @@ -15,15 +82,13 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
* [#462](https://github.com/openeuropa/bootstrap-component-library/pull/462) feat(pagination): Refactored pagination - OEL-2061 ([@tibi2303](https://github.com/tibi2303))

#### :house: Internal

* [#491](https://github.com/openeuropa/bootstrap-component-library/pull/491) chore(deps): Update 06-12-2022 ([@tibi2303](https://github.com/tibi2303))
* [#489](https://github.com/openeuropa/bootstrap-component-library/pull/489) chore(deps): Update 17-11-2022 ([@tibi2303](https://github.com/tibi2303))
* [#485](https://github.com/openeuropa/bootstrap-component-library/pull/485) chore(deps): Updates 16-11-2022 ([@tibi2303](https://github.com/tibi2303))
* [#476](https://github.com/openeuropa/bootstrap-component-library/pull/476) chore(deps): Updates - 12-10-22 ([@planctus](https://github.com/planctus))
* [#471](https://github.com/openeuropa/bootstrap-component-library/pull/471) chore(deps): Updates 29-09-22 ([@planctus](https://github.com/planctus))

#### Committers: 2

- [@planctus](https://github.com/planctus)
- [@tibi2303](https://github.com/tibi2303)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Openeuropa Bootstrap Component Library template
## OEL Bootstrap based Component Library template

Library of components based on [Bootstrap 5](https://github.com/twbs/bootstrap/tree/v5.0.1)

Expand Down
6 changes: 3 additions & 3 deletions bootstrap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@openeuropa/bcl-bootstrap",
"author": "European Commission",
"license": "EUPL-1.2",
"version": "1.0.0",
"version": "1.2.2",
"description": "OE - BCL bootstrap 5 sources",
"bin": {
"plugins-builder": "./bin/build-plugins.js"
Expand All @@ -17,12 +17,12 @@
"prepublish": "npm-run-all clean copy-* build-plugins"
},
"devDependencies": {
"@rollup/plugin-babel": "6.0.3",
"@rollup/plugin-babel": "6.0.4",
"bootstrap": "5.2.3",
"bootstrap-icons": "1.10.4",
"copyfiles": "2.4.1",
"npm-run-all": "4.1.5",
"rimraf": "5.0.0"
"rimraf": "5.0.7"
},
"publishConfig": {
"access": "public"
Expand Down
41 changes: 20 additions & 21 deletions builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,36 @@
"name": "@openeuropa/bcl-builder",
"author": "European Commission",
"license": "EUPL-1.2",
"version": "1.0.0",
"version": "1.2.2",
"description": "Bootstrap Component Library builder",
"publishConfig": {
"access": "public"
},
"bin": {
"bcl-builder": "./bin/build.js"
},
"bin": "./bin/build.js",
"dependencies": {
"@babel/core": "7.21.4",
"@babel/preset-env": "7.21.4",
"@babel/runtime": "7.21.0",
"@popperjs/core": "2.11.7",
"@rollup/plugin-babel": "6.0.3",
"@rollup/plugin-commonjs": "24.1.0",
"@rollup/plugin-node-resolve": "15.0.2",
"@rollup/plugin-replace": "5.0.2",
"autoprefixer": "10.4.14",
"@babel/core": "7.24.7",
"@babel/preset-env": "7.24.7",
"@babel/runtime": "7.24.7",
"@popperjs/core": "2.11.8",
"@rollup/plugin-babel": "6.0.4",
"@rollup/plugin-commonjs": "25.0.8",
"@rollup/plugin-node-resolve": "15.2.3",
"@rollup/plugin-replace": "5.0.7",
"autoprefixer": "10.4.19",
"babel-eslint": "10.1.0",
"browser-sync": "2.29.1",
"commander": "10.0.0",
"browser-sync": "3.0.2",
"commander": "11.1.0",
"copyfiles": "2.4.1",
"cross-env": "7.0.3",
"cssnano": "6.0.0",
"postcss": "8.4.21",
"rollup": "3.20.2",
"cssnano": "6.1.2",
"postcss": "8.4.39",
"postcss-prefix-selector": "^1.16.1",
"rollup": "3.29.4",
"rollup-plugin-istanbul": "4.0.0",
"rollup-plugin-terser": "7.0.2",
"sass": "1.62.0",
"svg-sprite": "2.0.2",
"svgo": "3.0.2"
"sass": "1.77.6",
"svg-sprite": "2.0.4",
"svgo": "3.3.2"
},
"engines": {
"node": ">=14.0.0"
Expand Down
22 changes: 18 additions & 4 deletions builder/scripts/sprite.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
/**
* Generate svg sprites.
*
* @param {string} entry - Path to a folder or file.
* @param {string} entry - array of paths to a folder or file.
* @param {string} dest - Output folder path
* @param {object} options - Object
*
* Example config object: {
*
* sprite: [
* {
* entry: path.resolve(nodeModules, "bootstrap-icons/icons/"),
* entry: [
* path.resolve(nodeModules, "bootstrap-icons/icons/"),
* path.resolve(__dirname, "src/icons/custom-icons")
* ],
* dest: path.resolve(outputFolder, "icons/"),
* options: {
* file: "bcl-default-icons.svg",
Expand All @@ -28,10 +31,13 @@ const defaultPlugins = require("../conf/svgoDefaultPlugins");
const SVGSpriter = require("svg-sprite");

module.exports = (entry, dest, options) => {
const iconList = Array.isArray(options.list)
? options.list.flat(1)
: options.list;
const outputFile = options.file
? `${dest}/${options.file}`
: `${dest}/bcl-default-icons.svg`;
const files = options.list || globSync("*.svg", { cwd: entry });
const files = iconList || globSync("*.svg", { cwd: entry });

const plugins = options.transformPlugins || defaultPlugins;

Expand Down Expand Up @@ -60,7 +66,15 @@ module.exports = (entry, dest, options) => {
});

files.forEach((file) => {
const filePath = path.resolve(entry, file);
let filePath;
if (Array.isArray(entry)) {
filePath = path.resolve(entry[0], file);
if (!fs.existsSync(filePath)) {
filePath = path.resolve(entry[1], file);
}
} else {
filePath = path.resolve(entry, file);
}
spriter.add(
filePath,
file,
Expand Down
20 changes: 20 additions & 0 deletions builder/scripts/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const path = require("path");
const fs = require("fs");
const postcss = require("postcss");
const cssnano = require("cssnano");
const prefixer = require("postcss-prefix-selector");
const autoprefixer = require("autoprefixer");

const getPlugins = (options) => {
Expand Down Expand Up @@ -63,6 +64,25 @@ const buildStyles = (entry, dest, options) => {
});

postcss(plugins)
.use(
prefixer({
prefix: options.prefix ? options.prefix : "",

transform: function (
prefix,
selector,
prefixedSelector,
filePath,
rule
) {
if (prefix) {
return prefixedSelector;
} else {
return selector;
}
},
})
)
.process(sassResult.css, {
map:
postcssSourceMap === "file"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.0",
"version": "1.2.2",
"npmClient": "yarn",
"useWorkspaces": true,
"changelog": {
Expand Down
61 changes: 30 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "oe-bootstrap-component-library",
"version": "0.1.0",
"private": true,
"description": "Openeuropa Bootstrap Component Library",
"description": "OEL Component Library",
"author": "EUROPEAN COMMISSION",
"license": "EUPL",
"repository": {
Expand Down Expand Up @@ -105,47 +105,46 @@
]
},
"devDependencies": {
"@babel/cli": "7.21.0",
"@babel/core": "7.21.4",
"@babel/eslint-parser": "7.21.3",
"@babel/plugin-transform-runtime": "7.21.4",
"@babel/preset-env": "7.21.4",
"@babel/preset-react": "7.18.6",
"@size-limit/preset-big-lib": "8.2.4",
"babel-jest": "29.5.0",
"browser-sync": "2.29.1",
"browser-update": "3.3.44",
"@babel/cli": "7.24.7",
"@babel/core": "7.24.7",
"@babel/eslint-parser": "7.24.7",
"@babel/plugin-transform-runtime": "7.24.7",
"@babel/preset-env": "7.24.7",
"@babel/preset-react": "7.24.7",
"@size-limit/preset-big-lib": "11.1.4",
"babel-jest": "29.7.0",
"browser-sync": "3.0.2",
"browser-update": "3.3.53",
"chromatic": "6.17.3",
"copyfiles": "2.4.1",
"eslint": "8.38.0",
"eslint": "8.57.0",
"eslint-config-airbnb": "19.0.4",
"eslint-config-airbnb-base": "15.0.0",
"eslint-config-prettier": "8.8.0",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-jest": "27.2.1",
"eslint-plugin-prettier": "4.2.1",
"glob": "10.0.0",
"eslint-config-prettier": "8.10.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-jest": "27.9.0",
"eslint-plugin-prettier": "5.1.3",
"glob": "10.3.3",
"husky": "8.0.3",
"jest": "29.5.0",
"jest-axe": "6.0.0",
"jest-environment-jsdom": "29.5.0",
"lerna": "6.6.1",
"jest": "29.7.0",
"jest-axe": "6.0.1",
"jest-environment-jsdom": "29.7.0",
"lerna": "6.6.2",
"lerna-changelog": "2.2.0",
"lint-staged": "13.2.1",
"lint-staged": "13.3.0",
"npm-run-all": "4.1.5",
"patch-package": "6.5.1",
"postcss-scss": "4.0.6",
"prettier": "2.8.7",
"rimraf": "5.0.0",
"size-limit": "8.2.4",
"patch-package": "8.0.0",
"postcss-scss": "4.0.9",
"prettier": "2.8.8",
"rimraf": "5.0.7",
"size-limit": "11.1.4",
"slim-select": "1.27.1",
"stylelint": "15.3.0",
"stylelint": "15.11.0",
"stylelint-config-prettier": "9.0.5",
"stylelint-config-recommended-scss": "9.0.1"
},
"resolutions": {
"ua-parser-js": ">=1.0.33",
"http-cache-semantics": ">=4.1.1",
"cacheable-request": ">=10.2.7"
"semver": ">=7.5.2",
"axios": ">=0.28.0"
}
}
1 change: 1 addition & 0 deletions src/components/bcl-accordion/accordion.story.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ export default {
title: "Paragraphs/Accordion",
decorators: [withCode, withDesign],
parameters: {
badges: ["deprecated"],
design: [
{
name: "Mockup",
Expand Down
Loading

0 comments on commit e477c41

Please sign in to comment.