@sanity/pkg-utils 7.2.7 → 7.2.8-canary.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/_chunks-cjs/build.cjs +2 -2
- package/dist/_chunks-cjs/build.cjs.map +1 -1
- package/dist/_chunks-cjs/check.cjs.map +1 -1
- package/dist/_chunks-cjs/consoleSpy.cjs +73 -9
- package/dist/_chunks-cjs/consoleSpy.cjs.map +1 -1
- package/dist/_chunks-cjs/handleError.cjs.map +1 -1
- package/dist/_chunks-cjs/index.cjs +36 -21
- package/dist/_chunks-cjs/index.cjs.map +1 -1
- package/dist/_chunks-cjs/init.cjs +12 -12
- package/dist/_chunks-cjs/init.cjs.map +1 -1
- package/dist/_chunks-cjs/logger.cjs +1 -71
- package/dist/_chunks-cjs/logger.cjs.map +1 -1
- package/dist/_chunks-cjs/watch.cjs +17 -2
- package/dist/_chunks-cjs/watch.cjs.map +1 -1
- package/dist/cli.cjs +2 -6
- package/dist/cli.cjs.map +1 -1
- package/dist/index.d.cts +5 -8
- package/dist/index.d.ts +5 -8
- package/dist/index.js +39 -40
- package/dist/index.js.map +1 -1
- package/package.json +11 -14
- package/src/cli/handleError.ts +0 -2
- package/src/cli/index.ts +1 -2
- package/src/global.ts +0 -1
- package/src/node/build.ts +3 -4
- package/src/node/check.ts +0 -3
- package/src/node/consoleSpy.ts +0 -2
- package/src/node/core/config/findConfigFile.ts +0 -2
- package/src/node/core/config/index.ts +3 -3
- package/src/node/core/config/loadConfig.ts +0 -3
- package/src/node/core/config/types.ts +0 -4
- package/src/node/core/contexts/buildContext.ts +2 -3
- package/src/node/core/pkg/loadPkg.ts +0 -2
- package/src/node/core/pkg/loadPkgWithReporting.ts +0 -1
- package/src/node/core/pkg/parseExports.ts +1 -2
- package/src/node/core/pkg/validateExports.ts +1 -1
- package/src/node/core/pkg/validatePkg.ts +0 -1
- package/src/node/core/template/createFromTemplate.ts +0 -2
- package/src/node/core/template/types.ts +0 -3
- package/src/node/getFilesize.ts +0 -1
- package/src/node/globFiles.ts +0 -1
- package/src/node/index.ts +64 -8
- package/src/node/init.ts +1 -3
- package/src/node/logger.ts +1 -2
- package/src/node/printExtractMessages.ts +1 -3
- package/src/node/printPackageTree.ts +2 -5
- package/src/node/resolveBuildContext.ts +12 -23
- package/src/node/resolveBuildTasks.ts +4 -3
- package/src/node/resolveWatchTasks.ts +4 -3
- package/src/node/spinner.ts +1 -2
- package/src/node/strict.test-d.ts +0 -1
- package/src/node/tasks/dts/buildTypes.ts +0 -1
- package/src/node/tasks/dts/createApiExtractorConfig.ts +0 -1
- package/src/node/tasks/dts/createTSDocConfig.ts +0 -1
- package/src/node/tasks/dts/doExtract.ts +2 -4
- package/src/node/tasks/dts/dtsTask.ts +0 -1
- package/src/node/tasks/dts/dtsWatchTask.ts +1 -3
- package/src/node/tasks/dts/extractTypes.ts +3 -4
- package/src/node/tasks/dts/getExtractMessagesConfig.ts +1 -2
- package/src/node/tasks/dts/getTargetPaths.ts +2 -2
- package/src/node/tasks/dts/printDiagnostic.ts +0 -2
- package/src/node/tasks/index.ts +4 -2
- package/src/node/tasks/rollup/resolveRollupConfig.ts +10 -11
- package/src/node/tasks/rollup/rollupTask.ts +1 -4
- package/src/node/tasks/rollup/rollupWatchTask.ts +1 -3
- package/src/node/tasks/types.ts +3 -3
- package/src/node/templates/default/template.ts +20 -23
- package/src/node/watch.ts +2 -3
- package/src/node/watchConfigFiles.ts +0 -2
- package/src/node/watchFiles.ts +1 -1
package/dist/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import path, { resolve, relative, dirname } from "node:path";
|
|
2
|
-
import rimraf from "rimraf";
|
|
2
|
+
import * as rimraf from "rimraf";
|
|
3
|
+
import { rimraf as rimraf$1 } from "rimraf";
|
|
3
4
|
import { register } from "esbuild-register/dist/node";
|
|
4
5
|
import pkgUp from "pkg-up";
|
|
5
6
|
import findConfig from "find-config";
|
|
@@ -14,7 +15,8 @@ import { errorMap } from "zod-validation-error";
|
|
|
14
15
|
import { Observable, switchMap } from "rxjs";
|
|
15
16
|
import { ExtractorConfig, Extractor } from "@microsoft/api-extractor";
|
|
16
17
|
import { mkdirp } from "mkdirp";
|
|
17
|
-
import prettier from "prettier";
|
|
18
|
+
import * as prettier from "prettier";
|
|
19
|
+
import { format } from "prettier";
|
|
18
20
|
import { TSDocConfigFile } from "@microsoft/tsdoc-config";
|
|
19
21
|
import { parse } from "jsonc-parser";
|
|
20
22
|
import { parse as parse$1, print } from "recast";
|
|
@@ -39,7 +41,7 @@ import gitUrlParse from "git-url-parse";
|
|
|
39
41
|
import { outdent } from "outdent";
|
|
40
42
|
import { scan, startWith, distinctUntilChanged } from "rxjs/operators";
|
|
41
43
|
import globby from "globby";
|
|
42
|
-
import chokidar from "chokidar";
|
|
44
|
+
import * as chokidar from "chokidar";
|
|
43
45
|
function defineConfig(configOptions) {
|
|
44
46
|
return configOptions;
|
|
45
47
|
}
|
|
@@ -422,7 +424,6 @@ async function loadTSConfig(options) {
|
|
|
422
424
|
}
|
|
423
425
|
function createLogger() {
|
|
424
426
|
return {
|
|
425
|
-
/* eslint-disable no-console */
|
|
426
427
|
log: (...args) => {
|
|
427
428
|
console.log(...args);
|
|
428
429
|
},
|
|
@@ -438,7 +439,6 @@ function createLogger() {
|
|
|
438
439
|
success: (...args) => {
|
|
439
440
|
console.log(chalk.green("[success]"), ...args);
|
|
440
441
|
}
|
|
441
|
-
/* eslint-enable no-console */
|
|
442
442
|
};
|
|
443
443
|
}
|
|
444
444
|
function browserslistToEsbuild(browserslistConfig, options = {}) {
|
|
@@ -556,15 +556,13 @@ async function resolveBuildContext(options) {
|
|
|
556
556
|
strict,
|
|
557
557
|
strictOptions: strictOptions2,
|
|
558
558
|
logger
|
|
559
|
-
}).reduce(
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
559
|
+
}).reduce(
|
|
560
|
+
(acc, { _path: exportPath, ...exportEntry }) => Object.assign(acc, { [exportPath]: exportEntry }),
|
|
561
|
+
{}
|
|
562
|
+
), exports = resolveConfigProperty(config2?.exports, parsedExports), parsedExternal = [
|
|
563
563
|
...pkg.dependencies ? Object.keys(pkg.dependencies) : [],
|
|
564
564
|
...pkg.peerDependencies ? Object.keys(pkg.peerDependencies) : []
|
|
565
|
-
], external = config2 && Array.isArray(config2.external) ? [...parsedExternal, ...config2.external] : resolveConfigProperty(config2?.external, parsedExternal), externalWithTypes = /* @__PURE__ */ new Set([pkg.name, ...external, ...external.map(transformPackageName)]), bundledDependencies = [
|
|
566
|
-
...pkg.devDependencies ? Object.keys(pkg.devDependencies) : []
|
|
567
|
-
].filter(
|
|
565
|
+
], external = config2 && Array.isArray(config2.external) ? [...parsedExternal, ...config2.external] : resolveConfigProperty(config2?.external, parsedExternal), externalWithTypes = /* @__PURE__ */ new Set([pkg.name, ...external, ...external.map(transformPackageName)]), bundledDependencies = (pkg.devDependencies ? Object.keys(pkg.devDependencies) : []).filter(
|
|
568
566
|
// Do not bundle anything that is marked as external
|
|
569
567
|
(_) => !externalWithTypes.has(_)
|
|
570
568
|
), bundledPackages = config2 && Array.isArray(config2.extract?.bundledPackages) ? [...bundledDependencies, ...config2.extract.bundledPackages] : resolveConfigProperty(config2?.extract?.bundledPackages, bundledDependencies), outputPaths = Object.values(exports).flatMap((exportEntry) => [
|
|
@@ -1033,10 +1031,10 @@ async function doExtract(ctx, task) {
|
|
|
1033
1031
|
messages.push(...result.messages);
|
|
1034
1032
|
const errors = result.messages.filter((msg) => msg.logLevel === "error");
|
|
1035
1033
|
if (errors.length > 0)
|
|
1036
|
-
throw await rimraf(tmpPath), new DtsError(`encountered ${errors.length} errors when extracting types`, errors);
|
|
1034
|
+
throw await rimraf$1(tmpPath), new DtsError(`encountered ${errors.length} errors when extracting types`, errors);
|
|
1037
1035
|
results.push({ sourcePath: path.resolve(cwd, entry.sourcePath), filePaths: targetPaths });
|
|
1038
1036
|
}
|
|
1039
|
-
return await rimraf(tmpPath), { type: "dts", messages, results };
|
|
1037
|
+
return await rimraf$1(tmpPath), { type: "dts", messages, results };
|
|
1040
1038
|
}
|
|
1041
1039
|
const dtsTask = {
|
|
1042
1040
|
name: (_ctx, task) => [
|
|
@@ -1197,19 +1195,17 @@ function resolveRollupConfig(ctx, buildTask) {
|
|
|
1197
1195
|
), { optimizeLodash: enableOptimizeLodash = hasDependency(pkg, "lodash") } = config2?.rollup || {}, defaultPlugins = [
|
|
1198
1196
|
replace({
|
|
1199
1197
|
preventAssignment: !0,
|
|
1200
|
-
values: {
|
|
1201
|
-
|
|
1202
|
-
|
|
1203
|
-
|
|
1204
|
-
|
|
1205
|
-
|
|
1206
|
-
|
|
1207
|
-
|
|
1208
|
-
|
|
1209
|
-
|
|
1210
|
-
|
|
1211
|
-
...replacements
|
|
1212
|
-
}
|
|
1198
|
+
values: pkg.name === "@sanity/pkg-utils" ? { ...replacements } : {
|
|
1199
|
+
"process.env.PKG_FILE_PATH": (arg) => {
|
|
1200
|
+
const sourcePath = `./${path.relative(cwd, arg)}`, entry = entries.find((e) => e.source === sourcePath);
|
|
1201
|
+
return entry ? JSON.stringify(
|
|
1202
|
+
path.relative(cwd, path.resolve(outDir, entry.name + outputExt))
|
|
1203
|
+
) : (console.error(`could not find source entry: ${sourcePath}`), "null");
|
|
1204
|
+
},
|
|
1205
|
+
"process.env.PKG_FORMAT": JSON.stringify(format2),
|
|
1206
|
+
"process.env.PKG_RUNTIME": JSON.stringify(runtime),
|
|
1207
|
+
"process.env.PKG_VERSION": JSON.stringify(process.env.PKG_VERSION || pkg.version),
|
|
1208
|
+
...replacements
|
|
1213
1209
|
}
|
|
1214
1210
|
}),
|
|
1215
1211
|
alias({
|
|
@@ -1301,7 +1297,10 @@ function resolveRollupConfig(ctx, buildTask) {
|
|
|
1301
1297
|
const idParts = id.split("/"), name = idParts[0].startsWith("@") ? `${idParts[0]}/${idParts[1]}` : idParts[0];
|
|
1302
1298
|
return !!(name && external.includes(name));
|
|
1303
1299
|
},
|
|
1304
|
-
input: entries.reduce(
|
|
1300
|
+
input: entries.reduce(
|
|
1301
|
+
(acc, entry) => Object.assign(acc, { [entry.name]: entry.source }),
|
|
1302
|
+
{}
|
|
1303
|
+
),
|
|
1305
1304
|
watch: {
|
|
1306
1305
|
chokidar: {
|
|
1307
1306
|
usePolling: !0
|
|
@@ -1469,7 +1468,7 @@ async function build(options) {
|
|
|
1469
1468
|
});
|
|
1470
1469
|
clean && (logger.log(
|
|
1471
1470
|
`Deleting the \`dist\` folder: './${path.relative(cwd, ctx.distPath)}' before building...`
|
|
1472
|
-
), await rimraf(ctx.distPath));
|
|
1471
|
+
), await rimraf$1(ctx.distPath));
|
|
1473
1472
|
const buildTasks = resolveBuildTasks(ctx);
|
|
1474
1473
|
for (const task of buildTasks) {
|
|
1475
1474
|
const handler = buildTaskHandlers[task.type], taskName = handler.name(ctx, task), spinner = createSpinner(taskName);
|
|
@@ -1880,7 +1879,7 @@ const overridableDefaults = {
|
|
|
1880
1879
|
}
|
|
1881
1880
|
files.push({
|
|
1882
1881
|
name: ".eslintrc.cjs",
|
|
1883
|
-
contents: await
|
|
1882
|
+
contents: await prettierFormat(
|
|
1884
1883
|
resolve(packagePath, ".eslintrc.cjs"),
|
|
1885
1884
|
outdent`
|
|
1886
1885
|
'use strict'
|
|
@@ -1894,7 +1893,7 @@ const overridableDefaults = {
|
|
|
1894
1893
|
}
|
|
1895
1894
|
features.typescript && (files.push({
|
|
1896
1895
|
name: "tsconfig.settings.json",
|
|
1897
|
-
contents: await
|
|
1896
|
+
contents: await prettierFormat(
|
|
1898
1897
|
resolve(packagePath, "tsconfig.settings.json"),
|
|
1899
1898
|
outdent`
|
|
1900
1899
|
{
|
|
@@ -1909,7 +1908,7 @@ const overridableDefaults = {
|
|
|
1909
1908
|
)
|
|
1910
1909
|
}), files.push({
|
|
1911
1910
|
name: "tsconfig.dist.json",
|
|
1912
|
-
contents: await
|
|
1911
|
+
contents: await prettierFormat(
|
|
1913
1912
|
resolve(packagePath, "tsconfig.dist.json"),
|
|
1914
1913
|
outdent`
|
|
1915
1914
|
{
|
|
@@ -1922,7 +1921,7 @@ const overridableDefaults = {
|
|
|
1922
1921
|
)
|
|
1923
1922
|
}), files.push({
|
|
1924
1923
|
name: "tsconfig.json",
|
|
1925
|
-
contents: await
|
|
1924
|
+
contents: await prettierFormat(
|
|
1926
1925
|
resolve(packagePath, "tsconfig.json"),
|
|
1927
1926
|
outdent`
|
|
1928
1927
|
{
|
|
@@ -1935,7 +1934,7 @@ const overridableDefaults = {
|
|
|
1935
1934
|
)
|
|
1936
1935
|
})), features.typescript ? (files.push({
|
|
1937
1936
|
name: "package.config.ts",
|
|
1938
|
-
contents: await
|
|
1937
|
+
contents: await prettierFormat(
|
|
1939
1938
|
resolve(packagePath, "package.config.ts"),
|
|
1940
1939
|
outdent`
|
|
1941
1940
|
import {defineConfig} from '@sanity/pkg-utils'
|
|
@@ -1950,7 +1949,7 @@ const overridableDefaults = {
|
|
|
1950
1949
|
)
|
|
1951
1950
|
}), files.push({
|
|
1952
1951
|
name: "src/index.ts",
|
|
1953
|
-
contents: await
|
|
1952
|
+
contents: await prettierFormat(
|
|
1954
1953
|
resolve(packagePath, "src/index.ts"),
|
|
1955
1954
|
outdent`
|
|
1956
1955
|
/** @public */
|
|
@@ -1962,7 +1961,7 @@ const overridableDefaults = {
|
|
|
1962
1961
|
)
|
|
1963
1962
|
})) : (files.push({
|
|
1964
1963
|
name: "package.config.js",
|
|
1965
|
-
contents: await
|
|
1964
|
+
contents: await prettierFormat(
|
|
1966
1965
|
resolve(packagePath, "package.config.js"),
|
|
1967
1966
|
outdent`
|
|
1968
1967
|
import {defineConfig} from '@sanity/pkg-utils'
|
|
@@ -1980,7 +1979,7 @@ const overridableDefaults = {
|
|
|
1980
1979
|
)
|
|
1981
1980
|
}), files.push({
|
|
1982
1981
|
name: "src/index.js",
|
|
1983
|
-
contents: await
|
|
1982
|
+
contents: await prettierFormat(
|
|
1984
1983
|
resolve(packagePath, "src/index.js"),
|
|
1985
1984
|
outdent`
|
|
1986
1985
|
/** @public */
|
|
@@ -2003,7 +2002,7 @@ const overridableDefaults = {
|
|
|
2003
2002
|
}
|
|
2004
2003
|
return files.push({
|
|
2005
2004
|
name: "package.json",
|
|
2006
|
-
contents: await
|
|
2005
|
+
contents: await prettierFormat(
|
|
2007
2006
|
resolve(packagePath, "package.json"),
|
|
2008
2007
|
JSON.stringify(pkgJson, null, 2),
|
|
2009
2008
|
config
|
|
@@ -2012,8 +2011,8 @@ const overridableDefaults = {
|
|
|
2012
2011
|
}
|
|
2013
2012
|
};
|
|
2014
2013
|
};
|
|
2015
|
-
function
|
|
2016
|
-
return
|
|
2014
|
+
function prettierFormat(filepath, input, prettierOptions) {
|
|
2015
|
+
return format(input, { ...prettierOptions, plugins: [], filepath });
|
|
2017
2016
|
}
|
|
2018
2017
|
async function resolveLatestDeps(deps) {
|
|
2019
2018
|
const depsEntries = Object.entries(deps), latestDeps = {};
|