Skip to content

Commit

Permalink
Fix package.json merge inconsistency
Browse files Browse the repository at this point in the history
A bad merge means that our repo has devDependencies for both `react-native-platform-override@^1.6.5`, and `react-native-platform-override@^1.6.4`. These resolve to the same dependency, even locally, so this would normally be pretty harmless.

Beachball, at a very close time, has started failing to publish packages to Verdaccio, in our PR environment. The state between npmjs, and GitHub is consistent, as verified by `beachball sync`. It shows trying to bump packages that no longer exist in our package,json versions. This can be locally reproed via `beachball bump --verbose` against the PR in #9491.

```
PS C:\Users\nickg\Desktop\react-native-windows> npx beachball bump --verbose
Checking for changes against "origin/main"
fetching latest from remotes "origin/main"
Your local repository already has change files for these packages:
  @office-iss/react-native-win32
  react-native-windows
...
@react-native-windows/virtualized-list needs to be bumped because react-native-platform-override ^1.6.4 -> ^1.6.5
```

Trying to publish based on bump info, we then see `ERROR: Attempting to bump to a version that already exists in the registry: @react-native-windows/virtualized-list@0.0.0-canary.29`

Testing to see if removing the dependency incosnsistency fixes the incorrectly determined packages.bump. This change would not be accepted by PR, so I am commiting directly.
  • Loading branch information
NickGerleman committed Feb 11, 2022
1 parent 4cc2154 commit c3d84b0
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions packages/@office-iss/react-native-win32-tester/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
"eslint": "^7.32.0",
"just-scripts": "^1.3.3",
"react-native": "0.0.0-20220206-2010-113f8257c",
"react-native-platform-override": "^1.6.4",
"react-native-platform-override": "^1.6.5",
"typescript": "^4.4.4"
},
"engines": {
"node": ">= 14"
}
}
}
2 changes: 1 addition & 1 deletion packages/@office-iss/react-native-win32/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"prettier": "^2.4.1",
"react": "17.0.2",
"react-native": "0.0.0-20220206-2010-113f8257c",
"react-native-platform-override": "^1.6.4",
"react-native-platform-override": "^1.6.5",
"react-shallow-renderer": "16.14.1",
"typescript": "^4.4.4"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-native-windows/tester/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
"eslint": "^7.32.0",
"just-scripts": "^1.3.3",
"react-native": "0.0.0-20220206-2010-113f8257c",
"react-native-platform-override": "^1.6.4",
"react-native-platform-override": "^1.6.5",
"react-native-windows": "^0.0.0-canary.453",
"typescript": "^4.4.4"
},
"engines": {
"node": ">= 14"
}
}
}
4 changes: 2 additions & 2 deletions packages/@react-native-windows/virtualized-list/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"prettier": "^2.4.1",
"react": "17.0.2",
"react-native": "0.0.0-20220206-2010-113f8257c",
"react-native-platform-override": "^1.6.4"
"react-native-platform-override": "^1.6.5"
},
"peerDependencies": {
"react": "17.0.2",
Expand All @@ -44,4 +44,4 @@
"engines": {
"node": ">= 14"
}
}
}
2 changes: 1 addition & 1 deletion vnext/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"prettier": "^2.4.1",
"react": "17.0.2",
"react-native": "0.0.0-20220206-2010-113f8257c",
"react-native-platform-override": "^1.6.4",
"react-native-platform-override": "^1.6.5",
"react-refresh": "^0.4.0",
"react-shallow-renderer": "16.14.1",
"typescript": "^4.4.4"
Expand Down

0 comments on commit c3d84b0

Please sign in to comment.