Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ javascript_client/subscriptions
javascript_client/sync
javascript_client/cli*
javascript_client/index*
javascript_client/esm/**/*.d.ts
javascript_client/esm/**/*.js
!javascript_client/esm/package.json
# Don't commit compiled extension files:
*.bundle
*.so
Expand Down
3 changes: 3 additions & 0 deletions javascript_client/esm/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"type": "module"
}
68 changes: 67 additions & 1 deletion javascript_client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,71 @@
"version": "1.14.9",
"description": "JavaScript client for graphql-ruby",
"main": "index.js",
"module": "esm/index.js",
"types": "index.d.ts",
"exports": {
".": {
"types": "./index.d.ts",
"import": "./esm/index.js",
"require": "./index.js",
"default": "./index.js"
},
"./index.js": {
"types": "./index.d.ts",
"import": "./esm/index.js",
"require": "./index.js",
"default": "./index.js"
},
"./cli.js": "./cli.js",
"./CHANGELOG.md": "./CHANGELOG.md",
"./DumpPayloadExample.json": "./DumpPayloadExample.json",
"./LICENSE.md": "./LICENSE.md",
"./readme.md": "./readme.md",
Comment on lines +22 to +25
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why should these be included in the exports?

"./sync": {
"types": "./sync/index.d.ts",
"import": "./esm/sync/index.js",
"require": "./sync/index.js",
"default": "./sync/index.js"
},
"./sync/*": {
"types": "./sync/*",
"import": "./esm/sync/*.js",
"require": "./sync/*.js",
"default": "./sync/*.js"
},
"./sync/*.js": {
"types": "./sync/*.d.ts",
"import": "./esm/sync/*.js",
"require": "./sync/*.js",
"default": "./sync/*.js"
},
"./subscriptions/*": {
"types": "./subscriptions/*",
"import": "./esm/subscriptions/*.js",
"require": "./subscriptions/*.js",
"default": "./subscriptions/*.js"
},
"./subscriptions/*.js": {
"types": "./subscriptions/*.d.ts",
"import": "./esm/subscriptions/*.js",
"require": "./subscriptions/*.js",
"default": "./subscriptions/*.js"
},
"./package.json": "./package.json"
},
"typesVersions": {
"*": {
"sync": [
"sync/index.d.ts"
],
"sync/*": [
"sync/*"
],
"subscriptions/*": [
"subscriptions/*"
]
}
},
"repository": "https://github.com/rmosolgo/graphql-ruby",
"author": "Robert Mosolgo",
"license": "LGPL-3.0",
Expand Down Expand Up @@ -34,8 +98,10 @@
"urql": "^2.2.2"
},
"scripts": {
"build": "tsc && node scripts/clean-esm.js && tsc -p tsconfig.esm.json && node scripts/prepare-esm.js",
"prepack": "npm run build",
"test": "tsc && jest",
"prepublishOnly": "tsc"
"prepublishOnly": "npm test"
},
"dependencies": {
"glob": "^13.0.6",
Expand Down
7 changes: 7 additions & 0 deletions javascript_client/scripts/clean-esm.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
const fs = require("fs")
const path = require("path")

const esmRoot = path.join(__dirname, "..", "esm")

fs.rmSync(esmRoot, { recursive: true, force: true })
fs.mkdirSync(esmRoot, { recursive: true })
57 changes: 57 additions & 0 deletions javascript_client/scripts/prepare-esm.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
const fs = require("fs")
const path = require("path")

const esmRoot = path.join(__dirname, "..", "esm")

fs.writeFileSync(
path.join(esmRoot, "package.json"),
JSON.stringify({ type: "module" }, null, 2) + "\n"
)

for (const filePath of findJavaScriptFiles(esmRoot)) {
const source = fs.readFileSync(filePath, "utf8")
const nextSource = source
.replaceAll("@apollo/client/core\"", "@apollo/client/core/index.js\"")
.replaceAll("@apollo/client/core'", "@apollo/client/core/index.js'")
.replaceAll("graphql/language/printer\"", "graphql/language/printer.js\"")
.replaceAll("graphql/language/printer'", "graphql/language/printer.js'")
.replace(/(from\s+["'])(\.[^"']+)(["'])/g, function(match, prefix, specifier, suffix) {
return prefix + resolveRelativeSpecifier(filePath, specifier) + suffix
})

if (nextSource !== source) {
fs.writeFileSync(filePath, nextSource)
}
}

function findJavaScriptFiles(directory) {
return fs.readdirSync(directory, { withFileTypes: true }).flatMap(function(entry) {
const entryPath = path.join(directory, entry.name)

if (entry.isDirectory()) {
return findJavaScriptFiles(entryPath)
}

return entry.isFile() && entry.name.endsWith(".js") ? [entryPath] : []
})
}

function resolveRelativeSpecifier(fromPath, specifier) {
if (path.extname(specifier)) {
return specifier
}

const fromDirectory = path.dirname(fromPath)
const filePath = path.resolve(fromDirectory, specifier + ".js")
const indexPath = path.resolve(fromDirectory, specifier, "index.js")

if (fs.existsSync(filePath)) {
return specifier + ".js"
}

if (fs.existsSync(indexPath)) {
return specifier + "/index.js"
}

return specifier
}
9 changes: 9 additions & 0 deletions javascript_client/tsconfig.esm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"extends": "./tsconfig.json",
"exclude": ["**/*.js", "src/**/__tests__/**"],
"compilerOptions": {
"module": "ES2020",
"moduleResolution": "node",
"outDir": "./esm"
}
}