From f7cdd326f8c1a3535e8c60eec07a80e4f96e7467 Mon Sep 17 00:00:00 2001 From: fisker Cheung Date: Fri, 5 Aug 2022 19:48:42 +0800 Subject: [PATCH] Minor refactor (#13221) --- scripts/build/bundler.mjs | 7 ------- src/index.js | 5 +---- src/main/support.js | 6 +----- src/main/version.evaluate.js | 6 ++++++ src/standalone.js | 5 +---- 5 files changed, 9 insertions(+), 20 deletions(-) create mode 100644 src/main/version.evaluate.js diff --git a/scripts/build/bundler.mjs b/scripts/build/bundler.mjs index de8682f91..02a700ca6 100644 --- a/scripts/build/bundler.mjs +++ b/scripts/build/bundler.mjs @@ -127,13 +127,6 @@ function* getEsbuildOptions(bundle, buildOptions) { } } else { replaceModule.push( - // Universal bundle only use version info from package.json - // Replace package.json with `{version: "{VERSION}"}` - { - module: path.join(PROJECT_ROOT, "package.json"), - text: JSON.stringify({ version: packageJson.version }), - loader: "json", - }, // When running build script with `--no-minify`, `esbuildPluginNodeModulePolyfills` shim `module` module incorrectly { module: "*", diff --git a/src/index.js b/src/index.js index f988557ac..3499e29ee 100644 --- a/src/index.js +++ b/src/index.js @@ -1,4 +1,3 @@ -import { createRequire } from "node:module"; import core from "./main/core.js"; import { getSupportInfo as getSupportInfoWithoutPlugins } from "./main/support.js"; import getFileInfoWithoutPlugins from "./common/get-file-info.js"; @@ -25,8 +24,6 @@ import getLast from "./utils/get-last.js"; import partition from "./utils/partition.js"; import { isNonEmptyArray } from "./common/util.js"; -const require = createRequire(import.meta.url); -const { version } = require("../package.json"); const builtinPlugins = Object.values(languages); /** @@ -103,7 +100,6 @@ const debugApis = { }; export { - version, formatWithCursor, format, check, @@ -117,3 +113,4 @@ export { }; export * as util from "./common/util-shared.js"; export * as doc from "./document/index.js"; +export { default as version } from "./main/version.evaluate.js"; diff --git a/src/main/support.js b/src/main/support.js index bb19498cd..9b8002471 100644 --- a/src/main/support.js +++ b/src/main/support.js @@ -1,13 +1,9 @@ -import { createRequire } from "node:module"; import semverCompare from "semver/functions/compare.js"; import semverGte from "semver/functions/gte.js"; import semverLt from "semver/functions/lt.js"; import arrayify from "../utils/arrayify.js"; import { options as coreOptions } from "./core-options.js"; - -const require = createRequire(import.meta.url); - -const currentVersion = require("../../package.json").version; +import currentVersion from "./version.evaluate.js"; /** * @typedef {import("./core-options").OptionInfo} OptionInfo diff --git a/src/main/version.evaluate.js b/src/main/version.evaluate.js new file mode 100644 index 000000000..e529cf9a2 --- /dev/null +++ b/src/main/version.evaluate.js @@ -0,0 +1,6 @@ +import { createRequire } from "node:module"; + +const require = createRequire(import.meta.url); +const { version } = require("../../package.json"); + +export default version; diff --git a/src/standalone.js b/src/standalone.js index ac69c3bf8..f391a1241 100644 --- a/src/standalone.js +++ b/src/standalone.js @@ -1,10 +1,7 @@ -import { createRequire } from "node:module"; import core from "./main/core.js"; import { getSupportInfo as getSupportInfoWithoutPlugins } from "./main/support.js"; import * as languages from "./languages.js"; -const require = createRequire(import.meta.url); -const { version } = require("../package.json"); const builtinPlugins = Object.values(languages); function withPlugins( @@ -54,7 +51,6 @@ const debugApis = { }; export { - version, formatWithCursor, format, check, @@ -63,3 +59,4 @@ export { }; export * as util from "./common/util-shared.js"; export * as doc from "./document/index.js"; +export { default as version } from "./main/version.evaluate.js";