Merge branch 'main' into feat--vercel-teams

phasehq · Dec 5, 2024 · f32ee17 · f32ee17
2 parents 51f9994 + 3602484
commit f32ee17
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 18 deletions.
diff --git a/frontend/apollo/client.ts b/frontend/apollo/client.ts
@@ -46,4 +46,9 @@ const errorLink = onError(({ graphQLErrors, networkError, operation, forward })
 export const graphQlClient = new ApolloClient({
   link: from([errorLink, httpLink]),
   cache: new InMemoryCache(),
+  defaultOptions: {
+    watchQuery: {
+      skipPollAttempt: () => document.hidden
+    }
+  }
 })
diff --git a/frontend/components/apps/DeleteAppDialog.tsx b/frontend/components/apps/DeleteAppDialog.tsx
@@ -143,19 +143,15 @@ export default function DeleteAppDialog(props: {
                       </Alert>
 
                       <div className="flex flex-col justify-center max-w-md mx-auto">
-                        <label
-                          className="block text-gray-700 text-sm font-bold mb-2"
-                          htmlFor="appname"
-                        >
-                          Please type the App name to confirm
-                        </label>
+                        <div className="text-sm text-gray-500 dark:text-gray-400 mb-2">
+                          Please enter the App name <span className="text-gray-900 dark:text-white font-mono font-medium">{appName}</span> to confirm:
+                        </div>
                         <input
                           id="appname"
                           className="text-lg"
                           required
                           maxLength={64}
                           value={typedName}
-                          placeholder="MyApp"
                           onChange={(e) => setTypedName(e.target.value)}
                         />
                       </div>

diff --git a/frontend/components/dashboard/CliInstallCommands.tsx b/frontend/components/dashboard/CliInstallCommands.tsx
@@ -22,7 +22,7 @@ export const CliInstallCommands = () => {
       styledScript: (
         <div className="space-y-1">
           <pre>
-            <span className="text-emerald-800 dark:text-emerald-300">scoop</span> scoop bucket add
+            <span className="text-emerald-800 dark:text-emerald-300">scoop</span> bucket add
             phasehq https://github.com/phasehq/scoop-cli.git
           </pre>
           <pre>
@@ -63,22 +63,23 @@ export const CliInstallCommands = () => {
     },
     {
       name: 'Python Pip',
-      rawScript: 'pip install phase',
+      rawScript: 'pip install phase-cli',
       styledScript: (
         <pre>
-          <span className="text-emerald-800 dark:text-emerald-300">pip3</span> install phase-cli
+          <span className="text-emerald-800 dark:text-emerald-300">pip</span> install phase-cli
         </pre>
       ),
     },
     {
       name: 'Alpine Linux',
-      rawScript: 'apk add --no-cache curl && curl -fsSL https://pkg.phase.dev/install.sh | sh',
+      rawScript: 'apk update && apk add --no-cache curl bash && curl -fsSL https://pkg.phase.dev/install.sh | bash',
       styledScript: (
         <pre>
-          <span className="text-emerald-800 dark:text-emerald-300">apk</span> add --no-cache curl &&
+          <span className="text-emerald-800 dark:text-emerald-300">apk</span> update &&
+          <span className="text-emerald-800 dark:text-emerald-300"> apk</span> add --no-cache curl bash &&
           <span className="text-emerald-800 dark:text-emerald-300"> curl</span> -fsSL
           https://pkg.phase.dev/install.sh |
-          <span className="text-emerald-800 dark:text-emerald-300">sh</span>
+          <span className="text-emerald-800 dark:text-emerald-300"> bash</span>
         </pre>
       ),
     },

diff --git a/frontend/package.json b/frontend/package.json
@@ -11,7 +11,7 @@
     "codegen": "graphql-codegen --config codegen.ts"
   },
   "dependencies": {
-    "@apollo/client": "^3.8.10",
+    "@apollo/client": "^3.11.10",
     "@headlessui/react": "^1.7.18",
     "@heroicons/react": "^2.1.1",
     "@stripe/react-stripe-js": "^2.7.3",

diff --git a/frontend/yarn.lock b/frontend/yarn.lock
@@ -20,18 +20,20 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@apollo/client@^3.8.10":
-  version "3.8.10"
-  resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.8.10.tgz#db6ee4378212d93c1f22b90a2aa474f6e9664b68"
-  integrity sha512-p/22RZ8ehHyvySnC20EHPPe0gdu8Xp6ZCiXOfdEe1ZORw5cUteD/TLc66tfKv8qu8NLIfbiWoa+6s70XnKvxqg==
+"@apollo/client@^3.11.10":
+  version "3.11.10"
+  resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.11.10.tgz#e16ae82ea9b16536ffd109847d24f9293fab5c4d"
+  integrity sha512-IfGc+X4il0rDqVQBBWdxIKM+ciDCiDzBq9+Bg9z4tJMi87uF6po4v+ddiac1wP0ARgVPsFwEIGxK7jhN4pW8jg==
   dependencies:
     "@graphql-typed-document-node/core" "^3.1.1"
+    "@wry/caches" "^1.0.0"
     "@wry/equality" "^0.5.6"
     "@wry/trie" "^0.5.0"
     graphql-tag "^2.12.6"
     hoist-non-react-statics "^3.3.2"
     optimism "^0.18.0"
     prop-types "^15.7.2"
+    rehackt "^0.1.0"
     response-iterator "^0.2.6"
     symbol-observable "^4.0.0"
     ts-invariant "^0.10.3"
@@ -8258,6 +8260,11 @@ regexp.prototype.flags@^1.5.1:
     define-properties "^1.2.0"
     set-function-name "^2.0.0"
 
+rehackt@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/rehackt/-/rehackt-0.1.0.tgz#a7c5e289c87345f70da8728a7eb878e5d03c696b"
+  integrity sha512-7kRDOuLHB87D/JESKxQoRwv4DzbIdwkAGQ7p6QKGdVlY1IZheUnVhlk/4UZlNUVxdAXpyxikE3URsG067ybVzw==
+
 [email protected]:
   version "12.0.0"
   resolved "https://registry.yarnpkg.com/relay-runtime/-/relay-runtime-12.0.0.tgz#1e039282bdb5e0c1b9a7dc7f6b9a09d4f4ff8237"