chore(deps): Update yarn to 3.1.0 and dedupe deps. fix resolve conflicts (#11072)

chore(deps): updated yarn to 3.1.0

chore(deps): need to be explicit about postcss deps now, apparently

chore(deps): update yarn relock to skip adding checksums for conditional deps

This matches the default behavior of yarn 3.1

danny hates storybook

update yarn workspace plugin

.yarn/plugins/@yarnpkg/plugin-relock.js

@@ -1,8 +1,9 @@
 /* eslint-disable */
+//prettier-ignore
 module.exports = {
 name: "@yarnpkg/plugin-relock",
 factory: function (require) {
-var plugin;plugin=(()=>{"use strict";var e={928:(e,t,r)=>{r.r(t),r.d(t,{default:()=>i});var o=r(594),c=r(966),s=r(42),n=function(e,t,r,o){var c,s=arguments.length,n=s<3?t:null===o?o=Object.getOwnPropertyDescriptor(t,r):o;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)n=Reflect.decorate(e,t,r,o);else for(var a=e.length-1;a>=0;a--)(c=e[a])&&(n=(s<3?c(n):s>3?c(t,r,n):c(t,r))||n);return s>3&&n&&Object.defineProperty(t,r,n),n};class a extends s.Command{async execute(){const e=await c.Configuration.find(this.context.cwd,this.context.plugins),{project:t,workspace:r}=await c.Project.find(e,this.context.cwd);if(!r)throw new o.WorkspaceRequiredError(t.cwd,this.context.cwd);const s=await c.Cache.find(e);await t.resolveEverything({cache:s,report:new c.ThrowReport});try{const r=Array.from(new Set(c.miscUtils.sortMap(t.storedResolutions.values(),[e=>{const r=t.storedPackages.get(e);if(!r)throw new Error("Assertion failed: The locator should have been registered");return c.structUtils.stringifyLocator(r)}]))).filter(e=>{if(t.storedChecksums.has(e))return!1;let r=t.storedPackages.get(e);if(r.reference.includes("workspace:"))return!1;if(r.reference.startsWith("virtual")){const e=r.reference.slice(r.reference.indexOf("#")+1);r=c.structUtils.makeLocator(r,e)}return!t.storedChecksums.has(r.locatorHash)}),o=e.makeFetcher(),n=async(e,r,a)=>{const i=await o.fetch(e,{checksums:r,project:t,cache:s,fetcher:o,report:new c.ThrowReport});return i.checksum||a?i:(await new Promise(e=>setTimeout(e,500)),await n(e,r,!0))};for(const e of r){let r=t.storedPackages.get(e);if(r.reference.startsWith("virtual")){const e=r.reference.slice(r.reference.indexOf("#")+1);r=c.structUtils.makeLocator(r,e)}const o=await n(r,t.storedChecksums);o.checksum&&t.storedChecksums.set(r.locatorHash,o.checksum)}}catch(e){}await t.persistLockfile()}}n([s.Command.Path("relock")],a.prototype,"execute",null);const i={commands:[a]}},594:e=>{e.exports=require("@yarnpkg/cli")},966:e=>{e.exports=require("@yarnpkg/core")},42:e=>{e.exports=require("clipanion")}},t={};function r(o){if(t[o])return t[o].exports;var c=t[o]={exports:{}};return e[o](c,c.exports,r),c.exports}return r.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return r.d(t,{a:t}),t},r.d=(e,t)=>{for(var o in t)r.o(t,o)&&!r.o(e,o)&&Object.defineProperty(e,o,{enumerable:!0,get:t[o]})},r.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),r.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r(928)})();
+var plugin=(()=>{var C=Object.create,f=Object.defineProperty;var L=Object.getOwnPropertyDescriptor;var y=Object.getOwnPropertyNames;var P=Object.getPrototypeOf,v=Object.prototype.hasOwnProperty;var H=t=>f(t,"__esModule",{value:!0});var h=t=>{if(typeof require!="undefined")return require(t);throw new Error('Dynamic require of "'+t+'" is not supported')};var R=(t,s)=>{for(var r in s)f(t,r,{get:s[r],enumerable:!0})},W=(t,s,r)=>{if(s&&typeof s=="object"||typeof s=="function")for(let a of y(s))!v.call(t,a)&&a!=="default"&&f(t,a,{get:()=>s[a],enumerable:!(r=L(s,a))||r.enumerable});return t},l=t=>W(H(f(t!=null?C(P(t)):{},"default",t&&t.__esModule&&"default"in t?{get:()=>t.default,enumerable:!0}:{value:t,enumerable:!0})),t);var b={};R(b,{default:()=>T});var k=l(h("@yarnpkg/cli")),o=l(h("@yarnpkg/core")),p=l(h("clipanion")),u=class extends p.Command{async execute(){let s=await o.Configuration.find(this.context.cwd,this.context.plugins),{project:r,workspace:a}=await o.Project.find(s,this.context.cwd);if(!a)throw new k.WorkspaceRequiredError(r.cwd,this.context.cwd);let d=await o.Cache.find(s);await r.resolveEverything({cache:d,report:new o.ThrowReport});try{let m=Array.from(new Set(o.miscUtils.sortMap(r.storedResolutions.values(),[c=>{let e=r.storedPackages.get(c);if(!e)throw new Error("Assertion failed: The locator should have been registered");return o.structUtils.stringifyLocator(e)}]))).filter(c=>{if(r.storedChecksums.has(c))return!1;let e=r.storedPackages.get(c);if(e.conditions||e.reference.includes("workspace:"))return!1;if(e.reference.startsWith("virtual")){let n=e.reference.slice(e.reference.indexOf("#")+1);e=o.structUtils.makeLocator(e,n)}return!r.storedChecksums.has(e.locatorHash)}),g=s.makeFetcher(),w=async(c,e,n)=>{let i=await g.fetch(c,{checksums:e,project:r,cache:d,fetcher:g,report:new o.ThrowReport});return i.checksum||n?i:(await new Promise(x=>setTimeout(x,500)),await w(c,e,!0))};for(let c of m){let e=r.storedPackages.get(c);if(e.reference.startsWith("virtual")){let i=e.reference.slice(e.reference.indexOf("#")+1);e=o.structUtils.makeLocator(e,i)}console.error("fetching",e.name);let n=await w(e,r.storedChecksums);n.checksum&&r.storedChecksums.set(e.locatorHash,n.checksum)}}catch(m){}await r.persistLockfile()}};u.paths=[["relock"]];var E={commands:[u]},T=E;return b;})();
 return plugin;
 }
-};
+};

.yarnrc.yml

@@ -16,6 +16,6 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-relock.js
     spec: "@yarnpkg/plugin-relock"
   - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
-    spec: "https://github.com/mskelton/yarn-plugin-outdated/raw/main/bundles/@yarnpkg/plugin-outdated.js"
+    spec: "https://mskelton.dev/yarn-outdated/v2"
 
-yarnPath: .yarn/releases/yarn-3.0.2.cjs
+yarnPath: .yarn/releases/yarn-3.1.0.cjs

package.json

@@ -87,7 +87,8 @@
     "@types/node": "^16.11.3",
     "http-proxy": "^1.18.1",
     "browserid-crypto": "git://github.com/mozilla-fxa/browserid-crypto.git#5979544d13eeb15a02d0b9a6a7a08a698d54d37d",
-    "fbjs/isomorphic-fetch": "^3.0.0"
+    "fbjs/isomorphic-fetch": "^3.0.0",
+    "eslint-plugin-import": "^2.25.2"
   },
-  "packageManager": "yarn@3.0.2"
+  "packageManager": "yarn@3.1.0"
 }

packages/fxa-admin-panel/package.json

@@ -91,11 +91,13 @@
     "@types/webpack": "5.28.0",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
+    "autoprefixer": "^9.8.6",
     "babel-loader": "^8.2.2",
     "chance": "^1.1.8",
     "esbuild": "^0.13.14",
     "esbuild-register": "^3.0.0",
     "eslint": "^7.32.0",
+    "eslint-config-react-app": "^6.0.0",
     "eslint-plugin-fxa": "^2.0.2",
     "eslint-plugin-jest": "^24.5.2",
     "eslint-plugin-react": "^7.26.1",
@@ -106,6 +108,7 @@
     "postcss-cli": "^7.1.1",
     "prettier": "^2.3.1",
     "supertest": "^6.1.6",
+    "tailwindcss": "^1.9.1",
     "ts-jest": "^27.0.7",
     "typescript": "^4.3.5",
     "webpack": "^4.43.0"

packages/fxa-auth-server/package.json

@@ -164,7 +164,7 @@
     "grunt-contrib-copy": "1.0.0",
     "grunt-contrib-watch": "^1.1.0",
     "grunt-copyright": "0.3.0",
-    "grunt-eslint": "^24.0.0",
+    "grunt-eslint": "^23.0.0",
     "grunt-newer": "1.3.0",
     "jsxgettext-recursive-next": "1.1.0",
     "jws": "4.0.0",

packages/fxa-customs-server/package.json

@@ -48,7 +48,7 @@
     "grunt": "^1.4.1",
     "grunt-cli": "^1.4.3",
     "grunt-copyright": "0.3.0",
-    "grunt-eslint": "^24.0.0",
+    "grunt-eslint": "^23.0.0",
     "load-grunt-tasks": "^5.1.0",
     "pm2": "^5.1.2",
     "prettier": "^2.3.1",

packages/fxa-payments-server/package.json

@@ -87,6 +87,7 @@
     "esbuild": "^0.13.14",
     "esbuild-register": "^3.0.0",
     "eslint": "^7.32.0",
+    "eslint-config-react-app": "^6.0.0",
     "eslint-plugin-fxa": "^2.0.2",
     "eslint-plugin-jest": "^24.5.2",
     "eslint-plugin-react": "^7.26.1",
@@ -103,6 +104,7 @@
     "prettier": "^2.3.1",
     "redux-devtools-extension": "^2.13.9",
     "sinon": "^9.0.3",
+    "style-loader": "^1.3.0",
     "supertest": "^6.1.6",
     "ts-jest": "^27.0.7",
     "typescript": "^4.3.5",

packages/fxa-react/package.json

@@ -75,6 +75,7 @@
     "rimraf": "^3.0.2",
     "sass": "1.43.4",
     "sass-loader": "^10.0.3",
+    "tailwindcss": "^1.9.1",
     "ts-jest": "^27.0.7",
     "typescript": "^4.3.5",
     "webpack": "^4.43.0"

packages/fxa-settings/package.json

@@ -98,8 +98,11 @@
     "@types/testing-library__react-hooks": "^4",
     "@types/uuid": "^8",
     "@types/webpack": "5.28.0",
+    "autoprefixer": "^9.8.6",
     "babel-loader": "^8.2.2",
+    "css-loader": "^3.6.0",
     "eslint": "^7.32.0",
+    "eslint-config-react-app": "^6.0.0",
     "eslint-plugin-fxa": "^2.0.2",
     "eslint-plugin-jest": "^24.5.2",
     "eslint-plugin-react": "^7.26.1",
@@ -111,6 +114,8 @@
     "pm2": "^5.1.2",
     "postcss-cli": "^7.1.1",
     "react-test-renderer": "^17.0.2",
+    "style-loader": "^1.3.0",
+    "tailwindcss": "^1.9.1",
     "webpack": "^4.43.0",
     "webpack-merge-and-include-globally": "^2.3.4",
     "webpack-watch-files-plugin": "^1.2.0"