Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: upgrade deps #6400

Merged
merged 10 commits into from
Jun 21, 2018
Merged

chore: upgrade deps #6400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
60c9015
chore: upgrade deps
thymikee Jun 5, 2018
717d795
upgrade more packages
thymikee Jun 5, 2018
45a1f4e
upgrade micromatch
thymikee Jun 5, 2018
3ca6f59
use jest-junit as a reporter
thymikee Jun 5, 2018
6635a6d
downgrade slash to 1.0.0 for now
thymikee Jun 6, 2018
401c10d
revert fbjs incompatible eslint plugins
thymikee Jun 6, 2018
606022a
Revert eslint
thymikee Jun 6, 2018
641d638
bring back eslint update because fbjs published new version:
thymikee Jun 21, 2018
b867363
revert rn react upgrade
thymikee Jun 21, 2018
3675e57
update eslint-plugin-babel peerDep
thymikee Jun 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/enzyme/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "0.0.0",
"name": "example-enzyme",
"dependencies": {
"react": "*",
"react-dom": "*"
"react": "16.4.1",
"react-dom": "16.4.1"
},
"devDependencies": {
"babel-jest": "*",
Expand Down
4 changes: 2 additions & 2 deletions examples/react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "0.0.0",
"name": "example-react",
"dependencies": {
"react": "*",
"react-dom": "*"
"react": "16.4.1",
"react-dom": "16.4.1"
},
"devDependencies": {
"babel-jest": "*",
Expand Down
2 changes: 1 addition & 1 deletion examples/snapshot/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.0.0",
"name": "example-snapshot",
"dependencies": {
"react": "*"
"react": "16.4.1"
},
"devDependencies": {
"babel-jest": "*",
Expand Down
4 changes: 2 additions & 2 deletions examples/timer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "0.0.0",
"name": "example-timer",
"devDependencies": {
"jest": "*",
"babel-preset-env": "*"
"babel-preset-env": "*",
"jest": "*"
},
"scripts": {
"test": "jest"
Expand Down
6 changes: 3 additions & 3 deletions examples/typescript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"version": "0.0.0",
"name": "example-typescript",
"dependencies": {
"react": "*",
"react-dom": "*",
"react": "16.4.1",
"react-dom": "16.4.1",
"typescript": "*"
},
"devDependencies": {
"@types/jest": "^19.2.4",
"@types/jest": "^23.1.1",
"jest": "*",
"ts-jest": "*"
},
Expand Down
16 changes: 8 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ansi-regex": "^3.0.0",
"ansi-styles": "^3.2.0",
"babel-core": "^6.23.1",
"babel-eslint": "^7.2.3",
"babel-eslint": "^8.2.3",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we not get a peer dep warning from this?

facebook/fbjs#275 hasn't been released yet, has it?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yup, we do, missed that. @cpojer might push someone to actually make a release? :p in the meantime I'll revert this change

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you'll need to downgrade eslint as well

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh man

"babel-plugin-external-helpers": "^6.22.0",
"babel-plugin-syntax-trailing-function-commas": "^6.13.0",
"babel-plugin-transform-async-to-generator": "^6.16.0",
Expand All @@ -24,9 +24,9 @@
"chalk": "^2.0.1",
"codecov": "^3.0.0",
"debug": "^3.0.1",
"eslint": "~4.13.0",
"eslint": "^4.19.1",
"eslint-config-prettier": "^2.9.0",
"eslint-plugin-babel": "^4.1.1",
"eslint-plugin-babel": "^5.1.0",
"eslint-plugin-flowtype": "^2.35.0",
"eslint-plugin-import": "^2.6.0",
"eslint-plugin-jest": "^21.0.0",
Expand All @@ -42,16 +42,16 @@
"istanbul-api": "^1.3.1",
"istanbul-lib-coverage": "^1.0.0",
"jasmine-reporters": "^2.2.0",
"jest-junit": "^4.0.0",
"jest-junit": "^5.1.0",
"jest-silent-reporter": "^0.0.5",
"jquery": "^3.2.1",
"karma": "^2.0.0",
"karma-browserify": "^5.1.1",
"karma-chrome-launcher": "^2.1.1",
"karma-mocha": "^1.3.0",
"left-pad": "^1.1.1",
"lerna": "2.9.0",
"micromatch": "^2.3.11",
"lerna": "2.11.0",
"micromatch": "^3.1.10",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought this broke the browser build. Awesome that it seems fixed!

#6040

"mkdirp": "^0.5.1",
"mocha": "^5.0.1",
"mock-fs": "^4.4.1",
Expand Down Expand Up @@ -89,8 +89,8 @@
"postinstall": "yarn build",
"publish": "yarn build-clean && yarn build && lerna publish --silent",
"test-ci-es5-build-in-browser": "karma start --single-run",
"test-ci": "yarn jest-coverage -i --reporters jest-silent-reporter --testResultsProcessor=jest-junit && yarn test-leak && node scripts/mapCoverage.js && codecov",
"test-ci-partial": "yarn jest -i --reporters jest-silent-reporter --testResultsProcessor=jest-junit",
"test-ci": "yarn jest-coverage -i --reporters jest-silent-reporter jest-junit && yarn test-leak && node scripts/mapCoverage.js && codecov",
"test-ci-partial": "yarn jest -i --reporters jest-silent-reporter jest-junit",
"test-pretty-format-perf": "node packages/pretty-format/perf/test.js",
"test-leak": "yarn jest -i --detectLeaks jest-mock jest-diff jest-repl",
"test": "yarn typecheck && yarn lint && yarn jest",
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config-fb-strict/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"peerDependencies": {
"babel-eslint": "^7.2.3 || ^8.0.0",
"eslint": "^4.2.0",
"eslint-plugin-babel": "^4.1.1",
"eslint-plugin-babel": "^4.1.1 || ^5.0.0",
"eslint-plugin-flowtype": "^2.35.0",
"eslint-plugin-jest": "^21.0.0",
"eslint-plugin-jsx-a11y": "^6.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"jest-validate": "^23.0.1",
"jest-watcher": "^23.1.0",
"jest-worker": "^23.0.1",
"micromatch": "^2.3.11",
"micromatch": "^3.1.10",
"node-notifier": "^5.2.1",
"prompts": "^0.1.9",
"realpath-native": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-haste-map/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"jest-docblock": "^23.0.1",
"jest-serializer": "^23.0.1",
"jest-worker": "^23.0.1",
"micromatch": "^2.3.11",
"micromatch": "^3.1.10",
"sane": "^2.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/jest-message-util/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@babel/code-frame": "^7.0.0-beta.35",
"chalk": "^2.0.1",
"micromatch": "^2.3.11",
"micromatch": "^3.1.10",
"slash": "^1.0.0",
"stack-utils": "^1.0.1"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-runtime/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"jest-snapshot": "^23.0.1",
"jest-util": "^23.1.0",
"jest-validate": "^23.0.1",
"micromatch": "^2.3.11",
"micromatch": "^3.1.10",
"realpath-native": "^1.0.0",
"slash": "^1.0.0",
"strip-bom": "3.0.0",
Expand Down
3 changes: 1 addition & 2 deletions website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"build": "docusaurus-build",
"gh-pages": "docusaurus-publish",
"examples": "docusaurus-examples",
"crowdin-upload":
"crowdin --config ../crowdin.yaml upload sources --auto-update -b master",
"crowdin-upload": "crowdin --config ../crowdin.yaml upload sources --auto-update -b master",
"crowdin-download": "crowdin --config ../crowdin.yaml download -b master",
"publish-gh-pages": "docusaurus-publish",
"write-translations": "docusaurus-write-translations",
Expand Down
Loading