Merge pull request #440 from coasys/launcher-fixes

Launcher fixes

.circleci/config.yml

@@ -52,6 +52,9 @@ jobs:
       - run:
           name: Install dependencies
           command: pnpm install --no-frozen-lockfile
+      - run:
+          name: Install core dependencies
+          command: cd ./core && pnpm install --no-frozen-lockfile
       - run:
           name: Build ADAM (without bootstrap languages)
           command: pnpm run build-libs
@@ -111,6 +114,9 @@ jobs:
       - run:
           name: Install dependencies
           command: pnpm install --no-frozen-lockfile
+      - run:
+          name: Install core dependencies
+          command: cd ./core && pnpm install --no-frozen-lockfile
       - run:
           name: Build bootstrap languages
           command: pnpm run build-languages

.github/workflows/integration_cli.yml.disabled

@@ -27,6 +27,11 @@ jobs:
         override: true
         toolchain: 1.73.0
 
+    - name: Use Python 3.11
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
+
     - name: Install protobuf & cmake
       run: brew install protobuf cmake
 
@@ -76,4 +81,3 @@ jobs:
 
     - name: Run integration test script
       run: ./tests/bats/bin/bats tests/integration.bats || cat ~/Library/Logs/DiagnosticReports/*
-

.github/workflows/integration_js.yml.disabled

@@ -71,6 +71,9 @@ jobs:
     - name: Install dependencies
       run: pnpm install --no-frozen-lockfile
 
+    - name: Install core dependencies
+      run: cd ./core && pnpm install --no-frozen-lockfile
+
     - name: Build the workspace
       run: pnpm run build
 

.github/workflows/publish.yml

@@ -122,6 +122,9 @@ jobs:
     - name: pnpm Install
       run: pnpm install
 
+    - name: Install core dependencies
+      run: cd ./core && pnpm install
+
     - name: Build AD4M-CLI & build Launcher binary (macos/linux-latest)
       if: matrix.platform != 'windows-latest'
       env:
@@ -313,6 +316,9 @@ jobs:
       - name: Install deps
         run: pnpm install
 
+      - name: Install core dependencies
+        run: cd ./core && pnpm install
+
       - name: Install Deno
         uses: denoland/setup-deno@v1
         with:

.github/workflows/publish_staging.yml

@@ -116,6 +116,9 @@ jobs:
     - name: pnpm Install
       run: pnpm install --no-cache
 
+    - name: Install core dependencies
+      run: cd ./core && pnpm install --no-cache
+
     - name: Build AD4M-CLI & build Launcher binary (macos/linux-latest)
       if: matrix.platform != 'windows-latest'
       env:
@@ -332,6 +335,9 @@ jobs:
       - name: Install deps
         run: pnpm install
 
+      - name: Install core dependencies
+        run: cd ./core && pnpm install
+
       - name: Install Deno
         uses: denoland/setup-deno@v1
         with:

connect/src/components/Start.ts

@@ -46,17 +46,22 @@ export default function Start({
             </div>`
         : html`<div class="text-center">
             <a class="button" target="_blank" @click=${() => connect()}>
-              Connect to AD4M
+              Connect to ADAM
             </a>
             <p>
-              Please connect to AD4M once you have downloaded and setup your
-              AD4M agent
+              Please connect to ADAM once you have downloaded and setup your
+              ADAM agent
             </p>
           </div>`}
 
+      <p style="height: 10px; color: red; font-size: 14px; text-align: center; margin: 0; margin-top: -30px;">
+        Please make sure you have the ADAM Launcher running on your computer and there are no browser restrictions ("Shields") blocking your connection to ADAM on localhost.
+        (Safari users: please use a different browser for now. Safari is very strict about this and we are working on a solution.)
+      </p>
+
       <div class="text-center">
         <a class="button button--link" _target="blank" href="https://ad4m.dev"
-          >Learn more about AD4M</a
+          >Learn more about ADAM</a
         >
       </div>
     </div>

core/package.json

@@ -42,10 +42,10 @@
     "type-graphql": "1.1.1"
   },
   "devDependencies": {
+    "@apollo/server": "^4.9.4",
     "@rollup/plugin-alias": "^3.1.5",
     "@rollup/plugin-commonjs": "^20.0.0",
     "@rollup/plugin-node-resolve": "^13.0.4",
-    "@apollo/server": "^4.9.4",
     "concat-md": "^0.5.0",
     "cross-fetch": "^3.1.4",
     "graphql-ws": "5.12.0",
@@ -57,5 +57,11 @@
     "typescript": "^4.6.2",
     "ws": "8.13.0"
   },
-  "version": "0.8.1"
+  "patchedDependencies": {},
+  "version": "0.8.1",
+  "pnpm": {
+    "patchedDependencies": {
+      "graphql@15.7.2": "patches/graphql@15.7.2.patch"
+    }
+  }
 }

core/patches/graphql@15.7.2.patch

@@ -0,0 +1,39 @@
+diff --git a/jsutils/instanceOf.js b/jsutils/instanceOf.js
+index 709809415e672ef9fc2d8be060129fd832844ce9..99ba91717b9cc12c55e2d2854903f3e45b1f3e96 100644
+--- a/jsutils/instanceOf.js
++++ b/jsutils/instanceOf.js
+@@ -13,7 +13,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
+
+ // See: https://expressjs.com/en/advanced/best-practice-performance.html#set-node_env-to-production
+ // See: https://webpack.js.org/guides/production/
+-var _default = process.env.NODE_ENV === 'production' ? // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2317')
++var _default = true ? // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2317')
+ // eslint-disable-next-line no-shadow
+ function instanceOf(value, constructor) {
+   return value instanceof constructor;
+diff --git a/jsutils/instanceOf.js.flow b/jsutils/instanceOf.js.flow
+index 58faa02c8b490cb5caeccfb6b7ffc1faf3277554..8d476bfa2d0e772d5d0e6f74eb39824df89c455d 100644
+--- a/jsutils/instanceOf.js.flow
++++ b/jsutils/instanceOf.js.flow
+@@ -12,7 +12,7 @@ declare function instanceOf(
+
+ // See: https://expressjs.com/en/advanced/best-practice-performance.html#set-node_env-to-production
+ // See: https://webpack.js.org/guides/production/
+-export default process.env.NODE_ENV === 'production'
++export default true
+   ? // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2317')
+     // eslint-disable-next-line no-shadow
+     function instanceOf(value: mixed, constructor: mixed): boolean {
+diff --git a/jsutils/instanceOf.mjs b/jsutils/instanceOf.mjs
+index ff46fcaf4c187eed1523fc923d5b67697ff2d793..5a1f7a2ad87cb0dad8a7b47a9a09b49286022b88 100644
+--- a/jsutils/instanceOf.mjs
++++ b/jsutils/instanceOf.mjs
+@@ -8,7 +8,7 @@ import inspect from "./inspect.mjs";
+
+ // See: https://expressjs.com/en/advanced/best-practice-performance.html#set-node_env-to-production
+ // See: https://webpack.js.org/guides/production/
+-export default process.env.NODE_ENV === 'production' ? // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2317')
++export default true ? // istanbul ignore next (See: 'https://github.com/graphql/graphql-js/issues/2317')
+ // eslint-disable-next-line no-shadow
+ function instanceOf(value, constructor) {
+   return value instanceof constructor;