Skip to content

Commit

Permalink
Merge pull request #3814 from Shopify/fix-react-mismatch-main
Browse files Browse the repository at this point in the history
Fix react mismatch
  • Loading branch information
isaacroldan authored Apr 30, 2024
2 parents 44b8196 + 1ae0f71 commit 5bcf616
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"h3": "0.7.21",
"http-proxy": "1.18.1",
"micromatch": "4.0.5",
"react": "18.2.0",
"react": "^18.2.0",
"react-dom": "18.2.0",
"ws": "8.13.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
"node-fetch": "3.3.2",
"open": "8.4.2",
"pathe": "1.1.1",
"react": "18.2.0",
"react": "^18.2.0",
"semver": "7.5.4",
"simple-git": "3.19.1",
"stacktracey": "2.1.8",
Expand Down
1 change: 0 additions & 1 deletion packages/plugin-cloudflare/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "@shopify/plugin-cloudflare",
"version": "3.59.0",
"private": true,
"description": "Enables the creation of Cloudflare tunnels from `shopify app dev`, allowing previews from any device",
"keywords": [
"shopify",
Expand Down
4 changes: 2 additions & 2 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion workspace/src/lint.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@ console.info(colors.green.bold(`Linting that packages have strict version requir
const packageJsonPaths = await fg(path.join(rootDirectory, 'packages/*/package.json'), {type: 'file'})
const dependenciesWithLooseVersionRequirement = []
const internalPackages = ['@shopify/ui-extensions-dev-console-app']
const ignoredDependencies = ['react']
for (const packageJsonPath of packageJsonPaths) {
const {dependencies, name: pkg} = JSON.parse((await fs.readFile(packageJsonPath)).toString())
if (internalPackages.includes(pkg) || !dependencies) {
continue
}
for (const [dependency, version] of Object.entries(dependencies)) {
if (version.startsWith('^')) {
if (version.startsWith('^') && !ignoredDependencies.includes(dependency)) {
dependenciesWithLooseVersionRequirement.push({pkg, dependency, version})
}
}
Expand Down

0 comments on commit 5bcf616

Please sign in to comment.