Skip to content

Commit

Permalink
Merge pull request mozilla#6279 from mozilla/update-root-deps
Browse files Browse the repository at this point in the history
chore(deps): update yarn version and root level deps
  • Loading branch information
dannycoates committed Aug 24, 2020
2 parents b08d0e0 + da2e997 commit e3b42e7
Show file tree
Hide file tree
Showing 22 changed files with 222 additions and 111,523 deletions.
111,337 changes: 0 additions & 111,337 deletions .yarn/releases/yarn-2.0.0-rc.36.js

This file was deleted.

86 changes: 86 additions & 0 deletions .yarn/releases/yarn-2.1.1.cjs

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions .yarnrc.yml
@@ -1,35 +1,35 @@
nodeLinker: node-modules

packageExtensions:
'@apollo/react-common@*':
"@apollo/react-common@*":
dependencies:
'@types/react': 16.9.35
"@types/react": 16.9.35
apollo-client: 2.6.10
apollo-utilities: 1.3.4
graphql: 14.6.0
'@apollo/react-components@*':
"@apollo/react-components@*":
dependencies:
apollo-cache: 1.3.5
apollo-client: 2.6.10
apollo-link: 1.2.14
apollo-utilities: 1.3.4
'@apollo/react-ssr@*':
"@apollo/react-ssr@*":
dependencies:
'@types/react': 16.9.35
"@types/react": 16.9.35
apollo-client: 2.6.10
graphql: 14.6.0
'@storybook/addon-actions@*':
"@storybook/addon-actions@*":
dependencies:
react-dom: 16.13.1
regenerator-runtime: 0.13.5
'@storybook/addon-links@*':
"@storybook/addon-links@*":
dependencies:
react-dom: 16.13.1
regenerator-runtime: 0.13.5
'@storybook/addons@*':
"@storybook/addons@*":
dependencies:
regenerator-runtime: 0.13.5
'@storybook/api@*':
"@storybook/api@*":
dependencies:
react-dom: 16.13.1
apollo-link-error@*:
Expand All @@ -53,8 +53,8 @@ packageExtensions:

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
spec: '@yarnpkg/plugin-typescript'
spec: "@yarnpkg/plugin-typescript"
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: '@yarnpkg/plugin-workspace-tools'
spec: "@yarnpkg/plugin-workspace-tools"

yarnPath: .yarn/releases/yarn-2.0.0-rc.36.js
yarnPath: .yarn/releases/yarn-2.1.1.cjs
10 changes: 5 additions & 5 deletions package.json
Expand Up @@ -27,14 +27,14 @@
"author": "Mozilla (https://mozilla.org/)",
"license": "MPL-2.0",
"dependencies": {
"@dannycoates/nps": "^5.9.12",
"diffparser": "^2.0.1",
"husky": "^4.2.3",
"lint-staged": "^10.0.8",
"husky": "^4.2.5",
"lint-staged": "^10.2.11",
"node-fetch": "^2.6.0",
"pm2": "^4.4.0",
"nps": "^5.10.0",
"pm2": "^4.4.1",
"prettier": "^2.0.5",
"replace-in-file": "^5.0.2",
"replace-in-file": "^6.1.0",
"semver": "^7.3.2"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/123done/package.json
Expand Up @@ -37,7 +37,7 @@
"eslint": "^6.8.0",
"eslint-plugin-fxa": "^2.0.2",
"fxa-shared": "workspace:*",
"pm2": "^4.4.0",
"pm2": "^4.4.1",
"prettier": "^2.0.5"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/browserid-verifier/package.json
Expand Up @@ -36,7 +36,7 @@
"eslint-plugin-fxa": "^2.0.2",
"fxa-shared": "workspace:*",
"mocha": "^7.1.2",
"pm2": "^4.4.0",
"pm2": "^4.4.1",
"prettier": "^2.0.5",
"request": "^2.88.2",
"should": "13.2.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/fortress/package.json
Expand Up @@ -36,7 +36,7 @@
"eslint-plugin-fxa": "^2.0.2",
"fxa-shared": "workspace:*",
"npm-run-all": "4.1.5",
"pm2": "^4.4.0",
"pm2": "^4.4.1",
"prettier": "^2.0.5",
"stylelint": "^13.6.1",
"stylelint-config-prettier": "^8.0.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/fxa-admin-panel/package.json
Expand Up @@ -99,7 +99,7 @@
"eslint-plugin-react": "7.19.0",
"fxa-shared": "workspace:*",
"jest": "^24.9.0",
"pm2": "^4.4.0",
"pm2": "^4.4.1",
"postcss-cli": "^7.1.1",
"prettier": "^2.0.5",
"supertest": "^4.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/fxa-admin-server/package.json
Expand Up @@ -63,7 +63,7 @@
"eslint": "^7.6.0",
"fxa-shared": "workspace:*",
"mocha": "^8.1.1",
"pm2": "^4.4.0",
"pm2": "^4.4.1",
"prettier": "^2.0.5",
"proxyquire": "^2.1.3",
"sinon": "^9.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/fxa-auth-db-mysql/package.json
Expand Up @@ -51,7 +51,7 @@
"mocha": "^7.1.2",
"nock": "^13.0.4",
"nyc": "^15.0.1",
"pm2": "^4.4.0",
"pm2": "^4.4.1",
"prettier": "^2.0.5",
"proxyquire": "^2.1.3",
"restify-clients": "^2.6.9",
Expand Down
2 changes: 1 addition & 1 deletion packages/fxa-auth-server/package.json
Expand Up @@ -151,7 +151,7 @@
"moment": "^2.24.0",
"nock": "^12.0.3",
"nyc": "^15.0.1",
"pm2": "^4.4.0",
"pm2": "^4.4.1",
"prettier": "^2.0.5",
"proxyquire": "^2.1.3",
"read": "1.0.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/fxa-content-server/package.json
Expand Up @@ -160,7 +160,7 @@
"intern": "^4.5.0",
"jsqr": "1.2.0",
"otplib": "^11.0.1",
"pm2": "^4.2.3",
"pm2": "^4.4.1",
"prettier": "^2.0.5",
"proxyquire": "^2.1.3",
"request": "^2.88.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/fxa-customs-server/package.json
Expand Up @@ -51,7 +51,7 @@
"grunt-eslint": "^22.0.0",
"load-grunt-tasks": "^5.1.0",
"npmshrink": "1.0.1",
"pm2": "^4.4.0",
"pm2": "^4.4.1",
"prettier": "^2.0.5",
"proxyquire": "^2.1.3",
"request": "^2.88.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/fxa-event-broker/package.json
Expand Up @@ -69,7 +69,7 @@
"mocha": "^8.1.1",
"nock": "^13.0.4",
"p-event": "^4.2.0",
"pm2": "^4.4.0",
"pm2": "^4.4.1",
"prettier": "^2.0.5",
"sinon": "^9.0.3",
"ts-node": "^8.10.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/fxa-graphql-api/package.json
Expand Up @@ -76,7 +76,7 @@
"fxa-shared": "workspace:*",
"mocha": "^8.1.1",
"nock": "^13.0.4",
"pm2": "^4.4.0",
"pm2": "^4.4.1",
"prettier": "^2.0.5",
"proxyquire": "^2.1.3",
"sinon": "^9.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/fxa-payments-server/package.json
Expand Up @@ -85,7 +85,7 @@
"nock": "^13.0.4",
"npm-run-all": "^4.1.5",
"nyc": "^15.0.1",
"pm2": "^4.4.0",
"pm2": "^4.4.1",
"prettier": "^2.0.5",
"redux-devtools-extension": "^2.13.8",
"sinon": "^9.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/fxa-profile-server/package.json
Expand Up @@ -52,7 +52,7 @@
"mocha-text-cov": "0.1.1",
"nock": "^13.0.4",
"nyc": "^15.0.1",
"pm2": "^4.4.0",
"pm2": "^4.4.1",
"pngparse": "2.0.1",
"prettier": "^2.0.5",
"rimraf": "^3.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/fxa-react/package.json
Expand Up @@ -57,7 +57,7 @@
"identity-obj-proxy": "^3.0.0",
"jest": "^24.9.0",
"jest-environment-jsdom-fourteen": "1.0.1",
"pm2": "^4.4.0",
"pm2": "^4.4.1",
"postcss-cli": "^7.1.1",
"prettier": "^2.0.5",
"rimraf": "^3.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/fxa-settings/package.json
Expand Up @@ -73,7 +73,7 @@
"fxa-shared": "workspace:*",
"node-sass": "^4.14.0",
"npm-run-all": "^4.1.5",
"pm2": "^4.4.0",
"pm2": "^4.4.1",
"postcss-cli": "^7.1.1",
"tailwindcss": "^1.4.6",
"webpack": "^4.43.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/fxa-shared/package.json
Expand Up @@ -51,7 +51,7 @@
"jsdom-global": "3.0.2",
"mocha": "^7.1.2",
"nyc": "^15.0.1",
"pm2": "^4.4.0",
"pm2": "^4.4.1",
"prettier": "^2.0.5",
"proxyquire": "^2.1.3",
"sinon": "^9.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/fxa-support-panel/package.json
Expand Up @@ -58,7 +58,7 @@
"fxa-shared": "workspace:*",
"mocha": "^8.1.1",
"nock": "^13.0.4",
"pm2": "^4.4.0",
"pm2": "^4.4.1",
"prettier": "^2.0.5",
"sinon": "^9.0.3",
"ts-node": "^8.10.2",
Expand Down

0 comments on commit e3b42e7

Please sign in to comment.