Skip to content

Commit a940d9e

Browse files
vforgevforge
authored
Merge d9f279b into 987c4c1 
2 parents 987c4c1 + d9f279b commit a940d9e

32 files changed

+4110
-2216
lines changed

‎.eslintrc‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,17 @@
1818
}
1919
},
2020
"rules": {
21+
"template-curly-spacing": [
22+
"off"
23+
],
2124
"indent": [
2225
"error",
2326
4,
2427
{
25-
"SwitchCase": 1
28+
"SwitchCase": 1,
29+
"ignoredNodes": [
30+
"TemplateLiteral"
31+
]
2632
}
2733
],
2834
"comma-dangle": [
@@ -70,7 +76,6 @@
7076
}],
7177
"jest/no-disabled-tests": "error",
7278
"jest/no-focused-tests": "error",
73-
"jest/no-hooks": "warn",
7479
"jest/no-identical-title": "error",
7580
"jest/no-jest-import": "error",
7681
"jest/prefer-to-have-length": "warn",
@@ -81,7 +86,18 @@
8186
"jsx-a11y/label-has-for": 0,
8287
"jsx-a11y/click-events-have-key-events": 0,
8388
"jsx-a11y/no-static-element-interactions": 0,
84-
"jsx-a11y/no-noninteractive-element-interactions": 0
89+
"jsx-a11y/no-noninteractive-element-interactions": 0,
90+
"react/jsx-props-no-spreading": 0,
91+
"react/jsx-fragments": 0,
92+
"react/static-property-placement": 0,
93+
"react/sort-comp": 0,
94+
"react/jsx-curly-newline": 0,
95+
"react/state-in-constructor": 0,
96+
"no-mixed-operators": 0,
97+
"arrow-parens": 0,
98+
"camelcase": 0,
99+
"max-classes-per-file": 0,
100+
"jest/no-hooks": 0
85101
},
86102
"plugins": [
87103
"react",

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ typings/
6262

6363
# Visual Studio
6464
.vscode/
65+
.history/
6566

6667
# Miscellaneous cache files
6768
.DS_Store

‎config/config.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,5 @@ module.exports = {
2828
* to `package.json`'s `dependencies`.
2929
*/
3030
additionalDependencies: [
31-
// we ony use one function from date-fns
32-
'date-fns/distance_in_words_strict',
3331
],
3432
};

‎config/rollup.config.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import fs from 'fs-extra';
22
import glob from 'glob';
33
import babel from 'rollup-plugin-babel';
4-
import resolve from 'rollup-plugin-node-resolve';
4+
import resolve from '@rollup/plugin-node-resolve';
55
import postprocess from 'rollup-plugin-postprocess';
66
import sass from 'rollup-plugin-sass';
7-
import commonjs from 'rollup-plugin-commonjs';
8-
import string from 'rollup-plugin-string/dist/rollup-plugin-string';
7+
import commonjs from '@rollup/plugin-commonjs';
8+
import { string } from 'rollup-plugin-string';
99
import svg from 'rollup-plugin-react-svg';
1010

1111
const config = require('./config');

‎docs/build/1.1c19e957.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/build/1.473e5f0c.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/build/bundle.09de56a6.js‎

Lines changed: 71 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/build/bundle.b9f3113a.js‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎docs/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>react-common</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Rubik:300,300i,400,400i,500,500i,700,700i,900,900i&display=swap"></head><body><div id="rsg-root"></div><div id="app"></div><script src="build/bundle.b9f3113a.js"></script></body></html>
1+
<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>react-common</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Rubik:300,300i,400,400i,500,500i,700,700i,900,900i&display=swap"></head><body><div id="rsg-root"></div><div id="app"></div><script src="build/bundle.09de56a6.js"></script></body></html>

‎package.json‎

Lines changed: 61 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"git:reset": "git checkout master && git pull",
1717
"lib:build": "rollup -c config/rollup.config.js",
1818
"lint": "yarn lint:js && yarn lint:css",
19-
"lint:css": "stylelint \"source/components/*.scss\" \"source/components/*.css\"",
20-
"lint:fix": "stylelint \"source/components/*.scss\" \"source/components/*.css\" --fix",
19+
"lint:css": "stylelint \"source/components/**/*.scss\" \"source/components/**/*.css\"",
20+
"lint:fix": "stylelint \"source/components/**/*.scss\" \"source/components/**/*.css\" --fix",
2121
"lint:js": "eslint --cache .",
2222
"extract-assets-from-ds": "node ./scripts/extract-assets-from-ds.js && yarn generate-icons-demo",
2323
"generate-icons-demo": "node ./scripts/generate-icons-demo.js",
@@ -37,82 +37,81 @@
3737
"dependencies": {
3838
"classnames": "^2.2.6",
3939
"color": "^3.1.2",
40-
"date-fns": "^1.29.0",
4140
"design-system": "git://github.com/Wikia/design-system.git#22.8.0",
42-
"i18next": "^14.0.1",
41+
"i18next": "^19.3.2",
4342
"immutable": "^4.0.0-rc.12",
44-
"lodash": "^4.17.11",
45-
"prop-types": "^15.6.2",
46-
"react": "^16.8.3",
47-
"react-dom": "^16.8.3",
48-
"react-i18next": "^10.0.0",
43+
"lodash": "^4.17.15",
44+
"prop-types": "^15.7.2",
45+
"react": "^16.13.0",
46+
"react-dom": "^16.13.0",
47+
"react-i18next": "^11.3.3",
4948
"react-redux": "^5.0.7",
50-
"react-select": "^2.1.1",
49+
"react-select": "^3.0.8",
5150
"styled-components": "^4.1.3"
5251
},
5352
"devDependencies": {
54-
"@babel/core": "^7.1.6",
55-
"@babel/node": "^7.0.0",
56-
"@babel/plugin-external-helpers": "^7.0.0",
57-
"@babel/plugin-proposal-class-properties": "^7.1.0",
58-
"@babel/plugin-proposal-export-default-from": "^7.2.0",
59-
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
60-
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
61-
"@babel/preset-env": "^7.0.0",
62-
"@babel/preset-react": "^7.0.0",
53+
"@babel/core": "^7.8.7",
54+
"@babel/node": "^7.8.7",
55+
"@babel/plugin-external-helpers": "^7.8.3",
56+
"@babel/plugin-proposal-class-properties": "^7.8.3",
57+
"@babel/plugin-proposal-export-default-from": "^7.8.3",
58+
"@babel/plugin-proposal-object-rest-spread": "^7.8.3",
59+
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
60+
"@babel/preset-env": "^7.8.7",
61+
"@babel/preset-react": "^7.8.3",
62+
"@rollup/plugin-commonjs": "^11.0.2",
63+
"@rollup/plugin-node-resolve": "^7.1.1",
6364
"babel-core": "^7.0.0-bridge.0",
64-
"babel-eslint": "^10.0.1",
65-
"babel-jest": "^23.6.0",
66-
"babel-loader": "^8.0.4",
67-
"babel-plugin-styled-components": "^1.10.0",
68-
"concurrently": "^4.1.0",
69-
"coveralls": "^3.0.2",
70-
"enzyme": "^3.10.0",
71-
"enzyme-adapter-react-16": "^1.14.0",
65+
"babel-eslint": "^10.1.0",
66+
"babel-jest": "^25.1.0",
67+
"babel-loader": "^8.0.6",
68+
"babel-plugin-styled-components": "^1.10.7",
69+
"concurrently": "^5.1.0",
70+
"coveralls": "^3.0.9",
71+
"enzyme": "^3.11.0",
72+
"enzyme-adapter-react-16": "^1.15.2",
7273
"enzyme-redux": "^0.2.1",
73-
"enzyme-to-json": "^3.3.5",
74-
"eslint": "^5.9.0",
75-
"eslint-config-airbnb": "^17.1.0",
76-
"eslint-plugin-import": "^2.14.0",
77-
"eslint-plugin-jest": "^22.0.0",
78-
"eslint-plugin-jsx-a11y": "^6.1.2",
79-
"eslint-plugin-react": "^7.11.1",
80-
"fs-extra": "^7.0.1",
81-
"glob": "^7.1.3",
74+
"enzyme-to-json": "^3.4.4",
75+
"eslint": "^6.8.0",
76+
"eslint-config-airbnb": "^18.0.1",
77+
"eslint-plugin-import": "^2.20.1",
78+
"eslint-plugin-jest": "^23.8.2",
79+
"eslint-plugin-jsx-a11y": "^6.2.3",
80+
"eslint-plugin-react": "^7.18.3",
81+
"fs-extra": "^8.1.0",
82+
"glob": "^7.1.6",
8283
"identity-obj-proxy": "^3.0.0",
83-
"jest": "^24.8.0",
84-
"mkdirp": "^0.5.1",
85-
"node-sass": "^4.10.0",
84+
"jest": "^25.1.0",
85+
"mkdirp": "^1.0.3",
86+
"node-sass": "^4.13.1",
8687
"path": "^0.12.7",
8788
"postcss-modules": "^1.4.1",
88-
"raw-loader": "^1.0.0",
89+
"raw-loader": "^4.0.0",
8990
"react-docgen": "3.0.0",
9091
"react-styleguidist": "^8.0.6",
91-
"react-svg-loader": "^2.1.0",
92-
"react-test-renderer": "^16.8.3",
93-
"redux": "^4.0.0",
92+
"react-svg-loader": "^3.0.3",
93+
"react-test-renderer": "^16.13.0",
94+
"redux": "^4.0.5",
9495
"redux-test-utils": "^0.3.0",
95-
"rimraf": "^2.6.2",
96-
"rollup": "^0.68.0",
97-
"rollup-plugin-babel": "^4.0.3",
98-
"rollup-plugin-commonjs": "^9.2.0",
99-
"rollup-plugin-node-resolve": "^4.0.0",
100-
"rollup-plugin-postcss": "^2.0.0",
96+
"rimraf": "^3.0.2",
97+
"rollup": "^1.20.0",
98+
"rollup-plugin-babel": "^4.3.3",
99+
"rollup-plugin-postcss": "^2.2.0",
101100
"rollup-plugin-postprocess": "^1.0.2",
102-
"rollup-plugin-react-svg": "^2.1.0",
103-
"rollup-plugin-sass": "^1.0.0",
104-
"rollup-plugin-string": "^2.0.2",
105-
"rollup-plugin-svg": "^1.0.1",
106-
"sass-loader": "^7.1.0",
107-
"semver": "^5.6.0",
108-
"sinon": "^7.1.1",
109-
"stylelint": "^9.8.0",
101+
"rollup-plugin-react-svg": "^3.0.3",
102+
"rollup-plugin-sass": "^1.2.2",
103+
"rollup-plugin-string": "^3.0.0",
104+
"rollup-plugin-svg": "^2.0.0",
105+
"sass-loader": "^8.0.2",
106+
"semver": "^7.1.3",
107+
"sinon": "^9.0.0",
108+
"stylelint": "^13.2.0",
110109
"stylelint-config-fandom": "git://github.com/Wikia/stylelint-config-fandom.git#0.0.1",
111-
"stylelint-order": "^2.0.0",
112-
"stylelint-scss": "^3.4.0",
113-
"waait": "^1.0.4",
114-
"webpack": "^4.26.0",
115-
"webpack-cli": "^3.1.2"
110+
"stylelint-order": "^4.0.0",
111+
"stylelint-scss": "^3.14.2",
112+
"waait": "^1.0.5",
113+
"webpack": "^4.42.0",
114+
"webpack-cli": "^3.3.11"
116115
},
117116
"publishConfig": {
118117
"registry": "https://artifactory.wikia-inc.com/artifactory/api/npm/wikia-npm/"

0 commit comments

Comments
 (0)