diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index 5475637d..2af2b05f 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -79,7 +79,7 @@ jobs: strategy: fail-fast: false matrix: - node-version: [16, 18, 20, 22] + node-version: [18, 20, 22, 23] # Not needed anymore/right now: # include: # - node-version: 14 diff --git a/.nvmrc b/.nvmrc index 85aee5a5..0828ab79 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v20 \ No newline at end of file +v18 \ No newline at end of file diff --git a/package.json b/package.json index 169c917e..5fae9e23 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "spectaql", - "version": "3.0.3", + "version": "4.0.0-beta.0", "description": "A powerful library for autogenerating static GraphQL API documentation", "author": "Anvil Foundry Inc. ", "homepage": "https://github.com/anvilco/spectaql", @@ -23,7 +23,7 @@ "generator" ], "engines": { - "node": ">=16", + "node": ">=18", "npm": ">=7" }, "main": "index.js", @@ -64,7 +64,7 @@ "test:watch": "nodemon -x 'npm test'", "test:debug": "npm test --node-option inspect=0.0.0.0:9223", "test:debug:watch": "nodemon -x 'npm run test:debug'", - "develop": "nodemon -x 'npm run clean-build && node bin/spectaql' -- -D", + "develop": "nodemon -x 'npm run clean-build && node --no-experimental-require-module bin/spectaql' -- -D", "develop:deep-nesting": "npm run develop --theme-dir ./examples/themes/deep-nesting-data --config ./examples/config.yml", "develop:echo-directive-sdl": "node dev/echoDirectiveSdl.mjs", "test-e2e:build": "npm run clean-build && rimraf test/e2e/spectaql.tgz && node dev/build-e2e.mjs", diff --git a/src/spectaql/index.js b/src/spectaql/index.js index f517ac4e..4edd0915 100644 --- a/src/spectaql/index.js +++ b/src/spectaql/index.js @@ -102,6 +102,11 @@ async function run(opts) { const arrangeData = takeDefaultExport(arrangeDataModule) + console.log({ + arrangeDataModule, + arrangeData, + }) + const items = arrangeData({ introspectionResponse, graphQLSchema, diff --git a/src/spectaql/utils.js b/src/spectaql/utils.js index 8c9052c0..3814e5d8 100644 --- a/src/spectaql/utils.js +++ b/src/spectaql/utils.js @@ -26,6 +26,7 @@ export function tmpFolder(options = {}) { } export function takeDefaultExport(mojule) { + mojule = mojule?.default ? mojule.default : mojule return mojule?.default ? mojule.default : mojule }