@stepzen/graphiql-proxy 0.44.0 → 0.45.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stepzen/graphiql-proxy",
-  "version": "0.44.0",
+  "version": "0.45.0-beta.1",
   "author": "Darren Waddell <darren@stepzen.com>",
   "license": "MIT",
   "homepage": "https://stepzen.com",
@@ -9,26 +9,27 @@
     "/src/ui/build"
   ],
   "engines": {
-    "node": ">=14.0.1",
-    "npm": ">=6.14"
+    "node": ">=18.0"
   },
-  "main": "src/server",
+  "type": "module",
+  "main": "src/server/index.js",
   "scripts": {
     "dev:server": "nodemon src/dev --watch src/dev --watch src/server",
     "dev:ui": "cd src/ui && REACT_APP_IS_DEVELOPMENT=1 npm start",
     "prepare": "cd src/ui && npm install --legacy-peer-deps",
     "build": "cd src/ui && npm run build",
     "start": "concurrently \"npm run dev:server\" \"npm run dev:ui\"",
-    "test": "nyc --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
+    "test": "cross-env TS_NODE_PROJECT='test/tsconfig.json' nyc --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
     "posttest": "prettier . --check"
   },
   "dependencies": {
-    "@stepzen/fetch": "0.44.0",
+    "@stepzen/fetch": "0.45.0-beta.1",
     "chalk": "^4.1.2",
-    "cross-spawn": "^7.0.3",
+    "cross-spawn": "^7.0.6",
     "debug": "^4.3.4",
     "express": "^4.21.1",
     "express-promise-router": "^4.1.1",
+    "helmet": "^8.0.0",
     "open": "^8.4.0",
     "prettier": "^2.8.3"
   },
@@ -39,21 +40,26 @@
     "@types/express": "^4.17.9",
     "@types/glob": "^7.2.0",
     "@types/license-checker": "^25.0.1",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^14.18.36",
+    "@types/mocha": "^10.0.9",
     "@types/sinon-chai": "3.2.8",
     "chai": "^4.3.10",
     "concurrently": "^6.0.2",
+    "cross-env": "^7.0.3",
     "dotenv": "^16.0.3",
     "fancy-test": "^1.4.10",
     "license-checker": "^25.0.1",
-    "mocha": "^10.2.0",
+    "mocha": "^10.8.2",
     "nock": "^13.0.4",
     "nodemon": "^2.0.22",
     "nyc": "^15.1.0",
     "sinon": "13.0.1",
     "sinon-chai": "3.7.0",
-    "ts-node": "^10.8.2"
+    "ts-node": "^10.9.2",
+    "typescript": ">=5 <5.4"
   },
-  "gitHead": "9afcacbee765998d29795896f8969fd9e4e29926"
+  "overrides": {
+    "--comment--": "workaround for CVE-2024-21538",
+    "cross-spawn": "^7.0.6"
+  },
+  "gitHead": "bb5012d7d656fb6788e99694f8de7d753f2752e9"
 }

package/src/server/api/debugging.js

@@ -16,4 +16,4 @@ const debugging = async (req, res) => {
   res.json(debugging)
 }
 
-module.exports = debugging
+export default debugging

package/src/server/api/details.js

@@ -12,4 +12,4 @@ const details = async (req, res) => {
   })
 }
 
-module.exports = details
+export default details

package/src/server/api/ping.js

@@ -6,4 +6,4 @@ const ping = async (req, res) => {
   })
 }
 
-module.exports = ping
+export default ping

package/src/server/api/predicates.js

@@ -20,4 +20,4 @@ const predicates = async (req, res) => {
   })
 }
 
-module.exports = predicates
+export default predicates

package/src/server/api/proxy.js

@@ -1,9 +1,10 @@
 // Copyright IBM Corp. 2020, 2024
 
-const debug = require('debug')
-const fetch = require('@stepzen/fetch').default
+import debug from 'debug'
+import fetch from '@stepzen/fetch'
+import {createRequire} from 'node:module'
 
-const {version} = require('../../../package.json')
+const {version} = createRequire(import.meta.url)('../../../package.json')
 
 const proxy = async (req, res) => {
   const {adminkey, debugging, zenservUrl, predicates, workspace} = req.stepzen
@@ -43,4 +44,4 @@ const proxy = async (req, res) => {
   res.json(json)
 }
 
-module.exports = proxy
+export default proxy

package/src/server/api/samples.js

@@ -1,7 +1,7 @@
 // Copyright IBM Corp. 2020, 2024
 
-const fs = require('fs')
-const prettier = require('prettier')
+import fs from 'node:fs'
+import prettier from 'prettier'
 
 const samples = async (req, res) => {
   const {workspace} = req.stepzen
@@ -23,4 +23,4 @@ const samples = async (req, res) => {
   })
 }
 
-module.exports = samples
+export default samples

package/src/server/index.js

@@ -1,20 +1,25 @@
 // Copyright IBM Corp. 2020, 2024
 
-const debug = require('debug')
-const express = require('express')
-const fs = require('fs')
-const router = require('express-promise-router')()
-
-const openBrowser = require('./utils/open-browser')
-
-const _debugging = require('./api/debugging')
-const details = require('./api/details')
-const ping = require('./api/ping')
-const _predicates = require('./api/predicates')
-const proxy = require('./api/proxy')
-const samples = require('./api/samples')
-
-module.exports = async options => {
+import debug from 'debug'
+import express from 'express'
+import fs from 'node:fs'
+import PromiseRouter from 'express-promise-router'
+import path from 'node:path'
+import {fileURLToPath} from 'node:url'
+
+import openBrowser from './utils/open-browser.js'
+
+import _debugging from './api/debugging.js'
+import details from './api/details.js'
+import ping from './api/ping.js'
+import _predicates from './api/predicates.js'
+import proxy from './api/proxy.js'
+import samples from './api/samples.js'
+import helmet from 'helmet'
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
+
+export default async function (options) {
   const {
     /** @deprecated use zenservUrl */
     account,
@@ -52,6 +57,8 @@ module.exports = async options => {
 
   app.use(express.json())
 
+  app.use(helmet.frameguard())
+
   app.use(express.static(`${__dirname}/../ui/build`))
   app.use((req, res, next) => {
     req.stepzen = {
@@ -67,6 +74,8 @@ module.exports = async options => {
     next()
   })
 
+  const router = PromiseRouter()
+
   router.all('/api/predicates', _predicates)
   router.all('/api/debugging', _debugging)
   router.get('/api/details', details)

package/src/server/utils/open-browser.js

@@ -1,10 +1,10 @@
 // Copyright IBM Corp. 2020, 2024
 // Original code from https://github.com/facebook/create-react-app/blob/0f6fc2bc71d78f0dcae67f3f08ce98a42fc0a57c/packages/react-dev-utils/openChrome.applescript
 
-const chalk = require('chalk')
-const {execSync} = require('child_process')
-const open = require('open')
-const spawn = require('cross-spawn')
+import chalk from 'chalk'
+import {execSync} from 'node:child_process'
+import open from 'open'
+import spawn from 'cross-spawn'
 
 // https://github.com/sindresorhus/open#app
 const OSX_CHROME = 'google chrome'
@@ -141,4 +141,4 @@ function openBrowser(url) {
   }
 }
 
-module.exports = openBrowser
+export default openBrowser