From 6ea0e715303bf909b3f15883443a50ddacbfd60b Mon Sep 17 00:00:00 2001 From: Ankur Jain Date: Fri, 21 Jun 2024 09:32:00 -0700 Subject: [PATCH] Remove experimental json module. (#283) This was conflicting with node 22. --- packages/cli/bin/dapp-store.js | 2 +- packages/cli/src/CliUtils.ts | 3 ++- packages/cli/src/commands/scaffolding/ScaffoldInit.ts | 4 ++-- packages/cli/src/config/PublishDetails.ts | 3 ++- packages/core/src/validate/CoreValidation.ts | 10 ++++------ 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/cli/bin/dapp-store.js b/packages/cli/bin/dapp-store.js index a7afa85..1b22172 100755 --- a/packages/cli/bin/dapp-store.js +++ b/packages/cli/bin/dapp-store.js @@ -1,3 +1,3 @@ -#!/usr/bin/env node --experimental-json-modules +#!/usr/bin/env node import "../lib/index.js"; \ No newline at end of file diff --git a/packages/cli/src/CliUtils.ts b/packages/cli/src/CliUtils.ts index 2cb827c..685c958 100644 --- a/packages/cli/src/CliUtils.ts +++ b/packages/cli/src/CliUtils.ts @@ -8,7 +8,8 @@ import { Metaplex, } from "@metaplex-foundation/js"; import updateNotifier from "update-notifier"; -import cliPackage from "./package.json" assert { type: "json" }; +import { readFile } from 'fs/promises'; +const cliPackage = JSON.parse((await readFile(new URL("./package.json", import.meta.url))).toString()); import boxen from "boxen"; import ver from "semver"; import { CachedStorageDriver } from "./upload/CachedStorageDriver.js"; diff --git a/packages/cli/src/commands/scaffolding/ScaffoldInit.ts b/packages/cli/src/commands/scaffolding/ScaffoldInit.ts index 208cb04..00eef00 100644 --- a/packages/cli/src/commands/scaffolding/ScaffoldInit.ts +++ b/packages/cli/src/commands/scaffolding/ScaffoldInit.ts @@ -1,7 +1,7 @@ import yaml, { dump } from "js-yaml"; -// eslint-disable-next-line require-extensions/require-extensions -import releaseSchema from "../../generated/config_obj.json" assert { type: "json" }; +import { readFile } from 'fs/promises'; +const releaseSchema = JSON.parse((await readFile(new URL("../../generated/config_obj.json", import.meta.url))).toString()); import fs from "fs"; import { Constants } from "../../CliUtils.js"; diff --git a/packages/cli/src/config/PublishDetails.ts b/packages/cli/src/config/PublishDetails.ts index c300717..743f053 100644 --- a/packages/cli/src/config/PublishDetails.ts +++ b/packages/cli/src/config/PublishDetails.ts @@ -10,7 +10,8 @@ import type { import { dump, load } from "js-yaml"; import Ajv from "ajv"; // eslint-disable-next-line require-extensions/require-extensions -import schemaJson from "../generated/config_schema.json" assert { type: "json" }; +import { readFile } from 'fs/promises'; +const schemaJson = JSON.parse((await readFile(new URL("../generated/config_schema.json", import.meta.url))).toString()); import fs from "fs"; import path from "path"; import { toMetaplexFile } from "@metaplex-foundation/js"; diff --git a/packages/core/src/validate/CoreValidation.ts b/packages/core/src/validate/CoreValidation.ts index f592803..aefa348 100644 --- a/packages/core/src/validate/CoreValidation.ts +++ b/packages/core/src/validate/CoreValidation.ts @@ -6,12 +6,10 @@ import type { PublisherMetadata, } from "../types.js"; -// eslint-disable-next-line require-extensions/require-extensions -import publisherSchema from "../schemas/publisherJsonMetadata.json" assert { type: "json" }; -// eslint-disable-next-line require-extensions/require-extensions -import appSchema from "../schemas/appJsonMetadata.json" assert { type: "json" }; -// eslint-disable-next-line require-extensions/require-extensions -import releaseSchema from "../schemas/releaseJsonMetadata.json" assert { type: "json" }; +import { readFile } from 'fs/promises'; +const publisherSchema = JSON.parse((await readFile(new URL("../schemas/publisherJsonMetadata.json", import.meta.url))).toString()); +const appSchema = JSON.parse((await readFile(new URL("../schemas/appJsonMetadata.json", import.meta.url))).toString()); +const releaseSchema = JSON.parse((await readFile(new URL("../schemas/releaseJsonMetadata.json", import.meta.url))).toString()); import { isMetaplexFile } from "@metaplex-foundation/js"; export const metaplexFileReplacer = (k: any, v: any) => {