Ver código fonte

Remove Yarn v2 Specific Files for Retro Compatibility

Francesco Baccetti 4 anos atrás
pai
commit
c8998baf04

+ 2 - 0
.gitignore

@@ -87,5 +87,7 @@ dist/
 yarn-error.log
 .pnp/
 .pnp.js
+.yarn
+.yarnrc.yml
 # Yarn Integrity file
 .yarn-integrity

+ 8 - 8
.yarn/build-state.yml

@@ -3,32 +3,32 @@
 
 # core-js-pure@npm:3.6.5
 "c634b57d825318aaf25531579115cf09e2ff2e66bb3bd91622453ecd2b2358a66d44010bc4e9f0407d3252ba4d0548ebe0327ec589e6d8603b97711bd4ff735e":
-  1e50107c889fdee621f89715a0af9884d8f4708c7b539e504c3f4205e648815e95442449f3f2e01992c27f2abe66510d079830350147eb3d008feedeccf0231b
+  26b5a20035c76fd7d8f58833622a8803f0b3c74cad5021ac372b5068968b77ea3505aa1de95ef17dc098a52cc96db3c51f68632f32cab27ca957dc1f8a81f971
 
 # core-js@npm:2.6.11
 "15178ded27ab674ae2054269453d809bdb1d00b98392a34947b5d43ea7a5811e5674c2fda7d48bb653b24a3506b0a8aa126bbac861bdeba93438ec6c7efb2d9d":
-  8dc9f07c009eff6deea51cb34ab59bda2789db9b0eb50be505f1a8c57cb5a66ba22c0706d4cae9a411af07c3181840c51a3fa8be55abb3e539f93a82c2780b87
+  542783978952b450a1ed0fa7150b94f2e056cad7f7210cd32390851ca3bbeb8db6a47e88cc2b7cefc7f6c743eba1c98e65bf306d5128b5daf7d2e8154a8e63a5
 
 # core-js@npm:3.6.5
 "5941340066f775d2694fe1955bef9a66af767bfade2eca6ca442d82a68a5c999e76165c38ab532c125bf81c66c151d83d8e96f86a3f7af2d755000b3e2d48171":
-  453b3ca34aff48585c5c06700016fa6096723eab22635994b1148f58129abbddb4fe3505c48f10d13588d822ee45488fe422c4159fe51788a7cb9a3825cbfa1c
+  854cf3cdd788f7a9493cf8fd1d34cf5a6ef0ccd24628f8d64b71e4b5f256d27578b0d5b8e9df63a35c7900f0eeb67b3bd5a245476e78d2d8313535c4f8dd6664
 
 # deasync@npm:0.1.20
 "3c9d71629490aefab3918bacfdec43ee4b723a0c5549580f65e628cf63824599579e5be59ca0331f5c77e6ec1be31d7e8609e677df083c8a3f49ebdeeab5d2b6":
-  8af2ffcf95ce383763ce87405cd236dc91e57b25aebf6bfdc052c59190350a4c5806a08380c1460fa4262f9ceeb0229b1ffaf15691f68b22db28905cde425362
+  6b209d04f9582cc1c83dd99e06377197745fb210ddd78d363960644199c40d5d2d7a63bac4f9b2bf2b5d343444b426c7852672aaf27d1efab8219b2931b0efdf
 
 # ejs@npm:2.7.4
 "879ed38a4e6f542ab08c36367888dd2c675bef03e81327d75da644a9795ff2d91c34d3cc00a725a6332b56c51ff7cd6a6c5e8c9f9411e6c41bf42b356e1e2417":
-  47efd6ed73b8378f71b7d1da4d09802b46cc7e2fb14965a91f0ce707b17a9991a90770ade90c1dae6103bf66f085c67f6b86bb4bbe9ca6df94f89e3bfd1b61d9
+  88cd0116a4c57e50db0e0aa4404746eb046c2a7d233ea1e91882af98d166f3cf1cbf7bb4cdff80df45c2cfab7806fc81d1112c632ad5bea1abff7c082f5c83b9
 
 # fsevents@patch:fsevents@npm%3A1.2.13#builtin<compat/fsevents>::version=1.2.13&hash=495457
 "1813f6d75e288a7ebd0106bb7acab950ec90204d19a24473dd0127b528a56df374472ac3f50424fede32ab04d2e2817efe102003592a6d3fef9d20451a34de48":
-  1343ff4a8911659625848c71dea302d75b7b22ee72bb5ff33fbc4b4ceaf3268248bfa127bdae59818c748a49ca1a63dc3dc079dc8f005eac5a6f98c1188a7ae4
+  aac954ebd719abd3733b275b45285c96fe078c3f64daa1aada7118889f11a4f1f2c7d14f8343b75ef9cd0e01dca73ce6108bfd83ffcc6282137e3690de2202fa
 
 # husky@npm:4.2.5
 "30d80a2ef8f47f82bf641519be4696656242ca58892f371fe566f83e7cad0edec8c51cb01e9758f0a3217e2533bce8b54033a8d334bea489f2f7fcc747e5977d":
-  67ab324b3176dace17f03145de74bd5d7437d798f529a230f19570f4d698e0e9f61dee504478164e06c5f3bbc83088eb3590447f46518777d8fbb30f47d8db41
+  3bb898ec861246aad892c6683327b2a7d077e4864b12a7e6a52deeae36b130d678e0fb81c3f1a8d5dde1259b67c32f6e49b76a9130d6be29f82c3ac84ba98c18
 
 # parcel@npm:1.12.4
 "827b207bcea0cfe3fe45cf06eab3897abe19a2974d9fd7e00dc140ad1b9faa81641390c530f6eff3ef5525b2fdb41b7a8f89a8c7186d481af84c9ef5a913114f":
-  c94f99c7efc4a986ce3c003c6d938876b0b863bb591e53cd8a8c8fe4f9b959ce66bc0d1246a60333fe2989c078d11dc5ffb92c53829b112b9bd9e860c9b14f4a
+  370eec4701765bd48c0411ce52bba2c1ba26823d8d0cd41f1fc8dfec620643909e312e4192585e3436d191a731ae0ee989fa63e65f90f1b268c993026d51fd7a

BIN
.yarn/install-state.gz


+ 5 - 1
.yarnrc.yml

@@ -1 +1,5 @@
-yarnPath: ".yarn/releases/yarn-berry.js"
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.js
+    spec: "@yarnpkg/plugin-workspace-tools"
+
+yarnPath: .yarn/releases/yarn-berry.js

+ 5 - 4
package.json

@@ -51,17 +51,18 @@
 		"lint-staged": "^10.2.7",
 		"parcel": "^1.12.4",
 		"react-docgen-typescript-loader": "^3.7.1",
-		"react-player": "^1.15.3",
 		"rollup": "^2.1.0",
 		"rollup-plugin-babel": "^4.4.0",
 		"rollup-plugin-typescript2": "^0.26.0",
 		"storybook-addon-jsx": "^7.1.15",
 		"ts-loader": "^6.2.1",
-		"typescript": "^3.8.3",
-		"video-react": "^0.14.1"
+		"typescript": "^3.8.3"
 	},
 	"dependencies": {
+		"@emotion/core": "^10.0.28",
 		"app": "file:packages/app",
-		"components": "file:packages/components"
+		"components": "file:packages/components",
+		"react": "^16.13.1",
+		"react-dom": "^16.13.1"
 	}
 }

+ 0 - 16
packages/app/global.d.ts

@@ -1,16 +0,0 @@
-/* 
-
-I was getting this error while running Jest:
-
-packages/app/src/views/ExploreView/ExploreView.tsx:15:48 - error 
-TS2339: Property 'flat' does not exist on type 'unknown[]'.
-
-I tried adding "ES2019" and "ES2019.Array" to Typescript lib compiler options to no avail.
-The only way I was able to fix this issue was to add 'flat' to Typescript globals (this file).
-
- */
-
-interface Array<T> {
-  flat(): Array<T>
-  flatMap(func: (x: T) => T): Array<T>
-}

+ 3 - 5
packages/app/package.json

@@ -25,15 +25,13 @@
 		"url": "https://github.com/Joystream/atlas/issues"
 	},
 	"dependencies": {
+		"@emotion/core": "^10.0.28",
 		"@reach/router": "^1.3.3",
 		"normalize.css": "^8.0.1",
 		"packages": "^0.0.8",
-		"react": "^16.13.0",
-		"react-dom": "^16.13.0",
+		"react": "^16.13.1",
+		"react-dom": "^16.13.1",
 		"react-redux": "^7.2.0",
 		"redux": "^4.0.5"
-	},
-	"devDependencies": {
-		"babel-core": "^6.26.3"
 	}
 }

+ 5 - 0
packages/components/package.json

@@ -30,5 +30,10 @@
 	},
 	"bugs": {
 		"url": "https://github.com/Joystream/atlas/issues"
+	},
+	"dependencies": {
+		"@emotion/core": "^10.0.28",
+		"react": "^16.13.1",
+		"react-dom": "^16.13.1"
 	}
 }

+ 17 - 48
yarn.lock

@@ -1343,7 +1343,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.4.4, @babel/runtime@npm:^7.4.5, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.4.4, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
   version: 7.10.2
   resolution: "@babel/runtime@npm:7.10.2"
   dependencies:
@@ -1464,7 +1464,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/core@npm:^10.0.20, @emotion/core@npm:^10.0.9":
+"@emotion/core@npm:^10.0.20, @emotion/core@npm:^10.0.28, @emotion/core@npm:^10.0.9":
   version: 10.0.28
   resolution: "@emotion/core@npm:10.0.28"
   dependencies:
@@ -5062,12 +5062,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "app@workspace:packages/app"
   dependencies:
+    "@emotion/core": ^10.0.28
     "@reach/router": ^1.3.3
-    babel-core: ^6.26.3
     normalize.css: ^8.0.1
     packages: ^0.0.8
-    react: ^16.13.0
-    react-dom: ^16.13.0
+    react: ^16.13.1
+    react-dom: ^16.13.1
     react-redux: ^7.2.0
     redux: ^4.0.5
   languageName: unknown
@@ -5352,6 +5352,7 @@ __metadata:
     "@babel/preset-react": ^7.8.3
     "@babel/preset-typescript": ^7.9.0
     "@emotion/babel-preset-css-prop": ^10.0.27
+    "@emotion/core": ^10.0.28
     "@fortawesome/fontawesome-svg-core": ^1.2.28
     "@fortawesome/free-solid-svg-icons": ^5.13.0
     "@fortawesome/react-fontawesome": ^0.1.9
@@ -5384,15 +5385,15 @@ __metadata:
     lerna: ^3.20.2
     lint-staged: ^10.2.7
     parcel: ^1.12.4
+    react: ^16.13.1
     react-docgen-typescript-loader: ^3.7.1
-    react-player: ^1.15.3
+    react-dom: ^16.13.1
     rollup: ^2.1.0
     rollup-plugin-babel: ^4.4.0
     rollup-plugin-typescript2: ^0.26.0
     storybook-addon-jsx: ^7.1.15
     ts-loader: ^6.2.1
     typescript: ^3.8.3
-    video-react: ^0.14.1
   languageName: unknown
   linkType: soft
 
@@ -7568,7 +7569,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"classnames@npm:^2.2.5, classnames@npm:^2.2.6":
+"classnames@npm:^2.2.5":
   version: 2.2.6
   resolution: "classnames@npm:2.2.6"
   checksum: 3/490eaeca5931846737ffd33e472a701d268d5b8bc5717dd4cf108a127b06e86e05350e06799abbbe763a0e4c945b4217f6700b7ae00ddc703505682c370e5cf2
@@ -7948,6 +7949,10 @@ __metadata:
 "components@workspace:packages/components":
   version: 0.0.0-use.local
   resolution: "components@workspace:packages/components"
+  dependencies:
+    "@emotion/core": ^10.0.28
+    react: ^16.13.1
+    react-dom: ^16.13.1
   languageName: unknown
   linkType: soft
 
@@ -8899,7 +8904,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"deepmerge@npm:^4.0.0, deepmerge@npm:^4.2.2":
+"deepmerge@npm:^4.2.2":
   version: 4.2.2
   resolution: "deepmerge@npm:4.2.2"
   checksum: 3/85abf8e0045ee280996e7d2396979c877ef0741e413b716e42441110e0a83ac08098b2a49cea035510060bf667c0eae3189b2a52349f5fa4b000c211041637b1
@@ -13828,13 +13833,6 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"load-script@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "load-script@npm:1.0.0"
-  checksum: 3/9f907ee20dfe8068af210be73a072dd61a287566a23b5666b9c6b9957e66eb33cc7c6a790308cf307c373d7ff75265ab1dde779c3fff90d65535fb3a1c0a167a
-  languageName: node
-  linkType: hard
-
 "loader-runner@npm:^2.4.0":
   version: 2.4.0
   resolution: "loader-runner@npm:2.4.0"
@@ -17572,7 +17570,7 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"react-dom@npm:^16.13.0, react-dom@npm:^16.8.3":
+"react-dom@npm:^16.13.0, react-dom@npm:^16.13.1, react-dom@npm:^16.8.3":
   version: 16.13.1
   resolution: "react-dom@npm:16.13.1"
   dependencies:
@@ -17704,19 +17702,6 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"react-player@npm:^1.15.3":
-  version: 1.15.3
-  resolution: "react-player@npm:1.15.3"
-  dependencies:
-    deepmerge: ^4.0.0
-    load-script: ^1.0.0
-    prop-types: ^15.7.2
-  peerDependencies:
-    react: "*"
-  checksum: 3/97d8a48517b968c2fbacbc9fac052d22c728d0276e8833285cc3238416d98c3b96569b8bf7368a5042c4fc3e1e2aaed6aec7ee323a3f6919af28e9573f8420f0
-  languageName: node
-  linkType: hard
-
 "react-popper-tooltip@npm:^2.8.3":
   version: 2.11.1
   resolution: "react-popper-tooltip@npm:2.11.1"
@@ -17846,7 +17831,7 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"react@npm:^16.13.0, react@npm:^16.8.3":
+"react@npm:^16.13.0, react@npm:^16.13.1, react@npm:^16.8.3":
   version: 16.13.1
   resolution: "react@npm:16.13.1"
   dependencies:
@@ -18167,7 +18152,7 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"redux@npm:*, redux@npm:^4.0.0, redux@npm:^4.0.1, redux@npm:^4.0.5":
+"redux@npm:*, redux@npm:^4.0.0, redux@npm:^4.0.5":
   version: 4.0.5
   resolution: "redux@npm:4.0.5"
   dependencies:
@@ -21554,22 +21539,6 @@ typescript@^3.8.3:
   languageName: node
   linkType: hard
 
-"video-react@npm:^0.14.1":
-  version: 0.14.1
-  resolution: "video-react@npm:0.14.1"
-  dependencies:
-    "@babel/runtime": ^7.4.5
-    classnames: ^2.2.6
-    lodash.throttle: ^4.1.1
-    prop-types: ^15.7.2
-    redux: ^4.0.1
-  peerDependencies:
-    react: ^15.0.0 || ^16.0.0
-    react-dom: ^15.0.0 || ^16.0.0
-  checksum: 3/a7f2c21905edc760274c37e203039dc554e6ebf8bc661781741e335fc381fac896f3e2743e4edb02900050d8b9354c091bea47e69b4dc5336793f1763063213b
-  languageName: node
-  linkType: hard
-
 "vlq@npm:^0.2.2":
   version: 0.2.3
   resolution: "vlq@npm:0.2.3"