Skip to content

Commit b6d6fc3

Browse files
baohousejulianguyen
authored andcommitted
Reverting React lib update; restoring yarn.lock (ifmeorg#867)
* Updating React lib version * Revert "Updating React lib version" This reverts commit d4cf588. * Changing karma test output * Retaining babel-env preset * Updating rails-html-sanitizer gem To pass CircleCI
1 parent 4eb6c4b commit b6d6fc3

File tree

7 files changed

+761
-1873
lines changed

7 files changed

+761
-1873
lines changed

Gemfile.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ GEM
222222
logging (2.2.2)
223223
little-plugger (~> 1.1)
224224
multi_json (~> 1.10)
225-
loofah (2.2.1)
225+
loofah (2.2.2)
226226
crass (~> 1.0.2)
227227
nokogiri (>= 1.5.9)
228228
mail (2.7.0)
@@ -315,8 +315,8 @@ GEM
315315
activesupport (>= 3.2)
316316
choice (~> 0.2.0)
317317
ruby-graphviz (~> 1.2)
318-
rails-html-sanitizer (1.0.3)
319-
loofah (~> 2.0)
318+
rails-html-sanitizer (1.0.4)
319+
loofah (~> 2.2, >= 2.2.2)
320320
rails-i18n (5.0.4)
321321
i18n (~> 0.7)
322322
railties (~> 5.0)

client/.babelrc

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
2-
"presets": ["flow", "env", "stage-2", "react"],
2+
"presets": [
3+
"env",
4+
"flow",
5+
"react",
6+
"stage-2"
7+
],
38
"env": {
49
"test": {
510
"plugins": [
@@ -12,4 +17,4 @@
1217
]
1318
}
1419
}
15-
}
20+
}

client/README.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
This `client` folder is generated by the React on Rails gem.
44

5+
NOTE: Avoid updating NPM package dependency versions, and do not recreate the `yarn.lock` file.
6+
The package dependencies are in a fragile state where their versions as defined in the `yarn.lock`
7+
file is necessary to have Karma tests correctly working.
8+
59
See documentation [at github.com/shakacode/react_on_rails](https://github.com/shakacode/react_on_rails) for details on how it is organized.
610

711
If you need additional help, please consider:

client/karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ module.exports = function (config) {
3636
'app/**/*.jsx': ['webpack', 'sourcemap'],
3737
},
3838
// todo output test debugger
39-
reporters: ['dots'],
39+
reporters: ['spec'],
4040
webpack: webpackConfig,
4141
webpackServer: {
4242
noInfo: true,

client/package.json

+20-20
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,16 @@
1919
"client/node_modules"
2020
],
2121
"dependencies": {
22+
"babel-cli": "^6.24.1",
23+
"babel-core": "^6.24.1",
2224
"babel-loader": "^6.3.2",
2325
"babel-polyfill": "^6.23.0",
26+
"babel-preset-react": "^6.24.1",
27+
"babel-preset-stage-2": "^6.24.1",
2428
"babel-runtime": "^6.23.0",
25-
"chart.js": "^2.7.2",
29+
"chart.js": "^2.6.0",
2630
"chartjs": "^0.3.24",
27-
"chartkick": "^2.3.3",
31+
"chartkick": "^2.2.4",
2832
"es5-shim": "^4.5.9",
2933
"expose-loader": "^0.7.3",
3034
"file-loader": "^1.1.6",
@@ -35,10 +39,10 @@
3539
"js-yaml": "^3.8.2",
3640
"lodash": "^4.17.4",
3741
"prop-types": "^15.5.10",
38-
"react": "^16.2.0",
39-
"react-chartkick": "^0.1.6",
40-
"react-dom": "^16.2.0",
41-
"react-intl": "^2.4.0",
42+
"react": "^15.5.4",
43+
"react-chartkick": "^0.1.3",
44+
"react-dom": "^15.5.4",
45+
"react-intl": "^2.1.5",
4246
"react-on-rails": "8.0.6",
4347
"redux": "^3.7.2",
4448
"shortid": "^2.2.8",
@@ -49,23 +53,18 @@
4953
"yml-loader": "^2.1.0"
5054
},
5155
"devDependencies": {
52-
"@storybook/addon-actions": "^3.3.15",
56+
"@storybook/addon-actions": "^3.2.0",
5357
"@storybook/addon-info": "^3.3.15",
54-
"@storybook/addons": "^3.3.15",
55-
"@storybook/react": "^3.3.15",
56-
"babel-cli": "^6.26.0",
57-
"babel-core": "^6.26.0",
58-
"babel-eslint": "^8.2.2",
58+
"@storybook/react": "^3.2.3",
59+
"babel-eslint": "^7.2.3",
5960
"babel-plugin-flow-react-proptypes": "^4.1.0",
6061
"babel-preset-env": "^1.6.1",
6162
"babel-preset-flow": "^6.23.0",
62-
"babel-preset-react": "^6.24.1",
63-
"babel-preset-stage-2": "^6.24.1",
6463
"compression-webpack-plugin": "^1.0.0",
6564
"css-loader": "^0.28.7",
6665
"empty": "^0.10.1",
67-
"enzyme": "^3.3.0",
68-
"eslint": "^4.19.0",
66+
"enzyme": "^2.9.1",
67+
"eslint": "^3.19.0 || ^4.3.0",
6968
"eslint-config-airbnb": "^15.1.0",
7069
"eslint-plugin-flowtype": "^2.35.0",
7170
"eslint-plugin-import": "^2.7.0",
@@ -77,17 +76,18 @@
7776
"flow-typed": "^2.3.0",
7877
"jasmine": "^2.7.0",
7978
"jasmine-core": "^3.1.0",
80-
"jasmine-enzyme": "^6.0.0",
79+
"jasmine-enzyme": "^3.7.0",
8180
"karma": "^1.7.0",
8281
"karma-jasmine": "^1.1.0",
8382
"karma-phantomjs-launcher": "^1.0.4",
8483
"karma-sourcemap-loader": "^0.3.7",
84+
"karma-spec-reporter": "^0.0.32",
8585
"karma-webpack": "^2.0.4",
8686
"node-sass": "^4.5.3",
8787
"optimize-css-assets-webpack-plugin": "^3.1.1",
88-
"react-addons-test-utils": "^15.6.2",
89-
"react-test-render": "^1.1.1",
90-
"react-test-renderer": "^16.2.0",
88+
"react-addons-test-utils": "^15.6.0",
89+
"react-test-render": "^1.0.3",
90+
"react-test-renderer": "^15.6.1",
9191
"sass-loader": "^6.0.6",
9292
"style-loader": "^0.18.2",
9393
"superagent-mock": "^3.5.0"

0 commit comments

Comments
 (0)