Skip to content

Commit

Permalink
Merge 3e26676 into b8c91e1
Browse files Browse the repository at this point in the history
  • Loading branch information
@eszthoff
eszthoff committed Mar 30, 2020
2 parents b8c91e1 + 3e26676 commit 33d8151
Show file tree
Hide file tree
Showing 8 changed files with 20,605 additions and 23,336 deletions.
9 changes: 6 additions & 3 deletions .babelrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,21 @@
"env": {
"development": {
"presets": [
["@babel/preset-env", { "useBuiltIns": "entry", "modules": false }],
["@babel/preset-env", { "useBuiltIns": "entry", "corejs": "3", "modules": false }],
"@babel/preset-react"
]
},
"production": {
"presets": [
["@babel/preset-env", { "useBuiltIns": "entry", "modules": false }],
["@babel/preset-env", { "useBuiltIns": "entry", "corejs": "3", "modules": false }],
"@babel/preset-react"
]
},
"test": {
"presets": [["@babel/preset-env", { "useBuiltIns": "entry" }], "@babel/preset-react"]
"presets": [
["@babel/preset-env", { "useBuiltIns": "entry", "corejs": "3" }],
"@babel/preset-react"
]
}
},
"plugins": [
Expand Down
43,822 changes: 20,556 additions & 23,266 deletions package-lock.json
View file

Large diffs are not rendered by default.

84 changes: 40 additions & 44 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"husky": {
"hooks": {
"pre-commit": "npm-run-all --parallel tsc test lint:*"
"pre-commit": "npm-run-all --parallel tsc test lint:ci lint:styles"
}
},
"repository": {
Expand All @@ -49,12 +49,11 @@
"homepage": "https://github.com/textkernel/oneui#readme",
"sideEffects": false,
"dependencies": {
"@babel/polyfill": "7.0.0",
"@popperjs/core": "2.0.5",
"@react-google-maps/api": "1.5.4",
"@textkernel/bem": "0.2.4",
"@tippy.js/react": "3.1.1",
"css-vars-ponyfill": "1.16.4",
"css-vars-ponyfill": "^2.2.1",
"downshift": "3.2.10",
"fast-memoize": "2.5.1",
"prop-types": "^15.7.2",
Expand All @@ -69,80 +68,77 @@
"react-transition-group": "^4.3.0"
},
"devDependencies": {
"@babel/cli": "7.1.0",
"@babel/core": "7.1.0",
"@babel/plugin-proposal-class-properties": "7.1.0",
"@babel/plugin-proposal-decorators": "7.1.0",
"@babel/preset-env": "7.1.0",
"@babel/preset-react": "7.0.0",
"@babel/cli": "^7.8.4",
"@babel/core": "^7.9.0",
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/plugin-proposal-decorators": "^7.8.3",
"@babel/preset-env": "^7.9.0",
"@babel/preset-react": "^7.9.4",
"@sambego/storybook-state": "2.0.1",
"@storybook/addon-actions": "5.3.9",
"@storybook/addon-console": "1.2.1",
"@storybook/addon-info": "5.3.9",
"@storybook/addon-knobs": "5.3.9",
"@storybook/react": "5.3.9",
"@storybook/storybook-deployer": "2.8.1",
"@types/jest": "24.0.21",
"@types/jest": "^24.9.1",
"@types/node": "12.12.5",
"@types/react": "16.9.11",
"@types/react-virtualized": "9.21.8",
"@typescript-eslint/eslint-plugin": "^2.25.0",
"@typescript-eslint/parser": "^2.25.0",
"autoprefixer": "9.1.5",
"babel-core": "7.0.0-bridge.0",
"babel-jest": "24.5.0",
"babel-loader": "8.0.2",
"autoprefixer": "^9.7.5",
"babel-jest": "^24.9.0",
"babel-loader": "^8.1.0",
"clean-webpack-plugin": "3.0.0",
"coveralls": "3.0.2",
"css-loader": "1.0.0",
"enzyme": "3.10.0",
"enzyme-adapter-react-16": "1.14.0",
"enzyme-to-json": "3.3.5",
"eslint": "6.8.0",
"core-js": "^3.6.4",
"coveralls": "^3.0.11",
"css-loader": "^3.4.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"enzyme-to-json": "^3.4.4",
"eslint": "^6.8.0",
"eslint-config-airbnb-typescript": "^7.2.0",
"eslint-config-prettier": "^6.0.0",
"eslint-loader": "3.0.3",
"eslint-plugin-import": "^2.20.1",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-react": "^7.19.0",
"eslint-plugin-react-hooks": "^2.0.1",
"file-loader": "4.2.0",
"html-webpack-plugin": "3.2.0",
"husky": "1.2.0",
"jest": "24.8.0",
"jest-css-modules-transform": "2.4.0",
"mini-css-extract-plugin": "0.4.3",
"node-sass": "4.12.0",
"file-loader": "^6.0.0",
"husky": "^4.2.3",
"jest": "^24.9.0",
"jest-css-modules-transform": "^4.0.0",
"mini-css-extract-plugin": "^0.9.0",
"node-sass": "^4.13.1",
"npm-run-all": "4.1.5",
"optimize-css-assets-webpack-plugin": "5.0.1",
"postcss-import": "12.0.0",
"postcss-loader": "3.0.0",
"precss": "3.1.2",
"optimize-css-assets-webpack-plugin": "^5.0.3",
"postcss-import": "^12.0.1",
"postcss-loader": "^3.0.0",
"prettier": "^2.0.2",
"react": "16.8.6",
"react-docgen-typescript-loader": "3.4.0",
"react-dom": "16.8.6",
"react-icons": "3.7.0",
"react-router-dom": "4.3.1",
"react-transition-group": "4.3.0",
"regenerator-runtime": "0.13.3",
"sass-loader": "7.1.0",
"standard-version": "^6.0.1",
"style-loader": "0.23.0",
"regenerator-runtime": "^0.13.5",
"sass-loader": "^8.0.0",
"standard-version": "^7.1.0",
"style-loader": "^1.1.0",
"stylelint": "^13.2.1",
"stylelint-config-recommended": "^3.0.0",
"stylelint-config-recommended-scss": "^4.2.0",
"stylelint-order": "^4.0.0",
"stylelint-scss": "^3.16.0",
"stylelint-webpack-plugin": "1.2.3",
"terser-webpack-plugin": "1.2.3",
"ts-jest": "24.1.0",
"ts-loader": "6.2.1",
"stylelint-webpack-plugin": "^1.2.3",
"ts-jest": "^24.3.0",
"ts-loader": "^6.2.2",
"typescript": "^3.8.3",
"webpack": "4.28.1",
"webpack-bundle-analyzer": "3.3.2",
"webpack-cli": "3.2.1",
"webpack-dev-server": "3.1.14"
"webpack": "^4.42.1",
"webpack-bundle-analyzer": "^3.6.1",
"webpack-cli": "^3.3.11",
"webpack-dev-server": "^3.10.3"
}
}
6 changes: 2 additions & 4 deletions scripts/build/utils/utils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,8 @@ function getRuleSCSS({ styleLoader, localIdentName, includePaths, context }) {
{
loader: 'css-loader',
options: {
modules: true,
modules: { context, localIdentName },
importLoaders: 1,
localIdentName,
context,
},
},
{
Expand All @@ -52,7 +50,7 @@ function getRuleSCSS({ styleLoader, localIdentName, includePaths, context }) {
{
loader: 'sass-loader',
options: {
includePaths,
sassOptions: { includePaths },
},
},
],
Expand Down
1 change: 0 additions & 1 deletion src/components/List/ListItem/__tests__/ListItem.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ describe('ListItem component', () => {
);

expect(toJson(wrapper)).toMatchSnapshot();
expect(ref.current.props.Component.displayName).toEqual('ListItem');
});

it('should turn string items to Text', () => {
Expand Down
11 changes: 0 additions & 11 deletions src/components/List/__tests__/List.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,6 @@ describe('List component', () => {
expect(toJson(wrapper)).toMatchSnapshot();
expect(wrapper.find('ul').props()).not.toHaveProperty('onKeyDown');
});
it('should render correctly with ref', () => {
const ref = React.createRef();
mount(
<List ref={ref}>
<ListItem>Item 1</ListItem>
<ListItem>Item 2</ListItem>
</List>
);

expect(ref.current.props.Component.displayName).toEqual('List');
});
describe('enriching children with props', () => {
it('should not overwrite classes on children', () => {
wrapper = mount(
Expand Down
6 changes: 0 additions & 6 deletions src/components/Slider/__tests__/Slider.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,4 @@ describe('Slider component', () => {
const wrapper = mount(<Slider />);
expect(toJson(wrapper)).toMatchSnapshot();
});
it('should render correctly with ref', () => {
const ref = React.createRef();
mount(<Slider ref={ref} />);

expect(ref.current.props.Component.displayName).toEqual('Slider');
});
});
2 changes: 1 addition & 1 deletion src/utils/OneUI/OneUI.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import cssVarsPonyfill from 'css-vars-ponyfill';
* */
interface PonyfillOptions {
/** Targets */
rootElement?: HTMLElement | Node;
rootElement?: HTMLElement | Document;
shadowDOM?: boolean;

/** Sources */
Expand Down

0 comments on commit 33d8151

Please sign in to comment.