Skip to content

Commit

Permalink
Merge branch 'v2-dev' into docs/accordion-INNO-1629
Browse files Browse the repository at this point in the history
  • Loading branch information
@emeryro
emeryro committed Jul 15, 2019
2 parents 5a839f1 + 58c206d commit 077736a
Show file tree
Hide file tree
Showing 33 changed files with 1,225 additions and 1,200 deletions.
10 changes: 5 additions & 5 deletions examples/webpack4-eu/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"@ecl/eu-preset-website": "^2.8.0"
},
"devDependencies": {
"@babel/core": "7.4.5",
"@babel/preset-env": "7.4.5",
"autoprefixer": "9.6.0",
"@babel/core": "7.5.4",
"@babel/preset-env": "7.5.4",
"autoprefixer": "9.6.1",
"babel-loader": "8.0.6",
"css-loader": "3.0.0",
"cssnano": "4.1.10",
Expand All @@ -28,8 +28,8 @@
"resolve-url-loader": "3.1.0",
"sass-loader": "7.1.0",
"style-loader": "0.23.1",
"webpack": "4.35.0",
"webpack-cli": "3.3.4",
"webpack": "4.35.3",
"webpack-cli": "3.3.6",
"webpack-dev-server": "3.7.2"
},
"babel": {
Expand Down
10 changes: 5 additions & 5 deletions examples/webpack4/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"normalize.css": "8.0.1"
},
"devDependencies": {
"@babel/core": "7.4.5",
"@babel/preset-env": "7.4.5",
"autoprefixer": "9.6.0",
"@babel/core": "7.5.4",
"@babel/preset-env": "7.5.4",
"autoprefixer": "9.6.1",
"babel-loader": "8.0.6",
"css-loader": "3.0.0",
"cssnano": "4.1.10",
Expand All @@ -29,8 +29,8 @@
"resolve-url-loader": "3.1.0",
"sass-loader": "7.1.0",
"style-loader": "0.23.1",
"webpack": "4.35.0",
"webpack-cli": "3.3.4",
"webpack": "4.35.3",
"webpack-cli": "3.3.6",
"webpack-dev-server": "3.7.2"
},
"babel": {
Expand Down
22 changes: 11 additions & 11 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,20 @@
"devDependencies": {
"classnames": "2.2.6",
"eslint": "5.16.0",
"eslint-config-airbnb": "17.1.0",
"eslint-config-airbnb-base": "13.1.0",
"eslint-config-airbnb": "17.1.1",
"eslint-config-airbnb-base": "13.2.0",
"eslint-config-prettier": "5.0.0",
"eslint-plugin-import": "2.17.3",
"eslint-plugin-jest": "22.7.0",
"eslint-plugin-jsx-a11y": "6.2.1",
"eslint-plugin-import": "2.18.0",
"eslint-plugin-jest": "22.7.2",
"eslint-plugin-jsx-a11y": "6.2.3",
"eslint-plugin-prettier": "3.1.0",
"eslint-plugin-react": "7.13.0",
"eslint-plugin-unicorn": "9.1.0",
"eslint-plugin-react": "7.14.2",
"eslint-plugin-unicorn": "9.1.1",
"gh-pages": "2.0.1",
"husky": "2.4.1",
"husky": "3.0.0",
"lerna": "3.15.0",
"lerna-changelog": "0.8.2",
"lint-staged": "8.2.1",
"lint-staged": "9.2.0",
"npm-run-all": "4.1.5",
"patch-package": "6.1.2",
"postinstall-postinstall": "2.0.0",
Expand All @@ -57,8 +57,8 @@
"stylelint-config-prettier": "5.2.0",
"stylelint-config-sass-guidelines": "6.0.0",
"stylelint-config-standard": "18.3.0",
"stylelint-order": "3.0.0",
"stylelint-scss": "3.8.0",
"stylelint-order": "3.0.1",
"stylelint-scss": "3.9.1",
"stylelint-selector-bem-pattern": "2.1.0",
"svg4everybody": "2.1.9"
},
Expand Down
1 change: 1 addition & 0 deletions src/systems/ec/implementations/react/components/accordion/src/AccordionItem.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ AccordionItem.propTypes = {
toggle: PropTypes.shape({
label: PropTypes.string,
iconShape: PropTypes.string,
className: PropTypes.string,
}),
level: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
children: PropTypes.node,
Expand Down
1 change: 1 addition & 0 deletions src/systems/ec/implementations/react/components/accordion2/src/Accordion2Item.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ Accordion2Item.propTypes = {
id: PropTypes.string,
toggle: PropTypes.shape({
label: PropTypes.string,
className: PropTypes.string,
}),
level: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
children: PropTypes.node,
Expand Down
2 changes: 1 addition & 1 deletion src/systems/ec/implementations/react/components/description-list/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"devDependencies": {
"@ecl/ec-component-description-list": "^2.8.0",
"@ecl/ec-specs-description-list": "^2.8.0",
"html-react-parser": "^0.7.1"
"html-react-parser": "0.9.1"
},
"peerDependencies": {
"classnames": "^2.2.6",
Expand Down
2 changes: 1 addition & 1 deletion src/systems/ec/implementations/react/components/ordered-list/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"devDependencies": {
"@ecl/ec-component-ordered-list": "^2.8.0",
"@ecl/ec-specs-ordered-list": "^2.8.0",
"html-react-parser": "^0.7.1"
"html-react-parser": "0.9.1"
},
"peerDependencies": {
"classnames": "^2.2.6",
Expand Down
2 changes: 1 addition & 1 deletion src/systems/ec/implementations/react/components/timeline/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"devDependencies": {
"@ecl/ec-specs-timeline": "^2.8.0",
"html-react-parser": "0.7.1",
"html-react-parser": "0.9.1",
"lorem-ipsum": "2.0.3"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/systems/ec/implementations/react/components/timeline2/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"devDependencies": {
"@ecl/ec-specs-timeline2": "^2.8.0",
"html-react-parser": "0.7.1",
"html-react-parser": "0.9.1",
"lorem-ipsum": "2.0.3"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/systems/ec/implementations/react/components/unordered-list/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"devDependencies": {
"@ecl/ec-component-unordered-list": "^2.8.0",
"@ecl/ec-specs-unordered-list": "^2.8.0",
"html-react-parser": "^0.7.1"
"html-react-parser": "0.9.1"
},
"peerDependencies": {
"classnames": "^2.2.6",
Expand Down
1 change: 1 addition & 0 deletions src/systems/ec/implementations/react/page-structure/site-header/src/SiteHeader.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ SiteHeader.propTypes = {
alt: PropTypes.string,
language: PropTypes.string,
href: PropTypes.string,
className: PropTypes.string,
}),
languageSelector: PropTypes.shape({
href: PropTypes.string,
Expand Down
8 changes: 4 additions & 4 deletions src/systems/ec/implementations/react/storybook/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"start": "start-storybook -p 6006 -s ../../vanilla/packages/ec-preset-website/dist,../../vanilla/packages/ec-preset-legacy-website/dist -c .storybook"
},
"devDependencies": {
"@babel/core": "7.4.5",
"@babel/plugin-proposal-export-default-from": "7.2.0",
"@babel/plugin-proposal-export-namespace-from": "7.2.0",
"@babel/core": "7.5.4",
"@babel/plugin-proposal-export-default-from": "7.5.2",
"@babel/plugin-proposal-export-namespace-from": "7.5.2",
"@babel/plugin-syntax-dynamic-import": "7.2.0",
"@babel/runtime": "7.4.5",
"@babel/runtime": "7.5.4",
"@ecl/story-wrapper": "^2.8.0",
"@storybook/addon-a11y": "5.1.9",
"@storybook/addon-cssresources": "5.1.9",
Expand Down
2 changes: 1 addition & 1 deletion src/systems/ec/resources/icons/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"devDependencies": {
"rimraf": "2.6.3",
"svg-sprite": "1.5.0",
"svgo": "1.2.2",
"svgo": "1.3.0",
"xml2js": "0.4.19"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion src/systems/ec/resources/social-icons/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"devDependencies": {
"rimraf": "2.6.3",
"svg-sprite": "1.5.0",
"svgo": "1.2.2"
"svgo": "1.3.0"
},
"publishConfig": {
"access": "public"
Expand Down
1 change: 1 addition & 0 deletions src/systems/eu/implementations/react/components/accordion/src/AccordionItem.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ AccordionItem.propTypes = {
toggle: PropTypes.shape({
label: PropTypes.string,
iconShape: PropTypes.string,
className: PropTypes.string,
}),
level: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
children: PropTypes.node,
Expand Down
1 change: 1 addition & 0 deletions src/systems/eu/implementations/react/components/accordion2/src/Accordion2Item.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ Accordion2Item.propTypes = {
id: PropTypes.string,
toggle: PropTypes.shape({
label: PropTypes.string,
className: PropTypes.string,
}),
level: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
children: PropTypes.node,
Expand Down
2 changes: 1 addition & 1 deletion src/systems/eu/implementations/react/components/description-list/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"devDependencies": {
"@ecl/eu-component-description-list": "^2.8.0",
"@ecl/eu-specs-description-list": "^2.8.0",
"html-react-parser": "^0.7.1"
"html-react-parser": "0.9.1"
},
"peerDependencies": {
"classnames": "^2.2.6",
Expand Down
2 changes: 1 addition & 1 deletion src/systems/eu/implementations/react/components/ordered-list/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"devDependencies": {
"@ecl/eu-component-ordered-list": "^2.8.0",
"@ecl/eu-specs-ordered-list": "^2.8.0",
"html-react-parser": "^0.7.1"
"html-react-parser": "0.9.1"
},
"peerDependencies": {
"classnames": "^2.2.6",
Expand Down
2 changes: 1 addition & 1 deletion src/systems/eu/implementations/react/components/timeline/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"devDependencies": {
"@ecl/eu-specs-timeline": "^2.8.0",
"html-react-parser": "0.7.1",
"html-react-parser": "0.9.1",
"lorem-ipsum": "2.0.3"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/systems/eu/implementations/react/components/timeline2/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"devDependencies": {
"@ecl/eu-specs-timeline2": "^2.8.0",
"html-react-parser": "0.7.1",
"html-react-parser": "0.9.1",
"lorem-ipsum": "2.0.3"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/systems/eu/implementations/react/components/unordered-list/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"devDependencies": {
"@ecl/eu-component-unordered-list": "^2.8.0",
"@ecl/eu-specs-unordered-list": "^2.8.0",
"html-react-parser": "^0.7.1"
"html-react-parser": "0.9.1"
},
"peerDependencies": {
"classnames": "^2.2.6",
Expand Down
5 changes: 5 additions & 0 deletions src/systems/eu/implementations/react/page-structure/footer/src/Footer.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,11 @@ Footer.propTypes = {
backToTop: PropTypes.shape(Link.propTypes),
identity: PropTypes.shape({
title: PropTypes.string,
follow: PropTypes.shape({
label: PropTypes.string,
links: PropTypes.arrayOf(PropTypes.shape(Link.propTypes)),
}),
info: PropTypes.arrayOf(PropTypes.shape(Link.propTypes)),
links: PropTypes.arrayOf(PropTypes.shape(Link.propTypes)),
}),
sections: PropTypes.arrayOf(
Expand Down
1 change: 1 addition & 0 deletions src/systems/eu/implementations/react/page-structure/site-header/src/SiteHeader.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ SiteHeader.propTypes = {
alt: PropTypes.string,
language: PropTypes.string,
href: PropTypes.string,
className: PropTypes.string,
}),
languageSelector: PropTypes.shape({
href: PropTypes.string,
Expand Down
8 changes: 4 additions & 4 deletions src/systems/eu/implementations/react/storybook/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"start": "start-storybook -p 9001 -s ../../vanilla/packages/eu-preset-website/dist,../../vanilla/packages/eu-preset-legacy-website/dist -c .storybook"
},
"devDependencies": {
"@babel/core": "7.4.5",
"@babel/plugin-proposal-export-default-from": "7.2.0",
"@babel/plugin-proposal-export-namespace-from": "7.2.0",
"@babel/core": "7.5.4",
"@babel/plugin-proposal-export-default-from": "7.5.2",
"@babel/plugin-proposal-export-namespace-from": "7.5.2",
"@babel/plugin-syntax-dynamic-import": "7.2.0",
"@babel/runtime": "7.4.5",
"@babel/runtime": "7.5.4",
"@ecl/story-wrapper": "^2.8.0",
"@storybook/addon-a11y": "5.1.9",
"@storybook/addon-cssresources": "5.1.9",
Expand Down
2 changes: 1 addition & 1 deletion src/systems/eu/resources/icons/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"devDependencies": {
"rimraf": "2.6.3",
"svg-sprite": "1.5.0",
"svgo": "1.2.2"
"svgo": "1.3.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion src/systems/eu/resources/social-icons/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"devDependencies": {
"rimraf": "2.6.3",
"svg-sprite": "1.5.0",
"svgo": "1.2.2"
"svgo": "1.3.0"
},
"publishConfig": {
"access": "public"
Expand Down
20 changes: 10 additions & 10 deletions src/tools/builder/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@
"ecl-builder": "./bin/build.js"
},
"dependencies": {
"@babel/core": "7.4.5",
"@babel/preset-env": "7.4.5",
"@babel/runtime": "7.4.5",
"autoprefixer": "9.6.0",
"@babel/core": "7.5.4",
"@babel/preset-env": "7.5.4",
"@babel/runtime": "7.5.4",
"autoprefixer": "9.6.1",
"babel-eslint": "10.0.2",
"browserslist": "4.6.3",
"browserslist": "4.6.6",
"commander": "2.20.0",
"cssnano": "4.1.10",
"globby": "9.2.0",
"globby": "10.0.1",
"mkdirp": "0.5.1",
"ncp": "2.0.0",
"node-sass": "4.12.0",
"postcss": "7.0.17",
"postcss-banner": "3.0.1",
"rollup": "1.15.6",
"rollup-plugin-babel": "4.3.2",
"rollup-plugin-commonjs": "10.0.0",
"rollup-plugin-node-resolve": "5.0.3",
"rollup": "1.17.0",
"rollup-plugin-babel": "4.3.3",
"rollup-plugin-commonjs": "10.0.1",
"rollup-plugin-node-resolve": "5.2.0",
"rollup-plugin-uglify": "6.0.2"
},
"engines": {
Expand Down
4 changes: 3 additions & 1 deletion src/tools/storybook-addon-code/components/CodeToggle.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ export class CodeToggle extends Component {
}

CodeToggle.propTypes = {
channel: PropTypes.shape({}).isRequired,
channel: PropTypes.shape({
emit: PropTypes.func,
}).isRequired,
};

export default CodeToggle;
4 changes: 3 additions & 1 deletion src/tools/storybook-addon-code/components/PreviewWrapper.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ export class PreviewWrapper extends Component {
}

PreviewWrapper.propTypes = {
channel: PropTypes.shape({}).isRequired,
channel: PropTypes.shape({
on: PropTypes.func,
}).isRequired,
children: PropTypes.node.isRequired,
};

Expand Down

0 comments on commit 077736a

Please sign in to comment.