diff --git a/examples/editable-layers/codesandbox/world-heritage/package.json b/examples/editable-layers/codesandbox/world-heritage/package.json index 88b5c526..38bc8225 100644 --- a/examples/editable-layers/codesandbox/world-heritage/package.json +++ b/examples/editable-layers/codesandbox/world-heritage/package.json @@ -2,11 +2,11 @@ "dependencies": { "@deck.gl/core": "^8.8.23", "@deck.gl/react": "^8.8.23", - "@deck.gl-community/react": "0.0.1", + "@deck.gl-community/react": "^9.0.1", "@turf/helpers": "^6.5.0", "global": "4.4.0", - "react": "16.14.0", - "react-dom": "16.14.0", + "react": "^18.2.0", + "react-dom": "^18.2.0", "react-map-gl": "4.1.16", "react-scripts": "2.1.8" } diff --git a/examples/editable-layers/no-map/package.json b/examples/editable-layers/no-map/package.json index 82721434..f6281aaa 100644 --- a/examples/editable-layers/no-map/package.json +++ b/examples/editable-layers/no-map/package.json @@ -7,8 +7,8 @@ "@deck.gl/core": "^8.8.23", "@deck.gl/layers": "^8.8.23", "@deck.gl/react": "^8.8.23", - "react": "^16.14.0", - "react-dom": "^16.14.0", + "react": "^18.2.0", + "react-dom": "^18.2.0", "react-map-gl": "^7.1.7" }, "devDependencies": { diff --git a/modules/react/package.json b/modules/react/package.json index 3ff9a84d..0c79f067 100644 --- a/modules/react/package.json +++ b/modules/react/package.json @@ -38,13 +38,11 @@ "@types/styled-react-modal": "^1.2.5", "boxicons": "^2.1.4", "prop-types": "^15.8.1", - "styled-components": "^4.4.1", + "react": "^18.2.0", + "react-dom": "^18.2.0", + "styled-components": "^6.1.1", "styled-react-modal": "^3.1.1", "supercluster": "^8.0.1" }, - "peerDependencies": { - "react": "^16.14 || ^17", - "react-dom": "^16.14 || ^17" - }, "gitHead": "8374ab0ac62a52ae8a6b14276694cabced43de35" } diff --git a/package.json b/package.json index c6d8c6f0..e1d36cf7 100644 --- a/package.json +++ b/package.json @@ -74,5 +74,6 @@ "volta": { "node": "20.11.1", "yarn": "4.3.1" - } + }, + "packageManager": "yarn@4.4.0" } diff --git a/yarn.lock b/yarn.lock index bad0e4ea..ca3f86eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1779,12 +1779,11 @@ __metadata: "@types/styled-react-modal": "npm:^1.2.5" boxicons: "npm:^2.1.4" prop-types: "npm:^15.8.1" - styled-components: "npm:^4.4.1" + react: "npm:^18.2.0" + react-dom: "npm:^18.2.0" + styled-components: "npm:^6.1.1" styled-react-modal: "npm:^3.1.1" supercluster: "npm:^8.0.1" - peerDependencies: - react: ^16.14 || ^17 - react-dom: ^16.14 || ^17 languageName: unknown linkType: soft @@ -1956,6 +1955,15 @@ __metadata: languageName: node linkType: hard +"@emotion/is-prop-valid@npm:1.2.2": + version: 1.2.2 + resolution: "@emotion/is-prop-valid@npm:1.2.2" + dependencies: + "@emotion/memoize": "npm:^0.8.1" + checksum: 10c0/bb1530dcb4e0e5a4fabb219279f2d0bc35796baf66f6241f98b0d03db1985c890a8cafbea268e0edefd5eeda143dbd5c09a54b5fba74cee8c69b98b13194af50 + languageName: node + linkType: hard + "@emotion/is-prop-valid@npm:^0.8.1": version: 0.8.8 resolution: "@emotion/is-prop-valid@npm:0.8.8" @@ -1972,6 +1980,20 @@ __metadata: languageName: node linkType: hard +"@emotion/memoize@npm:^0.8.1": + version: 0.8.1 + resolution: "@emotion/memoize@npm:0.8.1" + checksum: 10c0/dffed372fc3b9fa2ba411e76af22b6bb686fb0cb07694fdfaa6dd2baeb0d5e4968c1a7caa472bfcf06a5997d5e7c7d16b90e993f9a6ffae79a2c3dbdc76dfe78 + languageName: node + linkType: hard + +"@emotion/unitless@npm:0.8.1": + version: 0.8.1 + resolution: "@emotion/unitless@npm:0.8.1" + checksum: 10c0/a1ed508628288f40bfe6dd17d431ed899c067a899fa293a13afe3aed1d70fac0412b8a215fafab0b42829360db687fecd763e5f01a64ddc4a4b58ec3112ff548 + languageName: node + linkType: hard + "@emotion/unitless@npm:^0.7.0": version: 0.7.5 resolution: "@emotion/unitless@npm:0.7.5" @@ -5392,6 +5414,13 @@ __metadata: languageName: node linkType: hard +"@types/stylis@npm:4.2.5": + version: 4.2.5 + resolution: "@types/stylis@npm:4.2.5" + checksum: 10c0/23f5b35a3a04f6bb31a29d404fa1bc8e0035fcaff2356b4047743a057e0c37b2eba7efe14d57dd2b95b398cea3bac294d9c6cd93ed307d8c0b7f5d282224b469 + languageName: node + linkType: hard + "@types/tough-cookie@npm:*": version: 4.0.5 resolution: "@types/tough-cookie@npm:4.0.5" @@ -7483,6 +7512,17 @@ __metadata: languageName: node linkType: hard +"css-to-react-native@npm:3.2.0": + version: 3.2.0 + resolution: "css-to-react-native@npm:3.2.0" + dependencies: + camelize: "npm:^1.0.0" + css-color-keywords: "npm:^1.0.0" + postcss-value-parser: "npm:^4.0.2" + checksum: 10c0/fde850a511d5d3d7c55a1e9b8ed26b69a8ad4868b3487e36ebfbfc0b96fc34bc977d9cd1d61a289d0c74d3f9a662d8cee297da53d4433bf2e27d6acdff8e1003 + languageName: node + linkType: hard + "css-to-react-native@npm:^2.2.2": version: 2.3.2 resolution: "css-to-react-native@npm:2.3.2" @@ -7542,7 +7582,7 @@ __metadata: languageName: node linkType: hard -"csstype@npm:^3.0.2": +"csstype@npm:3.1.3, csstype@npm:^3.0.2": version: 3.1.3 resolution: "csstype@npm:3.1.3" checksum: 10c0/80c089d6f7e0c5b2bd83cf0539ab41474198579584fa10d86d0cafe0642202343cbc119e076a0b1aece191989477081415d66c9fefbf3c957fc2fc4b7009f248 @@ -14624,6 +14664,24 @@ __metadata: languageName: node linkType: hard +"postcss-value-parser@npm:^4.0.2": + version: 4.2.0 + resolution: "postcss-value-parser@npm:4.2.0" + checksum: 10c0/f4142a4f56565f77c1831168e04e3effd9ffcc5aebaf0f538eee4b2d465adfd4b85a44257bb48418202a63806a7da7fe9f56c330aebb3cac898e46b4cbf49161 + languageName: node + linkType: hard + +"postcss@npm:8.4.38": + version: 8.4.38 + resolution: "postcss@npm:8.4.38" + dependencies: + nanoid: "npm:^3.3.7" + picocolors: "npm:^1.0.0" + source-map-js: "npm:^1.2.0" + checksum: 10c0/955407b8f70cf0c14acf35dab3615899a2a60a26718a63c848cf3c29f2467b0533991b985a2b994430d890bd7ec2b1963e36352b0774a19143b5f591540f7c06 + languageName: node + linkType: hard + "postcss@npm:^8.4.27, postcss@npm:^8.4.39": version: 8.4.40 resolution: "postcss@npm:8.4.40" @@ -15900,6 +15958,13 @@ __metadata: languageName: node linkType: hard +"shallowequal@npm:1.1.0": + version: 1.1.0 + resolution: "shallowequal@npm:1.1.0" + checksum: 10c0/b926efb51cd0f47aa9bc061add788a4a650550bbe50647962113a4579b60af2abe7b62f9b02314acc6f97151d4cf87033a2b15fc20852fae306d1a095215396c + languageName: node + linkType: hard + "sharp@npm:^0.32.6": version: 0.32.6 resolution: "sharp@npm:0.32.6" @@ -16573,6 +16638,26 @@ __metadata: languageName: node linkType: hard +"styled-components@npm:^6.1.1": + version: 6.1.12 + resolution: "styled-components@npm:6.1.12" + dependencies: + "@emotion/is-prop-valid": "npm:1.2.2" + "@emotion/unitless": "npm:0.8.1" + "@types/stylis": "npm:4.2.5" + css-to-react-native: "npm:3.2.0" + csstype: "npm:3.1.3" + postcss: "npm:8.4.38" + shallowequal: "npm:1.1.0" + stylis: "npm:4.3.2" + tslib: "npm:2.6.2" + peerDependencies: + react: ">= 16.8.0" + react-dom: ">= 16.8.0" + checksum: 10c0/1ad728aea763a26dbce5ede380ef54b0aacae177166d19346eed97eab8e46935b8797d3ba8e1db689605175d5f9c9892a60d91d2e797e2ea61901fb7f58ed1a5 + languageName: node + linkType: hard + "styled-react-modal@npm:^3.1.1": version: 3.1.1 resolution: "styled-react-modal@npm:3.1.1" @@ -16595,6 +16680,13 @@ __metadata: languageName: node linkType: hard +"stylis@npm:4.3.2": + version: 4.3.2 + resolution: "stylis@npm:4.3.2" + checksum: 10c0/0410e1404cbeee3388a9e17587875211ce2f014c8379af0d1e24ca55878867c9f1ccc7b0ce9a156ca53f5d6e301391a82b0645522a604674a378b3189a4a1994 + languageName: node + linkType: hard + "stylis@npm:^3.5.0": version: 3.5.4 resolution: "stylis@npm:3.5.4" @@ -17130,6 +17222,13 @@ __metadata: languageName: node linkType: hard +"tslib@npm:2.6.2": + version: 2.6.2 + resolution: "tslib@npm:2.6.2" + checksum: 10c0/e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb + languageName: node + linkType: hard + "tslib@npm:^1.8.1": version: 1.14.1 resolution: "tslib@npm:1.14.1"