Merge branch 'upstream-development'

Author: pol-rivero

app/src/lib/custom-integration.ts

@@ -69,7 +69,14 @@ export function expandTargetPathArgument(
   args: ReadonlyArray<string>,
   repoPath: string
 ): ReadonlyArray<string> {
-  return args.map(arg => arg.replaceAll(TargetPathArgument, repoPath))
+  return args.map(arg =>
+    arg
+      // If the placeholder is already quoted (e.g. "%TARGET_PATH%"), replace
+      // it including the surrounding quotes to avoid double-quoting the path.
+      .replaceAll(`"${TargetPathArgument}"`, `"${repoPath}"`)
+      // For unquoted occurrences, wrap the path in quotes.
+      .replaceAll(TargetPathArgument, `"${repoPath}"`)
+  )
 }
 
 /**

app/src/lib/stores/sign-in-store.ts

@@ -500,7 +500,7 @@ export class SignInStore extends TypedBaseStore<SignInState | null> {
       let error = e
       if (e.name === InvalidURLErrorName) {
         error = new Error(
-          `The GitHub Enterprise instance address doesn't appear to be a valid URL. We're expecting something like https://github.example.com.`
+          `The GitHub Enterprise instance address doesn't appear to be a valid URL. We're expecting something like https://example.ghe.com.`
         )
       } else if (e.name === InvalidProtocolErrorName) {
         error = new Error(

app/src/ui/lib/enterprise-server-entry.tsx

@@ -54,11 +54,11 @@ export class EnterpriseServerEntry extends React.Component<
     return (
       <Form onSubmit={this.onSubmit}>
         <TextBox
-          label="Enterprise or AE address"
+          label="Enterprise address"
           autoFocus={true}
           disabled={disableEntry}
           onValueChanged={this.onServerAddressChanged}
-          placeholder="https://github.example.com"
+          placeholder="https://example.ghe.com"
         />
 
         {this.props.error ? <Errors>{this.props.error.message}</Errors> : null}

app/src/ui/sign-in/sign-in.tsx

@@ -173,7 +173,7 @@ export class SignIn extends React.Component<ISignInProps, ISignInState> {
             label="Enterprise address"
             value={this.state.endpoint}
             onValueChanged={this.onEndpointChanged}
-            placeholder="https://github.example.com"
+            placeholder="https://example.ghe.com"
           />
         </Row>
       </DialogContent>

app/test/unit/ui/welcome-and-sign-in-wrappers-test.tsx

@@ -87,7 +87,7 @@ describe('welcome and sign-in wrappers', () => {
       </SignIn>
     )
 
-    const input = screen.getByLabelText('Enterprise or AE address')
+    const input = screen.getByLabelText('Enterprise address')
     const continueButton = screen.getByRole('button', { name: 'Continue' })
 
     fireEvent.change(input, {

yarn.lock

@@ -4118,9 +4118,9 @@ fast-levenshtein@^2.0.6:
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fast-xml-parser@^4.4.1:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.5.4.tgz#64e52ddf1308001893bd225d5b1768840511c797"
-  integrity sha512-jE8ugADnYOBsu1uaoayVl1tVKAMNOXyjwvv2U6udEA2ORBhDooJDWoGxTkhd4Qn4yh59JVVt/pKXtjPwx9OguQ==
+  version "4.5.6"
+  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.5.6.tgz#4ff57d4aca13a2d11aa42ad460495cf00f32b655"
+  integrity sha512-Yd4vkROfJf8AuJrDIVMVmYfULKmIJszVsMv7Vo71aocsKgFxpdlpSHXSaInvyYfgw2PRuObQSW2GFpVMUjxu9A==
   dependencies:
     strnum "^1.0.5"