fix: cross-drive linking support for amplify-dev #6951
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #6951 +/- ##
=======================================
Coverage 56.41% 56.41%
=======================================
Files 445 445
Lines 21764 21764
Branches 4354 4354
=======================================
Hits 12278 12278
Misses 8671 8671
Partials 815 815 Continue to review full report at Codecov.
|
cjihrig
reviewed
Mar 24, 2021
package.json
Outdated
| @@ -86,6 +86,7 @@ | |||
| "@typescript-eslint/parser": "^4.14.2", | |||
| "babel-loader": "^8.1.0", | |||
| "babel-eslint": "^10.1.0", | |||
| "@zkochan/cmd-shim": "^5.1.0", | |||
| "cmd-shim": "^3.0.3", | |||
There was a problem hiding this comment.
Can you remove this from package.json and yarn.lock.
cjihrig
reviewed
Mar 24, 2021
| @@ -86,6 +86,7 @@ | |||
| "@typescript-eslint/parser": "^4.14.2", | |||
| "babel-loader": "^8.1.0", | |||
| "babel-eslint": "^10.1.0", | |||
| "@zkochan/cmd-shim": "^5.1.0", | |||
There was a problem hiding this comment.
Did you add this entry by hand? It's not sorted.
There was a problem hiding this comment.
I did move its order around. The latest commit should sort everything properly.
|
It looks like there are conflicts. Can you please rebase this. |
PawanKolhe
force-pushed
the
amplify-dev-cross-drive-win
branch
from
f787e58 to
753f707
Compare
yuth
approved these changes
Mar 25, 2021
cjihrig
approved these changes
Mar 25, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Using the pnpm/cmd-shim library instead of npm/cmd-shim would fix the cross-drive linking issue for amplify-dev on Windows. A PR on
pnpm/cmd-shimfixed the issue whereas it's still not fixed onnpm/cmd-shim.This PR adds the
pnpm/cmd-shimlibrary and updates the imports inscripts/link-bin.jsIssue #, if available
fixes #6950
Description of how you validated changes
I checked the file at
C:\Users\Pawan\AppData\Local\Yarn\bin\amplify-dev.ps1for proper linking and verified that theamplify-devcommand is properly running in sample projects.Checklist
yarn testpassesBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.