Skip to content

Commit

Permalink
fix: forced resolution on types/react
Browse files Browse the repository at this point in the history
  • Loading branch information
jsalaber committed May 31, 2024
1 parent ba0aea7 commit 51d972c
Show file tree
Hide file tree
Showing 6 changed files with 115 additions and 47 deletions.
3 changes: 2 additions & 1 deletion examples/js/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"examples/js/src/assets"
],
"styles": ["examples/js/src/styles.css"],
"scripts": []
"scripts": [],
"webpackConfig": "examples/js/webpack.config.js"
},
"configurations": {
"production": {
Expand Down
2 changes: 1 addition & 1 deletion examples/js/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
]
},
"exclude": ["**/*.spec.ts", "**/*.test.ts"],
"include": ["**/*.ts"]
"include": ["**/*.ts", "webpack.config.js"]
}
8 changes: 8 additions & 0 deletions examples/js/webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
const { composePlugins, withNx } = require('@nx/webpack')

// Nx plugins for webpack.
module.exports = composePlugins(withNx(), (config) => {
// Update the webpack config as needed here.
// e.g. `config.plugins.push(new MyPlugin())`
return config
})
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@
"@testing-library/react": "15.0.6",
"@testing-library/react-native": "12.4.5",
"@types/async": "^3.2.8",
"@types/hoist-non-react-statics": "^3.3.1",
"@types/hoist-non-react-statics": "^3.3.2",
"@types/jest": "29.4.4",
"@types/lodash": "^4.14.175",
"@types/node": "18.19.33",
"@types/react": "18.3.1",
"@types/react": "^18.3.3",
"@types/react-dom": "18.3.0",
"@types/ua-parser-js": "^0.7.38",
"@types/uuid": "^8.3.1",
Expand Down
2 changes: 1 addition & 1 deletion sdk/nextjs/src/pages/appWithDevCycle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ const BootstrapSync = ({
return children
}

// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
export const appWithDevCycle = <Props extends NextJsAppProps>(
WrappedComponent: React.ComponentType<Props>,
additionalOptions: DevCycleNextOptions = {},
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
) => {
const AppWithDevCycle = (
props: Props & { pageProps: Props['pageProps'] & SSRProps },
Expand Down
143 changes: 101 additions & 42 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10684,13 +10684,13 @@ __metadata:
languageName: node
linkType: hard

"@types/hoist-non-react-statics@npm:^3.3.1":
version: 3.3.1
resolution: "@types/hoist-non-react-statics@npm:3.3.1"
"@types/hoist-non-react-statics@npm:^3.3.2":
version: 3.3.5
resolution: "@types/hoist-non-react-statics@npm:3.3.5"
dependencies:
"@types/react": "*"
hoist-non-react-statics: ^3.3.0
checksum: 2c0778570d9a01d05afabc781b32163f28409bb98f7245c38d5eaf082416fdb73034003f5825eb5e21313044e8d2d9e1f3fe2831e345d3d1b1d20bcd12270719
checksum: b645b062a20cce6ab1245ada8274051d8e2e0b2ee5c6bd58215281d0ec6dae2f26631af4e2e7c8abe238cdcee73fcaededc429eef569e70908f82d0cc0ea31d7
languageName: node
linkType: hard

Expand Down Expand Up @@ -10970,24 +10970,13 @@ __metadata:
languageName: node
linkType: hard

"@types/react@npm:*, @types/react@npm:>=16.9.11":
version: 18.2.20
resolution: "@types/react@npm:18.2.20"
dependencies:
"@types/prop-types": "*"
"@types/scheduler": "*"
csstype: ^3.0.2
checksum: 30f699c60e5e4bfef273ce64d320651cdd60f5c6a08361c6c7eca8cebcccda1ac953d2ee57c9f321b5ae87f8a62c72b6d35ca42df0e261d337849952daab2141
languageName: node
linkType: hard

"@types/react@npm:18.3.1":
version: 18.3.1
resolution: "@types/react@npm:18.3.1"
"@types/react@npm:*, @types/react@npm:>=16.9.11, @types/react@npm:^18.3.3":
version: 18.3.3
resolution: "@types/react@npm:18.3.3"
dependencies:
"@types/prop-types": "*"
csstype: ^3.0.2
checksum: 9224ef319a0c2b7f66e7e7f06012aa5eb638a6c76c9742843eab1a5d243f2bed5ff829ddbb41efd60d33a266420528adfcb84cb93f238b00e905f98c3a355768
checksum: c63d6a78163244e2022b01ef79b0baec4fe4da3475dc4a90bb8accefad35ef0c43560fd0312e5974f92a0f1108aa4d669ac72d73d66396aa060ea03b5d2e3873
languageName: node
linkType: hard

Expand All @@ -11014,13 +11003,6 @@ __metadata:
languageName: node
linkType: hard

"@types/scheduler@npm:*":
version: 0.16.2
resolution: "@types/scheduler@npm:0.16.2"
checksum: b6b4dcfeae6deba2e06a70941860fb1435730576d3689225a421280b7742318d1548b3d22c1f66ab68e414f346a9542f29240bc955b6332c5b11e561077583bc
languageName: node
linkType: hard

"@types/send@npm:*":
version: 0.17.1
resolution: "@types/send@npm:0.17.1"
Expand Down Expand Up @@ -11272,7 +11254,17 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/type-utils@npm:7.10.0, @typescript-eslint/type-utils@npm:^7.3.0":
"@typescript-eslint/scope-manager@npm:7.11.0":
version: 7.11.0
resolution: "@typescript-eslint/scope-manager@npm:7.11.0"
dependencies:
"@typescript-eslint/types": 7.11.0
"@typescript-eslint/visitor-keys": 7.11.0
checksum: c3fbf6c091b418a79cc3eb671184b83eaa26c06766aa78b4f32234d366f1130271317525b0b3bc38670195e4c608df049ae400cc343f6afa6104b2eec1bbb577
languageName: node
linkType: hard

"@typescript-eslint/type-utils@npm:7.10.0":
version: 7.10.0
resolution: "@typescript-eslint/type-utils@npm:7.10.0"
dependencies:
Expand All @@ -11289,6 +11281,23 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/type-utils@npm:^7.3.0":
version: 7.11.0
resolution: "@typescript-eslint/type-utils@npm:7.11.0"
dependencies:
"@typescript-eslint/typescript-estree": 7.11.0
"@typescript-eslint/utils": 7.11.0
debug: ^4.3.4
ts-api-utils: ^1.3.0
peerDependencies:
eslint: ^8.56.0
peerDependenciesMeta:
typescript:
optional: true
checksum: c4d085a7cc792b971696527d7c55ed0b9d45277fef9cdb100685a839b69a7b6deeae2119b6010b01c14f4f72b49545310f006af6da02e5005e9a11447398847a
languageName: node
linkType: hard

"@typescript-eslint/types@npm:6.19.1":
version: 6.19.1
resolution: "@typescript-eslint/types@npm:6.19.1"
Expand All @@ -11303,6 +11312,13 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/types@npm:7.11.0":
version: 7.11.0
resolution: "@typescript-eslint/types@npm:7.11.0"
checksum: 1c2cf1540f08240e12da522fe3b23054adaffc7c5a82eb0fc94b982454ba527358f00c018fba06826ad42708fcb73237f823891d4d3bf18faa5cabee37cd76d4
languageName: node
linkType: hard

"@typescript-eslint/typescript-estree@npm:6.19.1":
version: 6.19.1
resolution: "@typescript-eslint/typescript-estree@npm:6.19.1"
Expand Down Expand Up @@ -11341,7 +11357,26 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/utils@npm:7.10.0, @typescript-eslint/utils@npm:^7.3.0":
"@typescript-eslint/typescript-estree@npm:7.11.0":
version: 7.11.0
resolution: "@typescript-eslint/typescript-estree@npm:7.11.0"
dependencies:
"@typescript-eslint/types": 7.11.0
"@typescript-eslint/visitor-keys": 7.11.0
debug: ^4.3.4
globby: ^11.1.0
is-glob: ^4.0.3
minimatch: ^9.0.4
semver: ^7.6.0
ts-api-utils: ^1.3.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 026e857152874764c18a4f3a7b443f4fc757cf3e1d106f85df9d283205f6b2192ec3d771d71dddd77d1f15df61fb99e3a65e661c5fe39793462050d425463f33
languageName: node
linkType: hard

"@typescript-eslint/utils@npm:7.10.0":
version: 7.10.0
resolution: "@typescript-eslint/utils@npm:7.10.0"
dependencies:
Expand All @@ -11355,6 +11390,20 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/utils@npm:7.11.0, @typescript-eslint/utils@npm:^7.3.0":
version: 7.11.0
resolution: "@typescript-eslint/utils@npm:7.11.0"
dependencies:
"@eslint-community/eslint-utils": ^4.4.0
"@typescript-eslint/scope-manager": 7.11.0
"@typescript-eslint/types": 7.11.0
"@typescript-eslint/typescript-estree": 7.11.0
peerDependencies:
eslint: ^8.56.0
checksum: 287d0798dcfd5c56c73dc2a417c3442edb19deb6f274e2406e52b4ac9088494ed4c94b4b8ae8adff7ae2b7a1c520e9643e415018348bf1ec1b17605e7e565488
languageName: node
linkType: hard

"@typescript-eslint/visitor-keys@npm:6.19.1":
version: 6.19.1
resolution: "@typescript-eslint/visitor-keys@npm:6.19.1"
Expand All @@ -11375,6 +11424,16 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/visitor-keys@npm:7.11.0":
version: 7.11.0
resolution: "@typescript-eslint/visitor-keys@npm:7.11.0"
dependencies:
"@typescript-eslint/types": 7.11.0
eslint-visitor-keys: ^3.4.3
checksum: 5f1170c1e3110c53b5433949f98079d8bbc8a4334dfef96c802a6df6d475e187796180f844edcff0928a5c2ae5da4babcb5f50c658f61c6fb940efda7457a433
languageName: node
linkType: hard

"@ungap/structured-clone@npm:^1.2.0":
version: 1.2.0
resolution: "@ungap/structured-clone@npm:1.2.0"
Expand Down Expand Up @@ -12086,14 +12145,14 @@ __metadata:
linkType: hard

"ajv@npm:^8.12.0":
version: 8.13.0
resolution: "ajv@npm:8.13.0"
version: 8.14.0
resolution: "ajv@npm:8.14.0"
dependencies:
fast-deep-equal: ^3.1.3
json-schema-traverse: ^1.0.0
require-from-string: ^2.0.2
uri-js: ^4.4.1
checksum: 6de82d0b2073e645ca3300561356ddda0234f39b35d2125a8700b650509b296f41c00ab69f53178bbe25ad688bd6ac3747ab44101f2f4bd245952e8fd6ccc3c1
checksum: 83a933ee20ca25026236cd44634ab8b88d386be26f666e4bc8e34085bbe6775bdb52cb8e25afdaca20d90cb59828a4a168993e21dd2adad3612308f568b2320e
languageName: node
linkType: hard

Expand Down Expand Up @@ -12763,13 +12822,13 @@ __metadata:
linkType: hard

"axios@npm:^1.6.0":
version: 1.6.8
resolution: "axios@npm:1.6.8"
version: 1.7.2
resolution: "axios@npm:1.7.2"
dependencies:
follow-redirects: ^1.15.6
form-data: ^4.0.0
proxy-from-env: ^1.1.0
checksum: bf007fa4b207d102459300698620b3b0873503c6d47bf5a8f6e43c0c64c90035a4f698b55027ca1958f61ab43723df2781c38a99711848d232cad7accbcdfcdd
checksum: e457e2b0ab748504621f6fa6609074ac08c824bf0881592209dfa15098ece7e88495300e02cd22ba50b3468fd712fe687e629dcb03d6a3f6a51989727405aedf
languageName: node
linkType: hard

Expand Down Expand Up @@ -13949,9 +14008,9 @@ __metadata:
linkType: hard

"caniuse-lite@npm:^1.0.30001406, caniuse-lite@npm:^1.0.30001587":
version: 1.0.30001621
resolution: "caniuse-lite@npm:1.0.30001621"
checksum: 0afb65bbf558faea769c16e831fbbd5600c684c0f6bb4ffbc0d38528671fb5cb5d88714804241a88c61872ce289f7c6333aef6cfdfb09277bda0dbdf0aab3459
version: 1.0.30001625
resolution: "caniuse-lite@npm:1.0.30001625"
checksum: e7f8b9e10c35a5d9a1d1db76be398cb1c592ee1bc905fabe6bd90313537099d29a65c49c85e6350132fa30ca20e8c0317ecfaa66d997f7fac21ff37ddaece2a9
languageName: node
linkType: hard

Expand Down Expand Up @@ -16010,11 +16069,11 @@ __metadata:
"@testing-library/react-native": 12.4.5
"@types/async": ^3.2.8
"@types/express": ^4.17.17
"@types/hoist-non-react-statics": ^3.3.1
"@types/hoist-non-react-statics": ^3.3.2
"@types/jest": 29.4.4
"@types/lodash": ^4.14.175
"@types/node": 18.19.33
"@types/react": 18.3.1
"@types/react": ^18.3.3
"@types/react-dom": 18.3.0
"@types/ua-parser-js": ^0.7.38
"@types/uuid": ^8.3.1
Expand Down Expand Up @@ -16559,9 +16618,9 @@ __metadata:
linkType: hard

"electron-to-chromium@npm:^1.4.668":
version: 1.4.782
resolution: "electron-to-chromium@npm:1.4.782"
checksum: 3f490715895721feff81702b39c684028451f5d43b5cb047f8c52f2abfcb8928c8b84dc08bc3107ff37050e29fae2ccab03e78a8e487998323b3b301bc1ff3a4
version: 1.4.787
resolution: "electron-to-chromium@npm:1.4.787"
checksum: 0cfac6acabd8d779a4f1a3a47b91bfddf0275f2448a800830953caa46d3ccdbf548054f86c97196de147dd7abdbc2491e2628364f353d1852d9045502aa87f0f
languageName: node
linkType: hard

Expand Down

0 comments on commit 51d972c

Please sign in to comment.