platform: fix graphql codegen in action and graphiql editor

PR-URL: https://github.com/hasura/graphql-engine-mono/pull/6404 GitOrigin-RevId: f20eaece35f2c0b7d7db8b65908b608a79afcdba
2024-12-12 14:05:16 +03:00 · 2022-10-18 16:22:55 +02:00 · 2022-10-18 16:22:55 +02:00 · 7a7688ca9d
commit 7a7688ca9d
parent fbb0fbbe0b
7 changed files with 100 additions and 161 deletions
--- a/frontend/.npmrc
+++ b/frontend/.npmrc
@ -0,0 +1,3 @@
+# Needed for the time being, since we can't upgrade graphiql right now since it requires to update the whole graphql stack
+# See more here https://docs.npmjs.com/cli/v7/using-npm/config#legacy-peer-deps
+legacy-peer-deps=true
--- a/frontend/apps/console-ce/custom-webpack.config.js
+++ b/frontend/apps/console-ce/custom-webpack.config.js
@ -19,7 +19,6 @@ module.exports = (config, context) => {
        __DEVELOPMENT__: true,
        __DEVTOOLS__: true, // <-------- DISABLE redux-devtools HERE
        CONSOLE_ASSET_VERSION: Date.now().toString(),
-        'process.hrtime': () => null,
      }),
    ],
    module: {
--- a/frontend/apps/console-ce/src/polyfills.ts
+++ b/frontend/apps/console-ce/src/polyfills.ts
@ -5,4 +5,7 @@
 */
 import 'core-js/stable';
 import 'regenerator-runtime/runtime';
+// Needed for action codegen
+import 'browser-hrtime';
+
 (window as any).global = window;
--- a/frontend/apps/console-pro/custom-webpack.config.js
+++ b/frontend/apps/console-pro/custom-webpack.config.js
@ -19,7 +19,6 @@ module.exports = (config, context) => {
        __DEVELOPMENT__: true,
        __DEVTOOLS__: true, // <-------- DISABLE redux-devtools HERE
        CONSOLE_ASSET_VERSION: Date.now().toString(),
-        'process.hrtime': () => null,
      }),
    ],
    module: {
@ -69,16 +68,5 @@ module.exports = (config, context) => {
      },
    },
  });
-  /*
-  // Kept there while we setup everything
-  console.log('----------------NX-CONTEXT-------------------');
-  log(context);
-  console.log('----------------ORIGINAL-WEBPACK-CONFIG------');
-  log(config);
-  console.log('----------------MODIFIED-WEBPACK-CONFIG------');
-  log(output);
-  console.log('---------------------------------------------');
-
-   */
  return output;
 };
--- a/frontend/apps/console-pro/src/polyfills.ts
+++ b/frontend/apps/console-pro/src/polyfills.ts
@ -5,3 +5,7 @@
 */
 import 'core-js/stable';
 import 'regenerator-runtime/runtime';
+// Needed for action codegen
+import 'browser-hrtime';
+
+(window as any).global = window;
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@ -37,6 +37,7 @@
        "axios": "0.27.2",
        "babel-plugin-transform-runtime": "^6.23.0",
        "brace": "0.11.1",
+        "browser-hrtime": "^1.1.8",
        "case-sensitive-paths-webpack-plugin": "^2.3.0",
        "chart.js": "^2.8.0",
        "clsx": "1.1.1",
@ -21285,15 +21286,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "optional": true,
-      "dependencies": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
    "node_modules/bl": {
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
@ -21567,6 +21559,11 @@
      "integrity": "sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ==",
      "dev": true
    },
+    "node_modules/browser-hrtime": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/browser-hrtime/-/browser-hrtime-1.1.8.tgz",
+      "integrity": "sha512-kzXheikaJsBtzUBlyVtPIY5r0soQePzjwVwT4IlDpU2RvfB5Py52gpU98M77rgqMCheoSSZvrcrdj3t6cZ3suA=="
+    },
    "node_modules/browser-process-hrtime": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
@ -22672,6 +22669,52 @@
        "graphql": "^14.0.0 || ^15.0.0"
      }
    },
+    "node_modules/codemirror-graphql/node_modules/graphql-language-service-interface": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/graphql-language-service-interface/-/graphql-language-service-interface-2.4.2.tgz",
+      "integrity": "sha512-iFLMz51cA2L5Tu7/mP19++bRGUuIe2J9ekQZrcJ6sMYStsF60x5eNu3JqheduYTLhQaSdKN55jX7RlLeIDUhQA==",
+      "dependencies": {
+        "graphql-language-service-parser": "^1.6.4",
+        "graphql-language-service-types": "^1.6.3",
+        "graphql-language-service-utils": "^2.4.3",
+        "vscode-languageserver-types": "^3.15.1"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0"
+      }
+    },
+    "node_modules/codemirror-graphql/node_modules/graphql-language-service-parser": {
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/graphql-language-service-parser/-/graphql-language-service-parser-1.6.4.tgz",
+      "integrity": "sha512-Y365zUFfJ1GJ9NeRHb5Z/HBo6EnbuTi187Gkuldwd1YIDc0QcD7kqz6U5g043zd7BI/UZQth13Zd7pElvbb2zw==",
+      "dependencies": {
+        "graphql-language-service-types": "^1.6.3",
+        "typescript": "^3.9.5"
+      },
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0"
+      }
+    },
+    "node_modules/codemirror-graphql/node_modules/graphql-language-service-types": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/graphql-language-service-types/-/graphql-language-service-types-1.6.3.tgz",
+      "integrity": "sha512-VDtBhdan1iSe7ad7+eBbsO5rrzWQpC6aV4SxSHEi8AtEQOFXpnL9Lq5jSaN8O02pGvAUr4wNUPu0oRU5g2XmVA==",
+      "peerDependencies": {
+        "graphql": "^14.0.0 || ^15.0.0"
+      }
+    },
+    "node_modules/codemirror-graphql/node_modules/typescript": {
+      "version": "3.9.10",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
+      "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
    "node_modules/collapse-white-space": {
      "version": "1.0.6",
      "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz",
@ -27089,12 +27132,6 @@
        "ramda": "^0.28.0"
      }
    },
-    "node_modules/file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "optional": true
-    },
    "node_modules/filelist": {
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
@ -27797,20 +27834,6 @@
      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
    },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
    "node_modules/function-bind": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@ -28341,21 +28364,6 @@
        "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0"
      }
    },
-    "node_modules/graphql-language-service-interface": {
-      "version": "2.10.2",
-      "resolved": "https://registry.npmjs.org/graphql-language-service-interface/-/graphql-language-service-interface-2.10.2.tgz",
-      "integrity": "sha512-RKIEBPhRMWdXY3fxRs99XysTDnEgAvNbu8ov/5iOlnkZsWQNzitjtd0O0l1CutQOQt3iXoHde7w8uhCnKL4tcg==",
-      "dependencies": {
-        "graphql-config": "^4.1.0",
-        "graphql-language-service-parser": "^1.10.4",
-        "graphql-language-service-types": "^1.8.7",
-        "graphql-language-service-utils": "^2.7.1",
-        "vscode-languageserver-types": "^3.15.1"
-      },
-      "peerDependencies": {
-        "graphql": "^15.5.0 || ^16.0.0"
-      }
-    },
    "node_modules/graphql-language-service-parser": {
      "version": "1.10.4",
      "resolved": "https://registry.npmjs.org/graphql-language-service-parser/-/graphql-language-service-parser-1.10.4.tgz",
@ -35124,12 +35132,6 @@
      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
      "dev": true
    },
-    "node_modules/nan": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz",
-      "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==",
-      "optional": true
-    },
    "node_modules/nano-time": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz",
@ -36994,24 +36996,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/piping/node_modules/fsevents": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
    "node_modules/piping/node_modules/glob-parent": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
@ -46336,25 +46320,6 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/watchpack-chokidar2/node_modules/fsevents": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-      "deprecated": "fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
    "node_modules/watchpack-chokidar2/node_modules/glob-parent": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
@ -63852,15 +63817,6 @@
      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
      "dev": true
    },
-    "bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "optional": true,
-      "requires": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
    "bl": {
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
@ -64096,6 +64052,11 @@
      "integrity": "sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ==",
      "dev": true
    },
+    "browser-hrtime": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/browser-hrtime/-/browser-hrtime-1.1.8.tgz",
+      "integrity": "sha512-kzXheikaJsBtzUBlyVtPIY5r0soQePzjwVwT4IlDpU2RvfB5Py52gpU98M77rgqMCheoSSZvrcrdj3t6cZ3suA=="
+    },
    "browser-process-hrtime": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
@ -64934,6 +64895,38 @@
      "requires": {
        "graphql-language-service-interface": "^2.4.2",
        "graphql-language-service-parser": "^1.6.4"
+      },
+      "dependencies": {
+        "graphql-language-service-interface": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/graphql-language-service-interface/-/graphql-language-service-interface-2.4.2.tgz",
+          "integrity": "sha512-iFLMz51cA2L5Tu7/mP19++bRGUuIe2J9ekQZrcJ6sMYStsF60x5eNu3JqheduYTLhQaSdKN55jX7RlLeIDUhQA==",
+          "requires": {
+            "graphql-language-service-parser": "^1.6.4",
+            "graphql-language-service-types": "^1.6.3",
+            "graphql-language-service-utils": "2.4.3",
+            "vscode-languageserver-types": "^3.15.1"
+          }
+        },
+        "graphql-language-service-parser": {
+          "version": "1.6.4",
+          "resolved": "https://registry.npmjs.org/graphql-language-service-parser/-/graphql-language-service-parser-1.6.4.tgz",
+          "integrity": "sha512-Y365zUFfJ1GJ9NeRHb5Z/HBo6EnbuTi187Gkuldwd1YIDc0QcD7kqz6U5g043zd7BI/UZQth13Zd7pElvbb2zw==",
+          "requires": {
+            "graphql-language-service-types": "^1.6.3",
+            "typescript": "^3.9.5"
+          }
+        },
+        "graphql-language-service-types": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/graphql-language-service-types/-/graphql-language-service-types-1.6.3.tgz",
+          "integrity": "sha512-VDtBhdan1iSe7ad7+eBbsO5rrzWQpC6aV4SxSHEi8AtEQOFXpnL9Lq5jSaN8O02pGvAUr4wNUPu0oRU5g2XmVA=="
+        },
+        "typescript": {
+          "version": "3.9.10",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
+          "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q=="
+        }
      }
    },
    "collapse-white-space": {
@ -68469,12 +68462,6 @@
        "ramda": "^0.28.0"
      }
    },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "optional": true
-    },
    "filelist": {
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
@ -69033,13 +69020,6 @@
      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
    },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "optional": true
-    },
    "function-bind": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@ -69434,18 +69414,6 @@
        "lodash": "^4.17.4"
      }
    },
-    "graphql-language-service-interface": {
-      "version": "2.10.2",
-      "resolved": "https://registry.npmjs.org/graphql-language-service-interface/-/graphql-language-service-interface-2.10.2.tgz",
-      "integrity": "sha512-RKIEBPhRMWdXY3fxRs99XysTDnEgAvNbu8ov/5iOlnkZsWQNzitjtd0O0l1CutQOQt3iXoHde7w8uhCnKL4tcg==",
-      "requires": {
-        "graphql-config": "^4.1.0",
-        "graphql-language-service-parser": "^1.10.4",
-        "graphql-language-service-types": "^1.8.7",
-        "graphql-language-service-utils": "2.4.3",
-        "vscode-languageserver-types": "^3.15.1"
-      }
-    },
    "graphql-language-service-parser": {
      "version": "1.10.4",
      "resolved": "https://registry.npmjs.org/graphql-language-service-parser/-/graphql-language-service-parser-1.10.4.tgz",
@ -74529,12 +74497,6 @@
      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
      "dev": true
    },
-    "nan": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz",
-      "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==",
-      "optional": true
-    },
    "nano-time": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz",
@ -76008,16 +75970,6 @@
            }
          }
        },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
-        },
        "glob-parent": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
@ -83074,17 +83026,6 @@
            }
          }
        },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "bindings": "^1.5.0",
-            "nan": "^2.12.1"
-          }
-        },
        "glob-parent": {
          "version": "3.1.0",
          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
--- a/frontend/package.json
+++ b/frontend/package.json
@ -51,6 +51,7 @@
    "axios": "0.27.2",
    "babel-plugin-transform-runtime": "^6.23.0",
    "brace": "0.11.1",
+    "browser-hrtime": "^1.1.8",
    "case-sensitive-paths-webpack-plugin": "^2.3.0",
    "chart.js": "^2.8.0",
    "clsx": "1.1.1",