From b6dc8d8afe44156122faef665ef50876b61706d3 Mon Sep 17 00:00:00 2001 From: Timothy Lin Date: Sun, 4 Feb 2024 15:56:54 +0800 Subject: [PATCH 1/9] update package name --- .vscode/settings.json | 17 ++- examples/next-images/contentlayer.config.ts | 2 +- examples/next-images/next.config.js | 2 +- examples/next-images/package.json | 4 +- .../next-rsc-dynamic/contentlayer.config.ts | 4 +- examples/next-rsc-dynamic/next.config.js | 2 +- examples/next-rsc-dynamic/package.json | 4 +- .../node-script-mdx/contentlayer.config.ts | 2 +- examples/node-script-mdx/package.json | 6 +- .../contentlayer.config.ts | 4 +- .../node-script-remote-content/package.json | 6 +- examples/node-script/contentlayer.config.ts | 2 +- examples/node-script/package.json | 6 +- package.json | 14 +- packages/@contentlayer/cli/package.json | 8 +- .../cli/src/commands/BuildCommand.ts | 6 +- .../cli/src/commands/DefaultCommand.ts | 4 +- .../cli/src/commands/DevCommand.ts | 10 +- .../cli/src/commands/PostInstallCommand.ts | 10 +- .../cli/src/commands/_BaseCommand.ts | 10 +- packages/@contentlayer/cli/src/index.ts | 8 +- packages/@contentlayer/cli/src/lib/utils.ts | 2 +- packages/@contentlayer/client/package.json | 6 +- packages/@contentlayer/client/src/guards.ts | 2 +- packages/@contentlayer/core/package.json | 6 +- packages/@contentlayer/core/src/DataCache.ts | 12 +- .../@contentlayer/core/src/_ArtifactsDir.ts | 14 +- packages/@contentlayer/core/src/cwd.ts | 8 +- .../@contentlayer/core/src/dynamic-build.ts | 12 +- packages/@contentlayer/core/src/errors.ts | 4 +- .../core/src/generation/common.ts | 2 +- .../core/src/generation/generate-dotpkg.ts | 28 ++-- .../core/src/generation/generate-types.ts | 10 +- .../core/src/getConfig/esbuild.ts | 4 +- .../@contentlayer/core/src/getConfig/index.ts | 14 +- .../core/src/markdown/markdown.ts | 8 +- .../@contentlayer/core/src/markdown/mdx.ts | 6 +- packages/@contentlayer/core/src/plugin.ts | 4 +- packages/@contentlayer/core/src/runMain.ts | 16 +-- .../core/src/validate-tsconfig.ts | 6 +- .../package.json | 10 +- .../src/__test__/stackbit.spec.ts | 8 +- .../src/index.ts | 14 +- .../src/mapping.ts | 6 +- .../source-contentful/package.json | 8 +- .../source-contentful/src/contentful.ts | 10 +- .../source-contentful/src/errors.ts | 4 +- .../source-contentful/src/fetchData/index.ts | 16 +-- .../src/fetchData/mapping.ts | 10 +- .../source-contentful/src/index.ts | 6 +- .../source-contentful/src/provideSchema.ts | 12 +- .../source-contentful/src/schemaOverrides.ts | 2 +- .../@contentlayer/source-files/package.json | 6 +- .../src/__test__/errors/aggregate.spec.ts | 4 +- .../source-files/src/__test__/errors/utils.ts | 6 +- .../makeCacheItemFromFilePath.spec.ts | 2 +- .../src/__test__/fetchData/utils.ts | 16 +-- .../mapping/getDataForFieldDef.spec.ts | 16 +-- .../__snapshots__/basic.spec.ts.snap | 18 +-- .../__test__/type-generation/basic.spec.ts | 6 +- .../source-files/src/errors/aggregate.ts | 10 +- .../source-files/src/errors/index.ts | 8 +- .../src/fetchData/DocumentContext.ts | 12 +- .../src/fetchData/DocumentTypeMap.ts | 6 +- .../src/fetchData/fetchAllDocuments.ts | 14 +- .../source-files/src/fetchData/index.ts | 16 +-- .../fetchData/makeCacheItemFromFilePath.ts | 16 ++- .../src/fetchData/mapping/field-date.ts | 6 +- .../src/fetchData/mapping/field-image.ts | 8 +- .../src/fetchData/mapping/field-markdown.ts | 8 +- .../src/fetchData/mapping/field-mdx.ts | 10 +- .../src/fetchData/mapping/index.ts | 10 +- .../src/fetchData/mapping/parseFieldData.ts | 4 +- .../src/fetchData/validateDocumentData.ts | 8 +- .../@contentlayer/source-files/src/index.ts | 8 +- .../src/schema/defs/computed-field.ts | 2 +- .../source-files/src/schema/defs/index.ts | 4 +- .../source-files/src/schema/provideSchema.ts | 6 +- .../@contentlayer/source-files/src/types.ts | 2 +- .../source-remote-files/package.json | 8 +- .../source-remote-files/src/index.ts | 10 +- packages/@contentlayer/utils/package.json | 2 +- packages/contentful-generator/package.json | 2 +- .../package.json | 8 +- .../fixtures/azimuth-schema/documents/Blog.ts | 2 +- .../azimuth-schema/documents/Config.ts | 2 +- .../azimuth-schema/documents/Landing.ts | 2 +- .../fixtures/azimuth-schema/documents/Page.ts | 2 +- .../azimuth-schema/documents/Person.ts | 2 +- .../fixtures/azimuth-schema/documents/Post.ts | 2 +- .../fixtures/azimuth-schema/nested/Action.ts | 2 +- .../azimuth-schema/nested/FormField.ts | 2 +- .../fixtures/azimuth-schema/nested/SEO.ts | 2 +- .../__test__/fixtures/azimuth-schema/utils.ts | 2 +- .../__test__/fixtures/blog-schema/index.ts | 2 +- .../src/__test__/fixtures/index.ts | 8 +- .../src/cli/DefaultCommand.ts | 16 +-- .../src/cli/convert.ts | 4 +- packages/contentlayer/bin/cli.cjs | 2 +- packages/contentlayer/package.json | 14 +- packages/contentlayer/src/client/index.ts | 2 +- packages/contentlayer/src/core/index.ts | 2 +- .../contentlayer/src/source-files/index.ts | 2 +- .../src/source-files/schema/index.ts | 2 +- .../src/source-remote-files/index.ts | 2 +- packages/contentlayer/src/utils/index.ts | 2 +- packages/contentlayer/src/utils/node/index.ts | 2 +- packages/integration-tests/package.json | 2 +- .../src/empty-content-folder/index.test.ts | 6 +- .../src/image-field/index.test.ts | 6 +- .../src/markdown/index.test.ts | 6 +- .../src/mdx-remark-images/index.test.ts | 6 +- .../src/remark-gfm/index.test.ts | 6 +- packages/next-contentlayer/package.json | 8 +- packages/next-contentlayer/src/plugin.ts | 8 +- tsconfig.base.json | 10 +- yarn.lock | 126 +++++++++--------- 117 files changed, 465 insertions(+), 462 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index c426f1ea..5beabc33 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,22 +8,21 @@ "examples/gatsby-docs/gatsby": true }, "files.exclude": { + "**/.direnv": true, + "**/.DS_Store": true, "**/.git": true, - "**/.svn": true, "**/.hg": true, + "**/.svn": true, + "**/.yarn": true, "**/CVS": true, - "**/.DS_Store": true, "**/Thumbs.db": true, - "**/dist": true, - "**/vercel.json": true, - "**/.yarn": true, - "**/.direnv": true + "**/vercel.json": true }, "editor.formatOnSave": true, "editor.codeActionsOnSave": { - "source.organizeImports": false, - "source.fixAll": true, - "source.addMissingImports": true + "source.organizeImports": "never", + "source.fixAll": "explicit", + "source.addMissingImports": "explicit" }, "typescript.enablePromptUseWorkspaceTsdk": true, "prettier.singleQuote": true, diff --git a/examples/next-images/contentlayer.config.ts b/examples/next-images/contentlayer.config.ts index 7a90bc2e..25824e12 100644 --- a/examples/next-images/contentlayer.config.ts +++ b/examples/next-images/contentlayer.config.ts @@ -1,4 +1,4 @@ -import { defineDocumentType, makeSource } from 'contentlayer/source-files' +import { defineDocumentType, makeSource } from 'contentlayer-temp/source-files' const Post = defineDocumentType(() => ({ name: 'Post', diff --git a/examples/next-images/next.config.js b/examples/next-images/next.config.js index e37b55ed..0124c42f 100644 --- a/examples/next-images/next.config.js +++ b/examples/next-images/next.config.js @@ -1,4 +1,4 @@ -const { withContentlayer } = require("next-contentlayer"); +const { withContentlayer } = require("next-contentlayer-temp"); /** @type {import('next').NextConfig} */ const nextConfig = {} diff --git a/examples/next-images/package.json b/examples/next-images/package.json index c9b7ad29..82ac119e 100644 --- a/examples/next-images/package.json +++ b/examples/next-images/package.json @@ -8,10 +8,10 @@ "start": "next start" }, "dependencies": { - "contentlayer": "latest", + "contentlayer-temp": "latest", "date-fns": "2.30.0", "next": "14.1.0", - "next-contentlayer": "latest", + "next-contentlayer-temp": "latest", "react": "18.2.0", "react-dom": "18.2.0" }, diff --git a/examples/next-rsc-dynamic/contentlayer.config.ts b/examples/next-rsc-dynamic/contentlayer.config.ts index 84dcb5e4..e7c7bdaf 100644 --- a/examples/next-rsc-dynamic/contentlayer.config.ts +++ b/examples/next-rsc-dynamic/contentlayer.config.ts @@ -1,6 +1,6 @@ -import { defineDocumentType } from 'contentlayer/source-files' +import { defineDocumentType } from 'contentlayer-temp/source-files' import { spawn } from 'node:child_process' -import { makeSource } from 'contentlayer/source-remote-files' +import { makeSource } from 'contentlayer-temp/source-remote-files' const Post = defineDocumentType(() => ({ name: 'Post', diff --git a/examples/next-rsc-dynamic/next.config.js b/examples/next-rsc-dynamic/next.config.js index 358cd2d7..fb12cdca 100644 --- a/examples/next-rsc-dynamic/next.config.js +++ b/examples/next-rsc-dynamic/next.config.js @@ -1,3 +1,3 @@ -const { withContentlayer } = require('next-contentlayer') +const { withContentlayer } = require('next-contentlayer-temp') module.exports = withContentlayer({}) \ No newline at end of file diff --git a/examples/next-rsc-dynamic/package.json b/examples/next-rsc-dynamic/package.json index 09a5596d..c6de191a 100644 --- a/examples/next-rsc-dynamic/package.json +++ b/examples/next-rsc-dynamic/package.json @@ -8,10 +8,10 @@ "start": "next start" }, "dependencies": { - "contentlayer": "latest", + "contentlayer-temp": "latest", "date-fns": "2.30.0", "next": "14.1.0", - "next-contentlayer": "latest", + "next-contentlayer-temp": "latest", "react": "18.2.0", "react-dom": "18.2.0" }, diff --git a/examples/node-script-mdx/contentlayer.config.ts b/examples/node-script-mdx/contentlayer.config.ts index 2a2db5b6..4e5d05ca 100644 --- a/examples/node-script-mdx/contentlayer.config.ts +++ b/examples/node-script-mdx/contentlayer.config.ts @@ -1,4 +1,4 @@ -import { defineDocumentType, makeSource } from 'contentlayer/source-files' +import { defineDocumentType, makeSource } from 'contentlayer-temp/source-files' import { bundleMDX } from 'mdx-bundler' import * as ReactDOMServer from 'react-dom/server' import { getMDXComponent } from 'mdx-bundler/client/index.js' diff --git a/examples/node-script-mdx/package.json b/examples/node-script-mdx/package.json index 50442bfc..4de338c6 100644 --- a/examples/node-script-mdx/package.json +++ b/examples/node-script-mdx/package.json @@ -2,9 +2,9 @@ "name": "node-script-mdx-example", "private": true, "scripts": { - "start": "contentlayer build && node --experimental-json-modules my-script.mjs" + "start": "contentlayer-temp build && node --experimental-json-modules my-script.mjs" }, "dependencies": { - "contentlayer": "latest" + "contentlayer-temp": "latest" } -} +} \ No newline at end of file diff --git a/examples/node-script-remote-content/contentlayer.config.ts b/examples/node-script-remote-content/contentlayer.config.ts index 1224b9ff..7c7ea40f 100644 --- a/examples/node-script-remote-content/contentlayer.config.ts +++ b/examples/node-script-remote-content/contentlayer.config.ts @@ -1,6 +1,6 @@ -import { defineDocumentType } from 'contentlayer/source-files' +import { defineDocumentType } from 'contentlayer-temp/source-files' import { spawn } from 'node:child_process' -import { makeSource } from 'contentlayer/source-remote-files' +import { makeSource } from 'contentlayer-temp/source-remote-files' const Post = defineDocumentType(() => ({ name: 'Post', diff --git a/examples/node-script-remote-content/package.json b/examples/node-script-remote-content/package.json index 4b2a45ee..fdc5c367 100644 --- a/examples/node-script-remote-content/package.json +++ b/examples/node-script-remote-content/package.json @@ -2,9 +2,9 @@ "name": "node-script-remote-content-example", "private": true, "scripts": { - "start": "contentlayer build && node --experimental-json-modules my-script.mjs" + "start": "contentlayer-temp build && node --experimental-json-modules my-script.mjs" }, "dependencies": { - "contentlayer": "latest" + "contentlayer-temp": "latest" } -} +} \ No newline at end of file diff --git a/examples/node-script/contentlayer.config.ts b/examples/node-script/contentlayer.config.ts index 992b253f..962238ea 100644 --- a/examples/node-script/contentlayer.config.ts +++ b/examples/node-script/contentlayer.config.ts @@ -1,4 +1,4 @@ -import { defineDocumentType, makeSource } from 'contentlayer/source-files' +import { defineDocumentType, makeSource } from 'contentlayer-temp/source-files' const Post = defineDocumentType(() => ({ name: 'Post', diff --git a/examples/node-script/package.json b/examples/node-script/package.json index cee72889..2606a7e1 100644 --- a/examples/node-script/package.json +++ b/examples/node-script/package.json @@ -2,9 +2,9 @@ "name": "node-script-example", "private": true, "scripts": { - "start": "contentlayer build && node --experimental-json-modules my-script.mjs" + "start": "contentlayer-temp build && node --experimental-json-modules my-script.mjs" }, "dependencies": { - "contentlayer": "latest" + "contentlayer-temp": "latest" } -} +} \ No newline at end of file diff --git a/package.json b/package.json index 822237e1..233cdaf0 100644 --- a/package.json +++ b/package.json @@ -10,11 +10,11 @@ "postinstall": "ts-patch install", "prepare": "ts-patch install -s", "test": "CI=true VITEST_SEGFAULT_RETRY=3 yarn workspaces foreach --parallel run test", - "build": "run build:clean && run build:ts && yarn workspace next-contentlayer run prepack", + "build": "run build:clean && run build:ts && yarn workspace next-contentlayer-temp run prepack", "build:ts": "tsc --build tsconfig.all.json", "dev:ts": "run build:ts --watch", - "build:clean": "bash -c 'rm -rf packages/*/dist packages/@contentlayer/*/dist'", - "examples:postinstall": "yarn workspaces foreach --verbose --include \"examples-*\" exec yarn contentlayer postinstall", + "build:clean": "bash -c 'rm -rf packages/*/dist packages/@contentlayer-temp/*/dist'", + "examples:postinstall": "yarn workspaces foreach --verbose --include \"examples-*\" exec yarn contentlayer-temp postinstall", "release:prerelease": "yarn build && yarn workspaces foreach --verbose --topological-dev --parallel --no-private npm publish --tolerate-republish --tag=dev", "release:patch": "yarn build && yarn workspaces foreach --verbose --topological-dev --parallel --no-private npm publish --tolerate-republish", "release:minor": "yarn build && yarn workspaces foreach --verbose --topological-dev --parallel --no-private npm publish --tolerate-republish", @@ -42,10 +42,10 @@ }, "resolutions": { "esbuild": "0.18.0", - "contentlayer": "workspace:*", - "@contentlayer/*": "workspace:*", - "contentlayer-stackbit-yaml-generator": "workspace:*", - "next-contentlayer": "workspace:*", + "contentlayer-temp": "workspace:*", + "@contentlayer-temp/*": "workspace:*", + "contentlayer-stackbit-yaml-generator-temp": "workspace:*", + "next-contentlayer-temp": "workspace:*", "rxjs": "^7.1.0" }, "packageManager": "yarn@3.2.3" diff --git a/packages/@contentlayer/cli/package.json b/packages/@contentlayer/cli/package.json index 275b3583..ec94323e 100644 --- a/packages/@contentlayer/cli/package.json +++ b/packages/@contentlayer/cli/package.json @@ -1,6 +1,6 @@ { - "name": "@contentlayer/cli", - "version": "0.3.4", + "name": "@contentlayer-temp/cli", + "version": "0.4.0", "type": "module", "exports": "./dist/index.js", "types": "./dist/index.d.ts", @@ -13,8 +13,8 @@ "test": "echo No tests yet" }, "dependencies": { - "@contentlayer/core": "workspace:*", - "@contentlayer/utils": "workspace:*", + "@contentlayer-temp/core": "workspace:*", + "@contentlayer-temp/utils": "workspace:*", "clipanion": "^3.2.1", "typanion": "^3.12.1" }, diff --git a/packages/@contentlayer/cli/src/commands/BuildCommand.ts b/packages/@contentlayer/cli/src/commands/BuildCommand.ts index 4d96bc33..1d356c66 100644 --- a/packages/@contentlayer/cli/src/commands/BuildCommand.ts +++ b/packages/@contentlayer/cli/src/commands/BuildCommand.ts @@ -1,5 +1,5 @@ -import * as core from '@contentlayer/core' -import { OT, pipe, T } from '@contentlayer/utils/effect' +import * as core from '@contentlayer-temp/core' +import { OT, pipe, T } from '@contentlayer-temp/utils/effect' import type { Usage } from 'clipanion' import { BaseCommand } from './_BaseCommand.js' @@ -25,6 +25,6 @@ export class BuildCommand extends BaseCommand { T.tap((config) => (config.source.options.disableImportAliasWarning ? T.unit : T.fork(core.validateTsconfig))), T.chain((config) => core.generateDotpkg({ config, verbose: this.verbose })), T.tap(core.logGenerateInfo), - OT.withSpan('@contentlayer/cli/commands/BuildCommand:executeSafe'), + OT.withSpan('@contentlayer-temp/cli/commands/BuildCommand:executeSafe'), ) } diff --git a/packages/@contentlayer/cli/src/commands/DefaultCommand.ts b/packages/@contentlayer/cli/src/commands/DefaultCommand.ts index e9aa0139..30240249 100644 --- a/packages/@contentlayer/cli/src/commands/DefaultCommand.ts +++ b/packages/@contentlayer/cli/src/commands/DefaultCommand.ts @@ -1,4 +1,4 @@ -import { OT, pipe, T } from '@contentlayer/utils/effect' +import { OT, pipe, T } from '@contentlayer-temp/utils/effect' import { Command } from 'clipanion' import { BaseCommand } from './_BaseCommand.js' @@ -9,6 +9,6 @@ export class DefaultCommand extends BaseCommand { executeSafe = () => pipe( T.succeedWith(() => console.log(this.cli.usage())), - OT.withSpan('@contentlayer/cli/commands/DefaultCommand:executeSafe', { attributes: { cwd: process.cwd() } }), + OT.withSpan('@contentlayer-temp/cli/commands/DefaultCommand:executeSafe', { attributes: { cwd: process.cwd() } }), ) } diff --git a/packages/@contentlayer/cli/src/commands/DevCommand.ts b/packages/@contentlayer/cli/src/commands/DevCommand.ts index 63db97ec..80bab58f 100644 --- a/packages/@contentlayer/cli/src/commands/DevCommand.ts +++ b/packages/@contentlayer/cli/src/commands/DevCommand.ts @@ -1,6 +1,6 @@ -import * as core from '@contentlayer/core' -import { errorToString } from '@contentlayer/utils' -import { E, OT, pipe, S, T } from '@contentlayer/utils/effect' +import * as core from '@contentlayer-temp/core' +import { errorToString } from '@contentlayer-temp/utils' +import { E, OT, pipe, S, T } from '@contentlayer-temp/utils/effect' import type { Usage } from 'clipanion' import { BaseCommand } from './_BaseCommand.js' @@ -31,8 +31,8 @@ export class DevCommand extends BaseCommand { core.generateDotpkgStream({ config, verbose: this.verbose, isDev: true }), ), S.tap(E.fold((error) => T.log(errorToString(error)), core.logGenerateInfo)), - OT.withStreamSpan('@contentlayer/cli/commands/DevCommand:stream'), + OT.withStreamSpan('@contentlayer-temp/cli/commands/DevCommand:stream'), S.runDrain, - OT.withSpan('@contentlayer/cli/commands/DevCommand:executeSafe'), + OT.withSpan('@contentlayer-temp/cli/commands/DevCommand:executeSafe'), ) } diff --git a/packages/@contentlayer/cli/src/commands/PostInstallCommand.ts b/packages/@contentlayer/cli/src/commands/PostInstallCommand.ts index 97becadd..6b04e6e6 100644 --- a/packages/@contentlayer/cli/src/commands/PostInstallCommand.ts +++ b/packages/@contentlayer/cli/src/commands/PostInstallCommand.ts @@ -1,8 +1,8 @@ import * as path from 'node:path' -import * as core from '@contentlayer/core' -import { fs } from '@contentlayer/utils' -import { OT, pipe, T } from '@contentlayer/utils/effect' +import * as core from '@contentlayer-temp/core' +import { fs } from '@contentlayer-temp/utils' +import { OT, pipe, T } from '@contentlayer-temp/utils/effect' import { BaseCommand } from './_BaseCommand.js' @@ -19,7 +19,9 @@ export class PostInstallCommand extends BaseCommand { yield* $(addToplevelDotpkgToGitignore()) }), - OT.withSpan('@contentlayer/cli/commands/PostInstallCommand:executeSafe', { attributes: { cwd: process.cwd() } }), + OT.withSpan('@contentlayer-temp/cli/commands/PostInstallCommand:executeSafe', { + attributes: { cwd: process.cwd() }, + }), ) } } diff --git a/packages/@contentlayer/cli/src/commands/_BaseCommand.ts b/packages/@contentlayer/cli/src/commands/_BaseCommand.ts index 1e8f998f..19715306 100644 --- a/packages/@contentlayer/cli/src/commands/_BaseCommand.ts +++ b/packages/@contentlayer/cli/src/commands/_BaseCommand.ts @@ -1,8 +1,8 @@ -import type { HasCwd } from '@contentlayer/core' -import * as core from '@contentlayer/core' -import { fs } from '@contentlayer/utils' -import type { HasClock, HasConsole, OT } from '@contentlayer/utils/effect' -import { pipe, T } from '@contentlayer/utils/effect' +import type { HasCwd } from '@contentlayer-temp/core' +import * as core from '@contentlayer-temp/core' +import { fs } from '@contentlayer-temp/utils' +import type { HasClock, HasConsole, OT } from '@contentlayer-temp/utils/effect' +import { pipe, T } from '@contentlayer-temp/utils/effect' import { Command, Option } from 'clipanion' import * as t from 'typanion' diff --git a/packages/@contentlayer/cli/src/index.ts b/packages/@contentlayer/cli/src/index.ts index 6254a91d..b76a8a2a 100644 --- a/packages/@contentlayer/cli/src/index.ts +++ b/packages/@contentlayer/cli/src/index.ts @@ -1,10 +1,10 @@ -import '@contentlayer/utils/effect/Tracing/Enable' +import '@contentlayer-temp/utils/effect/Tracing/Enable' import process from 'node:process' -import { provideDummyTracing } from '@contentlayer/utils' -import { pipe, T } from '@contentlayer/utils/effect' -import { getContentlayerVersion, NodeFsLive } from '@contentlayer/utils/node' +import { provideDummyTracing } from '@contentlayer-temp/utils' +import { pipe, T } from '@contentlayer-temp/utils/effect' +import { getContentlayerVersion, NodeFsLive } from '@contentlayer-temp/utils/node' import { Builtins, Cli } from 'clipanion' import { BuildCommand } from './commands/BuildCommand.js' diff --git a/packages/@contentlayer/cli/src/lib/utils.ts b/packages/@contentlayer/cli/src/lib/utils.ts index 8a46ddc8..489d1cfd 100644 --- a/packages/@contentlayer/cli/src/lib/utils.ts +++ b/packages/@contentlayer/cli/src/lib/utils.ts @@ -1,5 +1,5 @@ // TODO Note this seems to be unused and should be deleted soon -import type { DocumentTypeDef, DocumentTypeDefMap, NestedTypeDef, NestedTypeDefMap } from '@contentlayer/core' +import type { DocumentTypeDef, DocumentTypeDefMap, NestedTypeDef, NestedTypeDefMap } from '@contentlayer-temp/core' export const derefDocumentOrThrow = (documentDefMap: DocumentTypeDefMap, documentDefName: string): DocumentTypeDef => { if (!(documentDefName in documentDefMap)) { diff --git a/packages/@contentlayer/client/package.json b/packages/@contentlayer/client/package.json index c9c67402..beb6176f 100644 --- a/packages/@contentlayer/client/package.json +++ b/packages/@contentlayer/client/package.json @@ -1,6 +1,6 @@ { - "name": "@contentlayer/client", - "version": "0.3.4", + "name": "@contentlayer-temp/client", + "version": "0.4.0", "type": "module", "exports": "./dist/index.js", "types": "./dist/index.d.ts", @@ -13,7 +13,7 @@ "test": "echo No tests yet" }, "dependencies": { - "@contentlayer/core": "workspace:*" + "@contentlayer-temp/core": "workspace:*" }, "license": "MIT" } diff --git a/packages/@contentlayer/client/src/guards.ts b/packages/@contentlayer/client/src/guards.ts index 4faece42..0c2c9d5a 100644 --- a/packages/@contentlayer/client/src/guards.ts +++ b/packages/@contentlayer/client/src/guards.ts @@ -1,4 +1,4 @@ -import type { Document, GetDocumentTypeMapGen, GetDocumentTypeNamesGen } from '@contentlayer/core' +import type { Document, GetDocumentTypeMapGen, GetDocumentTypeNamesGen } from '@contentlayer-temp/core' // type Guards = { // isType: TypeGuards diff --git a/packages/@contentlayer/core/package.json b/packages/@contentlayer/core/package.json index 9375d0ca..6ba49817 100644 --- a/packages/@contentlayer/core/package.json +++ b/packages/@contentlayer/core/package.json @@ -1,6 +1,6 @@ { - "name": "@contentlayer/core", - "version": "0.3.4", + "name": "@contentlayer-temp/core", + "version": "0.4.0", "type": "module", "exports": "./dist/index.js", "types": "./dist/index.d.ts", @@ -25,7 +25,7 @@ } }, "dependencies": { - "@contentlayer/utils": "workspace:*", + "@contentlayer-temp/utils": "workspace:*", "camel-case": "^4.1.2", "comment-json": "^4.2.3", "esbuild": "0.17.x || 0.18.x || 0.19.x || 0.20.x", diff --git a/packages/@contentlayer/core/src/DataCache.ts b/packages/@contentlayer/core/src/DataCache.ts index d653ad5c..d771d1ab 100644 --- a/packages/@contentlayer/core/src/DataCache.ts +++ b/packages/@contentlayer/core/src/DataCache.ts @@ -1,9 +1,9 @@ import * as path from 'node:path' -import { fs } from '@contentlayer/utils' -import type { E } from '@contentlayer/utils/effect' -import { OT, pipe, T } from '@contentlayer/utils/effect' -import type { GetContentlayerVersionError } from '@contentlayer/utils/node' +import { fs } from '@contentlayer-temp/utils' +import type { E } from '@contentlayer-temp/utils/effect' +import { OT, pipe, T } from '@contentlayer-temp/utils/effect' +import type { GetContentlayerVersionError } from '@contentlayer-temp/utils/node' import { ArtifactsDir } from './ArtifactsDir.js' import type { HasCwd } from './cwd.js' @@ -52,7 +52,7 @@ export namespace DataCache { return cache }), - OT.withSpan('@contentlayer/core/cache:loadPreviousCacheFromDisk', { attributes: { schemaHash } }), + OT.withSpan('@contentlayer-temp/core/cache:loadPreviousCacheFromDisk', { attributes: { schemaHash } }), ) export const writeCacheToDisk = ({ @@ -76,7 +76,7 @@ export namespace DataCache { yield* $(fs.writeFileJson({ filePath, content: cache })) }), T.either, - OT.withSpan('@contentlayer/core/cache:writeCacheToDisk', { attributes: { schemaHash } }), + OT.withSpan('@contentlayer-temp/core/cache:writeCacheToDisk', { attributes: { schemaHash } }), ) const dataCacheFileName = (schemaHash: string) => `data-${schemaHash}.json` diff --git a/packages/@contentlayer/core/src/_ArtifactsDir.ts b/packages/@contentlayer/core/src/_ArtifactsDir.ts index edee64c0..bf56a7fa 100644 --- a/packages/@contentlayer/core/src/_ArtifactsDir.ts +++ b/packages/@contentlayer/core/src/_ArtifactsDir.ts @@ -1,13 +1,13 @@ -import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer/utils' -import { filePathJoin, fs } from '@contentlayer/utils' -import type { OT } from '@contentlayer/utils/effect' -import { pipe, T } from '@contentlayer/utils/effect' -import type { GetContentlayerVersionError } from '@contentlayer/utils/node' -import { getContentlayerVersion } from '@contentlayer/utils/node' +import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer-temp/utils' +import { filePathJoin, fs } from '@contentlayer-temp/utils' +import type { OT } from '@contentlayer-temp/utils/effect' +import { pipe, T } from '@contentlayer-temp/utils/effect' +import type { GetContentlayerVersionError } from '@contentlayer-temp/utils/node' +import { getContentlayerVersion } from '@contentlayer-temp/utils/node' import type { HasCwd } from './cwd.js' import { getCwd } from './cwd.js' -// import utilsPkg from '@contentlayer/utils/package.json' +// import utilsPkg from '@contentlayer-temp/utils/package.json' export const getDirPath = ({ cwd }: { cwd: AbsolutePosixFilePath }): AbsolutePosixFilePath => filePathJoin(cwd, '.contentlayer' as AbsolutePosixFilePath) diff --git a/packages/@contentlayer/core/src/cwd.ts b/packages/@contentlayer/core/src/cwd.ts index b33bbd6a..29838c7b 100644 --- a/packages/@contentlayer/core/src/cwd.ts +++ b/packages/@contentlayer/core/src/cwd.ts @@ -1,7 +1,7 @@ -import type { AbsolutePosixFilePath } from '@contentlayer/utils' -import { unknownToAbsolutePosixFilePath } from '@contentlayer/utils' -import type { Has } from '@contentlayer/utils/effect' -import { T, tag } from '@contentlayer/utils/effect' +import type { AbsolutePosixFilePath } from '@contentlayer-temp/utils' +import { unknownToAbsolutePosixFilePath } from '@contentlayer-temp/utils' +import type { Has } from '@contentlayer-temp/utils/effect' +import { T, tag } from '@contentlayer-temp/utils/effect' export const makeCwd = T.gen(function* (_) { const cwd = yield* _( diff --git a/packages/@contentlayer/core/src/dynamic-build.ts b/packages/@contentlayer/core/src/dynamic-build.ts index 8675a719..22e8113e 100644 --- a/packages/@contentlayer/core/src/dynamic-build.ts +++ b/packages/@contentlayer/core/src/dynamic-build.ts @@ -1,7 +1,7 @@ -import type { AbsolutePosixFilePath } from '@contentlayer/utils' -import { provideTracing } from '@contentlayer/utils' -import { O, OT, pipe, provideConsole, S, T } from '@contentlayer/utils/effect' -import { NodeFsLive } from '@contentlayer/utils/node' +import type { AbsolutePosixFilePath } from '@contentlayer-temp/utils' +import { provideTracing } from '@contentlayer-temp/utils' +import { O, OT, pipe, provideConsole, S, T } from '@contentlayer-temp/utils/effect' +import { NodeFsLive } from '@contentlayer-temp/utils/node' import { provideCwdCustom } from './cwd.js' import type { DataCache } from './DataCache.js' @@ -56,7 +56,7 @@ export const dynamicBuildFromCompiledConfig = ({ }), ), T.chain((config) => dynamicBuild({ config, verbose })), - OT.withSpan('@contentlayer/core/dynamicBuildFromCompiledConfig', { attributes: { compiledConfigPath } }), + OT.withSpan('@contentlayer-temp/core/dynamicBuildFromCompiledConfig', { attributes: { compiledConfigPath } }), ) type RuntimeDeps = { @@ -112,7 +112,7 @@ export const dynamicBuild = ({ config, verbose }: { config: Config; verbose: boo return makeDataExportsFromCache({ cache, schemaDef, options: config.source.options }) }), - OT.withSpan('@contentlayer/core/dynamicBuild'), + OT.withSpan('@contentlayer-temp/core/dynamicBuild'), ) export type DataExports = { diff --git a/packages/@contentlayer/core/src/errors.ts b/packages/@contentlayer/core/src/errors.ts index 5c8920d2..ad8ef944 100644 --- a/packages/@contentlayer/core/src/errors.ts +++ b/packages/@contentlayer/core/src/errors.ts @@ -1,5 +1,5 @@ -import { errorToString } from '@contentlayer/utils' -import { Tagged } from '@contentlayer/utils/effect' +import { errorToString } from '@contentlayer-temp/utils' +import { Tagged } from '@contentlayer-temp/utils/effect' export class NoConfigFoundError extends Tagged('NoConfigFoundError')<{ readonly configPath?: string diff --git a/packages/@contentlayer/core/src/generation/common.ts b/packages/@contentlayer/core/src/generation/common.ts index 003e865b..b482b528 100644 --- a/packages/@contentlayer/core/src/generation/common.ts +++ b/packages/@contentlayer/core/src/generation/common.ts @@ -1,4 +1,4 @@ -import * as utils from '@contentlayer/utils' +import * as utils from '@contentlayer-temp/utils' import type { DocumentTypeDef } from '../schema/index.js' diff --git a/packages/@contentlayer/core/src/generation/generate-dotpkg.ts b/packages/@contentlayer/core/src/generation/generate-dotpkg.ts index 16c36f86..b146f42a 100644 --- a/packages/@contentlayer/core/src/generation/generate-dotpkg.ts +++ b/packages/@contentlayer/core/src/generation/generate-dotpkg.ts @@ -1,9 +1,9 @@ -import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer/utils' -import { filePathJoin, fs, relative } from '@contentlayer/utils' -import type { E, HasClock, HasConsole } from '@contentlayer/utils/effect' -import { Array, Chunk, Either, OT, pipe, S, T } from '@contentlayer/utils/effect' -import type { GetContentlayerVersionError } from '@contentlayer/utils/node' -import { getContentlayerVersion } from '@contentlayer/utils/node' +import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer-temp/utils' +import { filePathJoin, fs, relative } from '@contentlayer-temp/utils' +import type { E, HasClock, HasConsole } from '@contentlayer-temp/utils/effect' +import { Array, Chunk, Either, OT, pipe, S, T } from '@contentlayer-temp/utils/effect' +import type { GetContentlayerVersionError } from '@contentlayer-temp/utils/node' +import { getContentlayerVersion } from '@contentlayer-temp/utils/node' import { camelCase } from 'camel-case' import type { PackageJson } from 'type-fest' @@ -65,7 +65,7 @@ export const generateDotpkg = ({ S.runCollect, T.map(Chunk.unsafeHead), T.rightOrFail, - OT.withSpan('@contentlayer/core/generation:generateDotpkg', { attributes: { verbose } }), + OT.withSpan('@contentlayer-temp/core/generation:generateDotpkg', { attributes: { verbose } }), ) // TODO make sure unused old generated files are removed @@ -135,7 +135,7 @@ const successCallback = (onSuccess: SuccessCallback | undefined) => { (error) => new SuccessCallbackError({ error }), ), ), - OT.withSpan('@contentlayer/core/generation:successCallback'), + OT.withSpan('@contentlayer-temp/core/generation:successCallback'), ) } @@ -268,7 +268,7 @@ const writeFilesForCache = ({ ), ) }), - OT.withSpan('@contentlayer/core/generation/generate-dotpkg:writeFilesForCache', { + OT.withSpan('@contentlayer-temp/core/generation/generate-dotpkg:writeFilesForCache', { attributes: { targetPath, cacheKeys: Object.keys(cache.cacheItemsMap), @@ -451,7 +451,7 @@ export const fetchContent = async (sourceKey) => { return `\ // ${autogeneratedNote} -export { isType } from 'contentlayer/client' +export { isType } from 'contentlayer-temp/client' // NOTE During development Contentlayer imports from \`.mjs\` files to improve HMR speeds. // During (production) builds Contentlayer it imports from \`.json\` files to improve build performance. @@ -496,7 +496,7 @@ export declare const fetchContent: (sourceKey?: string) => Promise { @@ -608,7 +608,7 @@ const __dirname = '__SET_BY_ESBUILD__'; const deduplicateContentlayerImportsPlugin = (): esbuild.Plugin => ({ name: 'deduplicate-contentlayer-imports', setup: (build) => { - const filter = /\@contentlayer\/[a-z-]+/ + const filter = /\@contentlayer-temp\/[a-z-]+/ const namespace = 'deduplicate-contentlayer-imports-ns' build.onResolve({ filter: /.+/ }, async ({ path, ...args }) => { if (args.namespace === namespace) return @@ -616,7 +616,7 @@ const deduplicateContentlayerImportsPlugin = (): esbuild.Plugin => ({ if (path.match(filter)) { const result = await build.resolve(path, { ...args, namespace }) - if (result.path.match(/\@contentlayer\/[a-z-]+\/src\//)) { + if (result.path.match(/\@contentlayer-temp\/[a-z-]+\/src\//)) { result.path = result.path.replace('/src/', '/dist/') result.path = result.path.replace(/\.ts$/, '.js') } diff --git a/packages/@contentlayer/core/src/generation/generate-types.ts b/packages/@contentlayer/core/src/generation/generate-types.ts index 2b0e5da6..54e42e2b 100644 --- a/packages/@contentlayer/core/src/generation/generate-types.ts +++ b/packages/@contentlayer/core/src/generation/generate-types.ts @@ -1,4 +1,4 @@ -import { casesHandled, pattern } from '@contentlayer/utils' +import { casesHandled, pattern } from '@contentlayer-temp/utils' import type { SourcePluginType } from '../plugin.js' import type { DocumentTypeDef, FieldDef, ListFieldDefItem, NestedTypeDef, SchemaDef } from '../schema/index.js' @@ -40,8 +40,8 @@ export const renderTypes = ({ const importsForRawTypes = pattern .match(generationOptions.sourcePluginType) - .with('local', () => `import * as Local from 'contentlayer/source-files'`) - .with('contentful', () => `import * as Contentful from '@contentlayer/source-contentful'`) + .with('local', () => `import * as Local from 'contentlayer-temp/source-files'`) + .with('contentful', () => `import * as Contentful from '@contentlayer-temp/source-contentful'`) .otherwise(() => ``) const documentTypeNames = documentTypes.map(prop('typeName')) @@ -63,10 +63,10 @@ export const renderTypes = ({ return `\ // ${autogeneratedNote} -import type { Markdown, MDX, ImageFieldData, IsoDateTimeString } from 'contentlayer/core' +import type { Markdown, MDX, ImageFieldData, IsoDateTimeString } from 'contentlayer-temp/core' ${importsForRawTypes} -export { isType } from 'contentlayer/client' +export { isType } from 'contentlayer-temp/client' export type { Markdown, MDX, ImageFieldData, IsoDateTimeString } diff --git a/packages/@contentlayer/core/src/getConfig/esbuild.ts b/packages/@contentlayer/core/src/getConfig/esbuild.ts index 4e506775..beccb998 100644 --- a/packages/@contentlayer/core/src/getConfig/esbuild.ts +++ b/packages/@contentlayer/core/src/getConfig/esbuild.ts @@ -1,5 +1,5 @@ -import { errorToString } from '@contentlayer/utils' -import { E, Ex, H, M, O, OT, pipe, Q, Ref, S, T, Tagged } from '@contentlayer/utils/effect' +import { errorToString } from '@contentlayer-temp/utils' +import { E, Ex, H, M, O, OT, pipe, Q, Ref, S, T, Tagged } from '@contentlayer-temp/utils/effect' import * as esbuild from 'esbuild' export const EsbuildWatcherTypeId = Symbol() diff --git a/packages/@contentlayer/core/src/getConfig/index.ts b/packages/@contentlayer/core/src/getConfig/index.ts index 4ca7283a..f2a63914 100644 --- a/packages/@contentlayer/core/src/getConfig/index.ts +++ b/packages/@contentlayer/core/src/getConfig/index.ts @@ -1,10 +1,10 @@ import * as path from 'node:path' -import type { AbsolutePosixFilePath } from '@contentlayer/utils' -import { fs, unknownToAbsolutePosixFilePath } from '@contentlayer/utils' -import type { E } from '@contentlayer/utils/effect' -import { Array, Chunk, O, OT, pipe, S, T } from '@contentlayer/utils/effect' -import type { GetContentlayerVersionError } from '@contentlayer/utils/node' +import type { AbsolutePosixFilePath } from '@contentlayer-temp/utils' +import { fs, unknownToAbsolutePosixFilePath } from '@contentlayer-temp/utils' +import type { E } from '@contentlayer-temp/utils/effect' +import { Array, Chunk, O, OT, pipe, S, T } from '@contentlayer-temp/utils/effect' +import type { GetContentlayerVersionError } from '@contentlayer-temp/utils/node' import type { HasCwd } from '../cwd.js' import { getCwd } from '../cwd.js' @@ -44,7 +44,7 @@ export const getConfig = ({ S.runCollect, T.map(Chunk.unsafeHead), T.rightOrFail, - OT.withSpan('@contentlayer/core/getConfig:getConfig', { attributes: { configPath } }), + OT.withSpan('@contentlayer-temp/core/getConfig:getConfig', { attributes: { configPath } }), ) export const getConfigWatch = ({ @@ -202,7 +202,7 @@ const getConfigFromResult = ({ return { source, esbuildHash, filePath: outfilePath } }), - OT.withSpan('@contentlayer/core/getConfig:getConfigFromResult', { attributes: { configPath } }), + OT.withSpan('@contentlayer-temp/core/getConfig:getConfigFromResult', { attributes: { configPath } }), T.either, ) diff --git a/packages/@contentlayer/core/src/markdown/markdown.ts b/packages/@contentlayer/core/src/markdown/markdown.ts index 2a2e660b..06b4c157 100644 --- a/packages/@contentlayer/core/src/markdown/markdown.ts +++ b/packages/@contentlayer/core/src/markdown/markdown.ts @@ -1,6 +1,6 @@ -import { errorToString } from '@contentlayer/utils' -import type { HasConsole } from '@contentlayer/utils/effect' -import { OT, pipe, T, Tagged } from '@contentlayer/utils/effect' +import { errorToString } from '@contentlayer-temp/utils' +import type { HasConsole } from '@contentlayer-temp/utils/effect' +import { OT, pipe, T, Tagged } from '@contentlayer-temp/utils/effect' import rehypeStringify from 'rehype-stringify' import remarkFrontmatter from 'remark-frontmatter' import remarkParse from 'remark-parse' @@ -71,7 +71,7 @@ export const markdownToHtml = ({ }), T.catchAllDefect(T.fail), T.mapError((error) => new UnexpectedMarkdownError({ error })), - OT.withSpan('@contentlayer/core/markdown:markdownToHtml'), + OT.withSpan('@contentlayer-temp/core/markdown:markdownToHtml'), ) export class UnexpectedMarkdownError extends Tagged('UnexpectedMarkdownError')<{ readonly error: unknown }> { diff --git a/packages/@contentlayer/core/src/markdown/mdx.ts b/packages/@contentlayer/core/src/markdown/mdx.ts index 690c1ec5..9e5a7d3f 100644 --- a/packages/@contentlayer/core/src/markdown/mdx.ts +++ b/packages/@contentlayer/core/src/markdown/mdx.ts @@ -1,7 +1,7 @@ import * as path from 'node:path' -import { errorToString } from '@contentlayer/utils' -import { OT, pipe, T, Tagged } from '@contentlayer/utils/effect' +import { errorToString } from '@contentlayer-temp/utils' +import { OT, pipe, T, Tagged } from '@contentlayer-temp/utils/effect' import * as mdxBundler from 'mdx-bundler' import type { BundleMDXOptions } from 'mdx-bundler/dist/types' @@ -80,7 +80,7 @@ export const bundleMDX = ({ }), T.mapError((error) => new UnexpectedMDXError({ error })), T.tapError(() => OT.addAttribute('mdxString', mdxString)), - OT.withSpan('@contentlayer/core/markdown:bundleMDX'), + OT.withSpan('@contentlayer-temp/core/markdown:bundleMDX'), ) export class UnexpectedMDXError extends Tagged('UnexpectedMDXError')<{ readonly error: unknown }> { diff --git a/packages/@contentlayer/core/src/plugin.ts b/packages/@contentlayer/core/src/plugin.ts index df53dbb2..6cf81065 100644 --- a/packages/@contentlayer/core/src/plugin.ts +++ b/packages/@contentlayer/core/src/plugin.ts @@ -1,5 +1,5 @@ -import type { fs } from '@contentlayer/utils' -import type { E, HasClock, HasConsole, OT, S, T } from '@contentlayer/utils/effect' +import type { fs } from '@contentlayer-temp/utils' +import type { E, HasClock, HasConsole, OT, S, T } from '@contentlayer-temp/utils/effect' import type * as mdxEsbuild from '@mdx-js/esbuild/lib' import type * as mdxBundler from 'mdx-bundler/dist/types' import type { LiteralUnion } from 'type-fest' diff --git a/packages/@contentlayer/core/src/runMain.ts b/packages/@contentlayer/core/src/runMain.ts index 4a745aa4..91a67b60 100644 --- a/packages/@contentlayer/core/src/runMain.ts +++ b/packages/@contentlayer/core/src/runMain.ts @@ -1,13 +1,13 @@ import * as os from 'node:os' -import type { HasCwd } from '@contentlayer/core' -import { provideCwd, provideCwdCustom } from '@contentlayer/core' -import * as core from '@contentlayer/core' -import type { AbsolutePosixFilePath, fs } from '@contentlayer/utils' -import { DummyTracing, InMemoryFsLive, provideTracing } from '@contentlayer/utils' -import type { HasClock, HasConsole, OT } from '@contentlayer/utils/effect' -import { Cause, pipe, pretty, provideConsole, T } from '@contentlayer/utils/effect' -import { getContentlayerVersion, NodeFsLive } from '@contentlayer/utils/node' +import type { HasCwd } from '@contentlayer-temp/core' +import { provideCwd, provideCwdCustom } from '@contentlayer-temp/core' +import * as core from '@contentlayer-temp/core' +import type { AbsolutePosixFilePath, fs } from '@contentlayer-temp/utils' +import { DummyTracing, InMemoryFsLive, provideTracing } from '@contentlayer-temp/utils' +import type { HasClock, HasConsole, OT } from '@contentlayer-temp/utils/effect' +import { Cause, pipe, pretty, provideConsole, T } from '@contentlayer-temp/utils/effect' +import { getContentlayerVersion, NodeFsLive } from '@contentlayer-temp/utils/node' export const runMain = ({ diff --git a/packages/@contentlayer/core/src/validate-tsconfig.ts b/packages/@contentlayer/core/src/validate-tsconfig.ts index 65cb720e..9f07c3bb 100644 --- a/packages/@contentlayer/core/src/validate-tsconfig.ts +++ b/packages/@contentlayer/core/src/validate-tsconfig.ts @@ -1,8 +1,8 @@ import path from 'node:path' -import type { AbsolutePosixFilePath } from '@contentlayer/utils' -import { filePathJoin, fs } from '@contentlayer/utils' -import { Chunk, O, OT, pipe, T, Tagged } from '@contentlayer/utils/effect' +import type { AbsolutePosixFilePath } from '@contentlayer-temp/utils' +import { filePathJoin, fs } from '@contentlayer-temp/utils' +import { Chunk, O, OT, pipe, T, Tagged } from '@contentlayer-temp/utils/effect' import { parse as parseJsonc } from 'comment-json' import { getCwd } from './cwd.js' diff --git a/packages/@contentlayer/experimental-source-files-stackbit/package.json b/packages/@contentlayer/experimental-source-files-stackbit/package.json index 6b92824d..521f2afe 100644 --- a/packages/@contentlayer/experimental-source-files-stackbit/package.json +++ b/packages/@contentlayer/experimental-source-files-stackbit/package.json @@ -1,6 +1,6 @@ { - "name": "@contentlayer/experimental-source-files-stackbit", - "version": "0.3.4", + "name": "@contentlayer-temp/experimental-source-files-stackbit", + "version": "0.4.0", "type": "module", "exports": { ".": { @@ -26,9 +26,9 @@ } }, "dependencies": { - "@contentlayer/core": "workspace:*", - "@contentlayer/source-files": "workspace:*", - "@contentlayer/utils": "workspace:*", + "@contentlayer-temp/core": "workspace:*", + "@contentlayer-temp/source-files": "workspace:*", + "@contentlayer-temp/utils": "workspace:*", "@stackbit/sdk": "~0.3.25" }, "devDependencies": { diff --git a/packages/@contentlayer/experimental-source-files-stackbit/src/__test__/stackbit.spec.ts b/packages/@contentlayer/experimental-source-files-stackbit/src/__test__/stackbit.spec.ts index af0f59fa..f3f9e550 100644 --- a/packages/@contentlayer/experimental-source-files-stackbit/src/__test__/stackbit.spec.ts +++ b/packages/@contentlayer/experimental-source-files-stackbit/src/__test__/stackbit.spec.ts @@ -1,10 +1,10 @@ import path from 'node:path' import { fileURLToPath } from 'node:url' -import * as SourceFiles from '@contentlayer/source-files' -import { provideDummyTracing } from '@contentlayer/utils' -import type { HasClock, HasConsole, OT } from '@contentlayer/utils/effect' -import { pipe, provideTestConsole, T } from '@contentlayer/utils/effect' +import * as SourceFiles from '@contentlayer-temp/source-files' +import { provideDummyTracing } from '@contentlayer-temp/utils' +import type { HasClock, HasConsole, OT } from '@contentlayer-temp/utils/effect' +import { pipe, provideTestConsole, T } from '@contentlayer-temp/utils/effect' import * as Stackbit from '@stackbit/sdk' import { expect, test } from 'vitest' diff --git a/packages/@contentlayer/experimental-source-files-stackbit/src/index.ts b/packages/@contentlayer/experimental-source-files-stackbit/src/index.ts index 080c8448..5233f5a6 100644 --- a/packages/@contentlayer/experimental-source-files-stackbit/src/index.ts +++ b/packages/@contentlayer/experimental-source-files-stackbit/src/index.ts @@ -1,8 +1,8 @@ -import type * as core from '@contentlayer/core' -import type * as SourceFiles from '@contentlayer/source-files' -import { defineDocumentType, defineNestedType } from '@contentlayer/source-files' -import type { PartialDeep } from '@contentlayer/utils' -import { mergeDeep, not, partition, pick } from '@contentlayer/utils' +import type * as core from '@contentlayer-temp/core' +import type * as SourceFiles from '@contentlayer-temp/source-files' +import { defineDocumentType, defineNestedType } from '@contentlayer-temp/source-files' +import type { PartialDeep } from '@contentlayer-temp/utils' +import { mergeDeep, not, partition, pick } from '@contentlayer-temp/utils' import * as Stackbit from '@stackbit/sdk' import { validateAndNormalizeConfig } from '@stackbit/sdk/dist/config/config-loader.js' @@ -34,7 +34,7 @@ export type ContentlayerOverrideNestedType = { * ```ts * // contentlayer.config.ts * import { makeSource } from 'contentlayer/source-files' - * import { loadStackbitConfigAsDocumentTypes } from '@contentlayer/experimental-source-files-stackbit' + * import { loadStackbitConfigAsDocumentTypes } from '@contentlayer-temp/experimental-source-files-stackbit' * * // Looks for `stackbit.yaml` in the current directory * export default loadStackbitConfigAsDocumentTypes().then((documentTypes) => { @@ -60,7 +60,7 @@ export const loadStackbitConfigAsDocumentTypes = diff --git a/packages/@contentlayer/source-contentful/package.json b/packages/@contentlayer/source-contentful/package.json index 269ab97d..d97a9526 100644 --- a/packages/@contentlayer/source-contentful/package.json +++ b/packages/@contentlayer/source-contentful/package.json @@ -1,6 +1,6 @@ { - "name": "@contentlayer/source-contentful", - "version": "0.3.4", + "name": "@contentlayer-temp/source-contentful", + "version": "0.4.0", "type": "module", "exports": "./dist/index.js", "types": "./dist/index.d.ts", @@ -16,8 +16,8 @@ "@types/node": "^20.3.2" }, "dependencies": { - "@contentlayer/core": "workspace:*", - "@contentlayer/utils": "workspace:*", + "@contentlayer-temp/core": "workspace:*", + "@contentlayer-temp/utils": "workspace:*", "contentful-management": "7.22.4" }, "license": "MIT" diff --git a/packages/@contentlayer/source-contentful/src/contentful.ts b/packages/@contentlayer/source-contentful/src/contentful.ts index 727a1a1e..8c6418b8 100644 --- a/packages/@contentlayer/source-contentful/src/contentful.ts +++ b/packages/@contentlayer/source-contentful/src/contentful.ts @@ -1,4 +1,4 @@ -import { OT, pipe, T } from '@contentlayer/utils/effect' +import { OT, pipe, T } from '@contentlayer-temp/utils/effect' import { createClient } from 'contentful-management' import { UnknownContentfulError } from './errors.js' @@ -12,7 +12,7 @@ export const environmentGetContentTypes = ( () => environment.getContentTypes().then((_) => _.items), (error) => new UnknownContentfulError({ error }), ), - OT.withSpan('@contentlayer/source-contentlayer/contentful:environmentGetContentTypes'), + OT.withSpan('@contentlayer-temp/source-contentlayer/contentful:environmentGetContentTypes'), ) export const environmentGetEntries = ({ @@ -29,7 +29,7 @@ export const environmentGetEntries = ({ () => environment.getEntries({ limit, skip }), (error) => new UnknownContentfulError({ error }), ), - OT.withSpan('@contentlayer/source-contentlayer/contentful:environmentGetEntries'), + OT.withSpan('@contentlayer-temp/source-contentlayer/contentful:environmentGetEntries'), ) export const environmentGetAssets = ({ @@ -46,7 +46,7 @@ export const environmentGetAssets = ({ () => environment.getAssets({ limit, skip }), (error) => new UnknownContentfulError({ error }), ), - OT.withSpan('@contentlayer/source-contentlayer/contentful:environmentGetAssets'), + OT.withSpan('@contentlayer-temp/source-contentlayer/contentful:environmentGetAssets'), ) export const getEnvironment = ({ @@ -62,7 +62,7 @@ export const getEnvironment = ({ return pipe( T.tryPromise(() => client.getSpace(spaceId)), T.chain((space) => T.tryPromise(() => space.getEnvironment(environmentId))), - OT.withSpan('@contentlayer/source-contentlayer/contentful:getEnvironment'), + OT.withSpan('@contentlayer-temp/source-contentlayer/contentful:getEnvironment'), T.mapError((error) => new UnknownContentfulError({ error })), ) } diff --git a/packages/@contentlayer/source-contentful/src/errors.ts b/packages/@contentlayer/source-contentful/src/errors.ts index 0f2f4b75..8d7959e9 100644 --- a/packages/@contentlayer/source-contentful/src/errors.ts +++ b/packages/@contentlayer/source-contentful/src/errors.ts @@ -1,5 +1,5 @@ -import { errorToString } from '@contentlayer/utils' -import { Tagged } from '@contentlayer/utils/effect' +import { errorToString } from '@contentlayer-temp/utils' +import { Tagged } from '@contentlayer-temp/utils/effect' export class UnknownContentfulError extends Tagged('UnknownContentfulError')<{ readonly error: unknown }> { toString = () => `UnknownContentfulError: ${errorToString(this.error)}` diff --git a/packages/@contentlayer/source-contentful/src/fetchData/index.ts b/packages/@contentlayer/source-contentful/src/fetchData/index.ts index 0f3d17b8..0510ce2d 100644 --- a/packages/@contentlayer/source-contentful/src/fetchData/index.ts +++ b/packages/@contentlayer/source-contentful/src/fetchData/index.ts @@ -1,9 +1,9 @@ import * as os from 'node:os' -import * as core from '@contentlayer/core' -import { fs } from '@contentlayer/utils' -import type { HasConsole } from '@contentlayer/utils/effect' -import { Chunk, OT, pipe, T } from '@contentlayer/utils/effect' +import * as core from '@contentlayer-temp/core' +import { fs } from '@contentlayer-temp/utils' +import type { HasConsole } from '@contentlayer-temp/utils/effect' +import { Chunk, OT, pipe, T } from '@contentlayer-temp/utils/effect' import { environmentGetAssets, @@ -83,7 +83,7 @@ export const fetchAllDocuments = ({ options, }), ), - OT.withSpan('@contentlayer/source-contentlayer/fetchData:makeCacheItems', { + OT.withSpan('@contentlayer-temp/source-contentlayer/fetchData:makeCacheItems', { attributes: { count: documentEntriesWithDocumentTypeDef.length }, }), ), @@ -93,7 +93,7 @@ export const fetchAllDocuments = ({ return { cacheItemsMap } }), - OT.withSpan('@contentlayer/source-contentlayer/fetchData:fetchAllDocuments', { + OT.withSpan('@contentlayer-temp/source-contentlayer/fetchData:fetchAllDocuments', { attributes: { schemaDef: JSON.stringify(schemaDef), schemaOverrides_: JSON.stringify(schemaOverrides_) }, }), T.mapError((error) => new core.SourceFetchDataError({ error, alreadyHandled: false })), @@ -116,7 +116,7 @@ const getAllEntries = ( return entries }), - OT.withSpan('@contentlayer/source-contentlayer/fetchData:getAllEntries'), + OT.withSpan('@contentlayer-temp/source-contentlayer/fetchData:getAllEntries'), ) const getAllAssets = ( @@ -136,5 +136,5 @@ const getAllAssets = ( return entries }), - OT.withSpan('@contentlayer/source-contentlayer/fetchData:getAllAssets'), + OT.withSpan('@contentlayer-temp/source-contentlayer/fetchData:getAllAssets'), ) diff --git a/packages/@contentlayer/source-contentful/src/fetchData/mapping.ts b/packages/@contentlayer/source-contentful/src/fetchData/mapping.ts index eb8848ab..a0e41411 100644 --- a/packages/@contentlayer/source-contentful/src/fetchData/mapping.ts +++ b/packages/@contentlayer/source-contentful/src/fetchData/mapping.ts @@ -1,8 +1,8 @@ -import * as core from '@contentlayer/core' -import type { HashError } from '@contentlayer/utils' -import { casesHandled, hashObject } from '@contentlayer/utils' -import type { HasConsole, OT } from '@contentlayer/utils/effect' -import { T } from '@contentlayer/utils/effect' +import * as core from '@contentlayer-temp/core' +import type { HashError } from '@contentlayer-temp/utils' +import { casesHandled, hashObject } from '@contentlayer-temp/utils' +import type { HasConsole, OT } from '@contentlayer-temp/utils/effect' +import { T } from '@contentlayer-temp/utils/effect' import type * as SchemaOverrides from '../schemaOverrides.js' import type { Contentful } from '../types.js' diff --git a/packages/@contentlayer/source-contentful/src/index.ts b/packages/@contentlayer/source-contentful/src/index.ts index 6f78f82d..24a4be64 100644 --- a/packages/@contentlayer/source-contentful/src/index.ts +++ b/packages/@contentlayer/source-contentful/src/index.ts @@ -1,6 +1,6 @@ -import type * as core from '@contentlayer/core' -import { processArgs } from '@contentlayer/core' -import { pipe, S, SC, T } from '@contentlayer/utils/effect' +import type * as core from '@contentlayer-temp/core' +import { processArgs } from '@contentlayer-temp/core' +import { pipe, S, SC, T } from '@contentlayer-temp/utils/effect' import { fetchAllDocuments } from './fetchData/index.js' import { provideSchema } from './provideSchema.js' diff --git a/packages/@contentlayer/source-contentful/src/provideSchema.ts b/packages/@contentlayer/source-contentful/src/provideSchema.ts index 33484823..7a1fa9ec 100644 --- a/packages/@contentlayer/source-contentful/src/provideSchema.ts +++ b/packages/@contentlayer/source-contentful/src/provideSchema.ts @@ -1,8 +1,8 @@ -import * as core from '@contentlayer/core' -import { SourceProvideSchemaError } from '@contentlayer/core' -import * as utils from '@contentlayer/utils' -import { casesHandled, partition } from '@contentlayer/utils' -import { OT, pipe, T } from '@contentlayer/utils/effect' +import * as core from '@contentlayer-temp/core' +import { SourceProvideSchemaError } from '@contentlayer-temp/core' +import * as utils from '@contentlayer-temp/utils' +import { casesHandled, partition } from '@contentlayer-temp/utils' +import { OT, pipe, T } from '@contentlayer-temp/utils/effect' import { environmentGetContentTypes, getEnvironment } from './contentful.js' import type * as SchemaOverrides from './schemaOverrides.js' @@ -64,7 +64,7 @@ export const provideSchema = ({ return coreSchemaDef }), - OT.withSpan('@contentlayer/source-contentlayer/fetchData:provideSchema', { + OT.withSpan('@contentlayer-temp/source-contentlayer/fetchData:provideSchema', { attributes: { spaceId, environmentId }, }), T.mapError((error) => new SourceProvideSchemaError({ error })), diff --git a/packages/@contentlayer/source-contentful/src/schemaOverrides.ts b/packages/@contentlayer/source-contentful/src/schemaOverrides.ts index 937338dd..4ffd8e75 100644 --- a/packages/@contentlayer/source-contentful/src/schemaOverrides.ts +++ b/packages/@contentlayer/source-contentful/src/schemaOverrides.ts @@ -1,4 +1,4 @@ -import { mapObjectValues } from '@contentlayer/utils' +import { mapObjectValues } from '@contentlayer-temp/utils' import type { Contentful } from './types.js' diff --git a/packages/@contentlayer/source-files/package.json b/packages/@contentlayer/source-files/package.json index 342aa708..78ae9b1e 100644 --- a/packages/@contentlayer/source-files/package.json +++ b/packages/@contentlayer/source-files/package.json @@ -1,5 +1,5 @@ { - "name": "@contentlayer/source-files", + "name": "@contentlayer-temp/source-files", "version": "0.3.4", "type": "module", "exports": { @@ -28,8 +28,8 @@ "test": "TZ='GMT' FORCE_COLOR=1 vitest" }, "dependencies": { - "@contentlayer/core": "workspace:*", - "@contentlayer/utils": "workspace:*", + "@contentlayer-temp/core": "workspace:*", + "@contentlayer-temp/utils": "workspace:*", "chokidar": "^3.5.3", "fast-glob": "^3.2.12", "gray-matter": "^4.0.3", diff --git a/packages/@contentlayer/source-files/src/__test__/errors/aggregate.spec.ts b/packages/@contentlayer/source-files/src/__test__/errors/aggregate.spec.ts index e0d0d3b0..6bff9ca8 100644 --- a/packages/@contentlayer/source-files/src/__test__/errors/aggregate.spec.ts +++ b/packages/@contentlayer/source-files/src/__test__/errors/aggregate.spec.ts @@ -1,5 +1,5 @@ -import type * as core from '@contentlayer/core' -import { unknownToAbsolutePosixFilePath } from '@contentlayer/utils' +import type * as core from '@contentlayer-temp/core' +import { unknownToAbsolutePosixFilePath } from '@contentlayer-temp/utils' import { expect, test } from 'vitest' import { testOnly_aggregateFetchDataErrors as aggregateFetchDataErrors } from '../../errors/aggregate.js' diff --git a/packages/@contentlayer/source-files/src/__test__/errors/utils.ts b/packages/@contentlayer/source-files/src/__test__/errors/utils.ts index cc6e15cd..51aabdac 100644 --- a/packages/@contentlayer/source-files/src/__test__/errors/utils.ts +++ b/packages/@contentlayer/source-files/src/__test__/errors/utils.ts @@ -1,8 +1,8 @@ import * as path from 'node:path' -import type * as core from '@contentlayer/core' -import type { RelativePosixFilePath } from '@contentlayer/utils' -import { singleItem, unknownToRelativePosixFilePath } from '@contentlayer/utils' +import type * as core from '@contentlayer-temp/core' +import type { RelativePosixFilePath } from '@contentlayer-temp/utils' +import { singleItem, unknownToRelativePosixFilePath } from '@contentlayer-temp/utils' import { faker } from '@faker-js/faker' import { FetchDataError } from '../../errors/index.js' diff --git a/packages/@contentlayer/source-files/src/__test__/fetchData/makeCacheItemFromFilePath.spec.ts b/packages/@contentlayer/source-files/src/__test__/fetchData/makeCacheItemFromFilePath.spec.ts index fba8203d..a31a028c 100644 --- a/packages/@contentlayer/source-files/src/__test__/fetchData/makeCacheItemFromFilePath.spec.ts +++ b/packages/@contentlayer/source-files/src/__test__/fetchData/makeCacheItemFromFilePath.spec.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import { E } from '@contentlayer/utils/effect' +import { E } from '@contentlayer-temp/utils/effect' import { fileURLToPath } from 'url' import { describe, expect, test } from 'vitest' diff --git a/packages/@contentlayer/source-files/src/__test__/fetchData/utils.ts b/packages/@contentlayer/source-files/src/__test__/fetchData/utils.ts index 82c15311..c9edc8b4 100644 --- a/packages/@contentlayer/source-files/src/__test__/fetchData/utils.ts +++ b/packages/@contentlayer/source-files/src/__test__/fetchData/utils.ts @@ -1,15 +1,15 @@ -import type { HasCwd } from '@contentlayer/core' -import * as core from '@contentlayer/core' -import { provideCwd } from '@contentlayer/core' -import type { fs } from '@contentlayer/utils' +import type { HasCwd } from '@contentlayer-temp/core' +import * as core from '@contentlayer-temp/core' +import { provideCwd } from '@contentlayer-temp/core' +import type { fs } from '@contentlayer-temp/utils' import { provideDummyTracing, unknownToAbsolutePosixFilePath, unknownToRelativePosixFilePath, -} from '@contentlayer/utils' -import type { HasClock, HasConsole, OT } from '@contentlayer/utils/effect' -import { pipe, provideTestConsole, T, These } from '@contentlayer/utils/effect' -import { NodeFsLive } from '@contentlayer/utils/node' +} from '@contentlayer-temp/utils' +import type { HasClock, HasConsole, OT } from '@contentlayer-temp/utils/effect' +import { pipe, provideTestConsole, T, These } from '@contentlayer-temp/utils/effect' +import { NodeFsLive } from '@contentlayer-temp/utils/node' import type { HasDocumentTypeMapState } from '../../fetchData/DocumentTypeMap.js' import { provideDocumentTypeMapState } from '../../fetchData/DocumentTypeMap.js' diff --git a/packages/@contentlayer/source-files/src/__test__/mapping/getDataForFieldDef.spec.ts b/packages/@contentlayer/source-files/src/__test__/mapping/getDataForFieldDef.spec.ts index bc59868e..4d4fae69 100644 --- a/packages/@contentlayer/source-files/src/__test__/mapping/getDataForFieldDef.spec.ts +++ b/packages/@contentlayer/source-files/src/__test__/mapping/getDataForFieldDef.spec.ts @@ -1,11 +1,11 @@ -import type { HasCwd } from '@contentlayer/core' -import * as core from '@contentlayer/core' -import { provideCwd } from '@contentlayer/core' -import type { fs } from '@contentlayer/utils' -import { provideTracing, unknownToRelativePosixFilePath } from '@contentlayer/utils' -import type { HasClock, HasConsole } from '@contentlayer/utils/effect' -import { OT, pipe, provideConsole, T } from '@contentlayer/utils/effect' -import { NodeFsLive } from '@contentlayer/utils/node' +import type { HasCwd } from '@contentlayer-temp/core' +import * as core from '@contentlayer-temp/core' +import { provideCwd } from '@contentlayer-temp/core' +import type { fs } from '@contentlayer-temp/utils' +import { provideTracing, unknownToRelativePosixFilePath } from '@contentlayer-temp/utils' +import type { HasClock, HasConsole } from '@contentlayer-temp/utils/effect' +import { OT, pipe, provideConsole, T } from '@contentlayer-temp/utils/effect' +import { NodeFsLive } from '@contentlayer-temp/utils/node' import { describe, expect, test } from 'vitest' import { provideDocumentContext } from '../../fetchData/DocumentContext.js' diff --git a/packages/@contentlayer/source-files/src/__test__/type-generation/__snapshots__/basic.spec.ts.snap b/packages/@contentlayer/source-files/src/__test__/type-generation/__snapshots__/basic.spec.ts.snap index d50a5b18..8d9238ff 100644 --- a/packages/@contentlayer/source-files/src/__test__/type-generation/__snapshots__/basic.spec.ts.snap +++ b/packages/@contentlayer/source-files/src/__test__/type-generation/__snapshots__/basic.spec.ts.snap @@ -3,10 +3,10 @@ exports[`generate-types: references with embedded schema 1`] = ` "// NOTE This file is auto-generated by Contentlayer -import type { Markdown, MDX, ImageFieldData, IsoDateTimeString } from 'contentlayer/core' -import * as Local from 'contentlayer/source-files' +import type { Markdown, MDX, ImageFieldData, IsoDateTimeString } from 'contentlayer-temp/core' +import * as Local from 'contentlayer-temp/source-files' -export { isType } from 'contentlayer/client' +export { isType } from 'contentlayer-temp/client' export type { Markdown, MDX, ImageFieldData, IsoDateTimeString } @@ -85,10 +85,10 @@ export type NestedTypeMap = { exports[`generate-types: simple schema 1`] = ` "// NOTE This file is auto-generated by Contentlayer -import type { Markdown, MDX, ImageFieldData, IsoDateTimeString } from 'contentlayer/core' -import * as Local from 'contentlayer/source-files' +import type { Markdown, MDX, ImageFieldData, IsoDateTimeString } from 'contentlayer-temp/core' +import * as Local from 'contentlayer-temp/source-files' -export { isType } from 'contentlayer/client' +export { isType } from 'contentlayer-temp/client' export type { Markdown, MDX, ImageFieldData, IsoDateTimeString } @@ -156,10 +156,10 @@ export type NestedTypeMap = { exports[`generate-types: simple schema with optional fields 1`] = ` "// NOTE This file is auto-generated by Contentlayer -import type { Markdown, MDX, ImageFieldData, IsoDateTimeString } from 'contentlayer/core' -import * as Local from 'contentlayer/source-files' +import type { Markdown, MDX, ImageFieldData, IsoDateTimeString } from 'contentlayer-temp/core' +import * as Local from 'contentlayer-temp/source-files' -export { isType } from 'contentlayer/client' +export { isType } from 'contentlayer-temp/client' export type { Markdown, MDX, ImageFieldData, IsoDateTimeString } diff --git a/packages/@contentlayer/source-files/src/__test__/type-generation/basic.spec.ts b/packages/@contentlayer/source-files/src/__test__/type-generation/basic.spec.ts index bef0056f..0168a323 100644 --- a/packages/@contentlayer/source-files/src/__test__/type-generation/basic.spec.ts +++ b/packages/@contentlayer/source-files/src/__test__/type-generation/basic.spec.ts @@ -1,6 +1,6 @@ -import { renderTypes } from '@contentlayer/core' -import { provideJaegerTracing } from '@contentlayer/utils' -import { pipe, provideConsole, T } from '@contentlayer/utils/effect' +import { renderTypes } from '@contentlayer-temp/core' +import { provideJaegerTracing } from '@contentlayer-temp/utils' +import { pipe, provideConsole, T } from '@contentlayer-temp/utils/effect' import { expect, test } from 'vitest' import type { DocumentTypes } from '../../index.js' diff --git a/packages/@contentlayer/source-files/src/errors/aggregate.ts b/packages/@contentlayer/source-files/src/errors/aggregate.ts index d64d26cd..4b4bec4d 100644 --- a/packages/@contentlayer/source-files/src/errors/aggregate.ts +++ b/packages/@contentlayer/source-files/src/errors/aggregate.ts @@ -1,8 +1,8 @@ -import * as core from '@contentlayer/core' -import type { AbsolutePosixFilePath } from '@contentlayer/utils' -import { AsciiTree } from '@contentlayer/utils' -import type { HasConsole } from '@contentlayer/utils/effect' -import { T } from '@contentlayer/utils/effect' +import * as core from '@contentlayer-temp/core' +import type { AbsolutePosixFilePath } from '@contentlayer-temp/utils' +import { AsciiTree } from '@contentlayer-temp/utils' +import type { HasConsole } from '@contentlayer-temp/utils/effect' +import { T } from '@contentlayer-temp/utils/effect' import type { Flags } from '../types.js' import type { FetchDataError } from './index.js' diff --git a/packages/@contentlayer/source-files/src/errors/index.ts b/packages/@contentlayer/source-files/src/errors/index.ts index f6be5b27..59eaa352 100644 --- a/packages/@contentlayer/source-files/src/errors/index.ts +++ b/packages/@contentlayer/source-files/src/errors/index.ts @@ -1,7 +1,7 @@ -import type * as core from '@contentlayer/core' -import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer/utils' -import { errorToString, pattern } from '@contentlayer/utils' -import { pipe, T, Tagged } from '@contentlayer/utils/effect' +import type * as core from '@contentlayer-temp/core' +import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer-temp/utils' +import { errorToString, pattern } from '@contentlayer-temp/utils' +import { pipe, T, Tagged } from '@contentlayer-temp/utils/effect' import { getDocumentContext } from '../fetchData/DocumentContext.js' import type { DocumentContentType } from '../index.js' diff --git a/packages/@contentlayer/source-files/src/fetchData/DocumentContext.ts b/packages/@contentlayer/source-files/src/fetchData/DocumentContext.ts index fa013cb6..7883d8d1 100644 --- a/packages/@contentlayer/source-files/src/fetchData/DocumentContext.ts +++ b/packages/@contentlayer/source-files/src/fetchData/DocumentContext.ts @@ -1,10 +1,10 @@ import * as path from 'node:path' -import type * as core from '@contentlayer/core' -import type { RelativePosixFilePath } from '@contentlayer/utils' -import * as utils from '@contentlayer/utils' -import type { Has } from '@contentlayer/utils/effect' -import { T, tag } from '@contentlayer/utils/effect' +import type * as core from '@contentlayer-temp/core' +import type { RelativePosixFilePath } from '@contentlayer-temp/utils' +import * as utils from '@contentlayer-temp/utils' +import type { Has } from '@contentlayer-temp/utils/effect' +import { T, tag } from '@contentlayer-temp/utils/effect' import type { DocumentContentType } from '../schema/defs/index.js' import type { RawDocumentData } from '../types.js' @@ -19,7 +19,7 @@ export interface DocumentContext { readonly documentTypeDef: core.DocumentTypeDef } -export const DocumentContext = tag(Symbol.for('@contentlayer/source-files/DocumentContext')) +export const DocumentContext = tag(Symbol.for('@contentlayer-temp/source-files/DocumentContext')) export const provideDocumentContext = (_: DocumentContext) => T.provideService(DocumentContext)(_) export const makeAndProvideDocumentContext = ({ diff --git a/packages/@contentlayer/source-files/src/fetchData/DocumentTypeMap.ts b/packages/@contentlayer/source-files/src/fetchData/DocumentTypeMap.ts index c797e8e6..3f28ec26 100644 --- a/packages/@contentlayer/source-files/src/fetchData/DocumentTypeMap.ts +++ b/packages/@contentlayer/source-files/src/fetchData/DocumentTypeMap.ts @@ -1,6 +1,6 @@ -import type { RelativePosixFilePath } from '@contentlayer/utils' -import type { Has } from '@contentlayer/utils/effect' -import { HashMap, O, pipe, State, T, Tagged } from '@contentlayer/utils/effect' +import type { RelativePosixFilePath } from '@contentlayer-temp/utils' +import type { Has } from '@contentlayer-temp/utils/effect' +import { HashMap, O, pipe, State, T, Tagged } from '@contentlayer-temp/utils/effect' type DocumentTypeName = string diff --git a/packages/@contentlayer/source-files/src/fetchData/fetchAllDocuments.ts b/packages/@contentlayer/source-files/src/fetchData/fetchAllDocuments.ts index f31559b3..28aed69f 100644 --- a/packages/@contentlayer/source-files/src/fetchData/fetchAllDocuments.ts +++ b/packages/@contentlayer/source-files/src/fetchData/fetchAllDocuments.ts @@ -1,10 +1,10 @@ import * as os from 'node:os' -import type * as core from '@contentlayer/core' -import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer/utils' -import { asMutableArray, fs, relativePosixFilePath } from '@contentlayer/utils' -import type { HasConsole } from '@contentlayer/utils/effect' -import { Chunk, O, OT, pipe, T } from '@contentlayer/utils/effect' +import type * as core from '@contentlayer-temp/core' +import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer-temp/utils' +import { asMutableArray, fs, relativePosixFilePath } from '@contentlayer-temp/utils' +import type { HasConsole } from '@contentlayer-temp/utils/effect' +import { Chunk, O, OT, pipe, T } from '@contentlayer-temp/utils/effect' import glob from 'fast-glob' import { FetchDataError } from '../errors/index.js' @@ -87,7 +87,7 @@ export const fetchAllDocuments = ({ return { cacheItemsMap } }), provideDocumentTypeMapState, - OT.withSpan('@contentlayer/source-local/fetchData:fetchAllDocuments', { attributes: { contentDirPath } }), + OT.withSpan('@contentlayer-temp/source-local/fetchData:fetchAllDocuments', { attributes: { contentDirPath } }), ) const getAllRelativeFilePaths = ({ @@ -119,7 +119,7 @@ const getAllRelativeFilePaths = ({ (error) => new fs.UnknownFSError({ error }), ), T.map((_) => _.map(relativePosixFilePath)), - OT.withSpan('@contentlayer/source-local/fetchData:getAllRelativeFilePaths'), + OT.withSpan('@contentlayer-temp/source-local/fetchData:getAllRelativeFilePaths'), ) } diff --git a/packages/@contentlayer/source-files/src/fetchData/index.ts b/packages/@contentlayer/source-files/src/fetchData/index.ts index eaf136a5..7e8be5ac 100644 --- a/packages/@contentlayer/source-files/src/fetchData/index.ts +++ b/packages/@contentlayer/source-files/src/fetchData/index.ts @@ -1,11 +1,11 @@ -import type { HasCwd } from '@contentlayer/core' -import * as core from '@contentlayer/core' -import type { AbsolutePosixFilePath, fs, RelativePosixFilePath } from '@contentlayer/utils' -import * as utils from '@contentlayer/utils' -import { unknownToRelativePosixFilePath } from '@contentlayer/utils' -import type { E, HasConsole, OT } from '@contentlayer/utils/effect' -import { pipe, S, T, These } from '@contentlayer/utils/effect' -import { FSWatch } from '@contentlayer/utils/node' +import type { HasCwd } from '@contentlayer-temp/core' +import * as core from '@contentlayer-temp/core' +import type { AbsolutePosixFilePath, fs, RelativePosixFilePath } from '@contentlayer-temp/utils' +import * as utils from '@contentlayer-temp/utils' +import { unknownToRelativePosixFilePath } from '@contentlayer-temp/utils' +import type { E, HasConsole, OT } from '@contentlayer-temp/utils/effect' +import { pipe, S, T, These } from '@contentlayer-temp/utils/effect' +import { FSWatch } from '@contentlayer-temp/utils/node' import { FetchDataError } from '../errors/index.js' import type * as LocalSchema from '../schema/defs/index.js' diff --git a/packages/@contentlayer/source-files/src/fetchData/makeCacheItemFromFilePath.ts b/packages/@contentlayer/source-files/src/fetchData/makeCacheItemFromFilePath.ts index 74041987..ab4dd4f5 100644 --- a/packages/@contentlayer/source-files/src/fetchData/makeCacheItemFromFilePath.ts +++ b/packages/@contentlayer/source-files/src/fetchData/makeCacheItemFromFilePath.ts @@ -1,8 +1,8 @@ -import type * as core from '@contentlayer/core' -import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer/utils' -import { filePathJoin, fs } from '@contentlayer/utils' -import type { HasConsole } from '@contentlayer/utils/effect' -import { identity, O, OT, pipe, T, These } from '@contentlayer/utils/effect' +import type * as core from '@contentlayer-temp/core' +import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer-temp/utils' +import { filePathJoin, fs } from '@contentlayer-temp/utils' +import type { HasConsole } from '@contentlayer-temp/utils/effect' +import { identity, O, OT, pipe, T, These } from '@contentlayer-temp/utils/effect' import matter from 'gray-matter' import yaml from 'yaml' @@ -106,7 +106,9 @@ export const makeCacheItemFromFilePath = ({ warnings, ) }), - OT.withSpan('@contentlayer/source-local/fetchData:makeCacheItemFromFilePath', { attributes: { relativeFilePath } }), + OT.withSpan('@contentlayer-temp/source-local/fetchData:makeCacheItemFromFilePath', { + attributes: { relativeFilePath }, + }), T.mapError((error) => { switch (error._tag) { case 'fs.StatError': @@ -178,7 +180,7 @@ const processRawContent = ({ ) } }), - OT.withSpan('@contentlayer/source-local/fetchData:getRawContent'), + OT.withSpan('@contentlayer-temp/source-local/fetchData:getRawContent'), ) const getComputedValues = ({ diff --git a/packages/@contentlayer/source-files/src/fetchData/mapping/field-date.ts b/packages/@contentlayer/source-files/src/fetchData/mapping/field-date.ts index c37db3ca..915426db 100644 --- a/packages/@contentlayer/source-files/src/fetchData/mapping/field-date.ts +++ b/packages/@contentlayer/source-files/src/fetchData/mapping/field-date.ts @@ -1,6 +1,6 @@ -import type * as core from '@contentlayer/core' -import { Temporal } from '@contentlayer/utils' -import { pipe, T } from '@contentlayer/utils/effect' +import type * as core from '@contentlayer-temp/core' +import { Temporal } from '@contentlayer-temp/utils' +import { pipe, T } from '@contentlayer-temp/utils/effect' import { FetchDataError } from '../../errors/index.js' diff --git a/packages/@contentlayer/source-files/src/fetchData/mapping/field-image.ts b/packages/@contentlayer/source-files/src/fetchData/mapping/field-image.ts index c207367e..c82b69cd 100644 --- a/packages/@contentlayer/source-files/src/fetchData/mapping/field-image.ts +++ b/packages/@contentlayer/source-files/src/fetchData/mapping/field-image.ts @@ -1,7 +1,7 @@ -import * as core from '@contentlayer/core' -import * as utils from '@contentlayer/utils' -import { fs, unknownToRelativePosixFilePath } from '@contentlayer/utils' -import { identity, OT, pipe, T } from '@contentlayer/utils/effect' +import * as core from '@contentlayer-temp/core' +import * as utils from '@contentlayer-temp/utils' +import { fs, unknownToRelativePosixFilePath } from '@contentlayer-temp/utils' +import { identity, OT, pipe, T } from '@contentlayer-temp/utils/effect' import type * as ImageScript from 'imagescript' import type sharp from 'sharp' diff --git a/packages/@contentlayer/source-files/src/fetchData/mapping/field-markdown.ts b/packages/@contentlayer/source-files/src/fetchData/mapping/field-markdown.ts index 0d13bb73..fa07934f 100644 --- a/packages/@contentlayer/source-files/src/fetchData/mapping/field-markdown.ts +++ b/packages/@contentlayer/source-files/src/fetchData/mapping/field-markdown.ts @@ -1,7 +1,7 @@ -import * as core from '@contentlayer/core' -import * as utils from '@contentlayer/utils' -import type { HasConsole, OT } from '@contentlayer/utils/effect' -import { T } from '@contentlayer/utils/effect' +import * as core from '@contentlayer-temp/core' +import * as utils from '@contentlayer-temp/utils' +import type { HasConsole, OT } from '@contentlayer-temp/utils/effect' +import { T } from '@contentlayer-temp/utils/effect' import type { HasDocumentContext } from '../DocumentContext.js' import { getFromDocumentContext } from '../DocumentContext.js' diff --git a/packages/@contentlayer/source-files/src/fetchData/mapping/field-mdx.ts b/packages/@contentlayer/source-files/src/fetchData/mapping/field-mdx.ts index 1006850d..d2a8b84e 100644 --- a/packages/@contentlayer/source-files/src/fetchData/mapping/field-mdx.ts +++ b/packages/@contentlayer/source-files/src/fetchData/mapping/field-mdx.ts @@ -1,8 +1,8 @@ -import * as core from '@contentlayer/core' -import type { AbsolutePosixFilePath } from '@contentlayer/utils' -import * as utils from '@contentlayer/utils' -import type { OT } from '@contentlayer/utils/effect' -import { T } from '@contentlayer/utils/effect' +import * as core from '@contentlayer-temp/core' +import type { AbsolutePosixFilePath } from '@contentlayer-temp/utils' +import * as utils from '@contentlayer-temp/utils' +import type { OT } from '@contentlayer-temp/utils/effect' +import { T } from '@contentlayer-temp/utils/effect' import type { HasDocumentContext } from '../DocumentContext.js' import { getFromDocumentContext } from '../DocumentContext.js' diff --git a/packages/@contentlayer/source-files/src/fetchData/mapping/index.ts b/packages/@contentlayer/source-files/src/fetchData/mapping/index.ts index 2dc1c232..432dabd5 100644 --- a/packages/@contentlayer/source-files/src/fetchData/mapping/index.ts +++ b/packages/@contentlayer/source-files/src/fetchData/mapping/index.ts @@ -1,8 +1,8 @@ -import type * as core from '@contentlayer/core' -import type { AbsolutePosixFilePath, fs, RelativePosixFilePath } from '@contentlayer/utils' -import * as utils from '@contentlayer/utils' -import type { HasConsole, OT } from '@contentlayer/utils/effect' -import { identity, pipe, T } from '@contentlayer/utils/effect' +import type * as core from '@contentlayer-temp/core' +import type { AbsolutePosixFilePath, fs, RelativePosixFilePath } from '@contentlayer-temp/utils' +import * as utils from '@contentlayer-temp/utils' +import type { HasConsole, OT } from '@contentlayer-temp/utils/effect' +import { identity, pipe, T } from '@contentlayer-temp/utils/effect' import { FetchDataError } from '../../errors/index.js' import type { HasDocumentContext } from '../DocumentContext.js' diff --git a/packages/@contentlayer/source-files/src/fetchData/mapping/parseFieldData.ts b/packages/@contentlayer/source-files/src/fetchData/mapping/parseFieldData.ts index 1987bc25..50c3d4d3 100644 --- a/packages/@contentlayer/source-files/src/fetchData/mapping/parseFieldData.ts +++ b/packages/@contentlayer/source-files/src/fetchData/mapping/parseFieldData.ts @@ -1,5 +1,5 @@ -import type * as core from '@contentlayer/core' -import { T } from '@contentlayer/utils/effect' +import type * as core from '@contentlayer-temp/core' +import { T } from '@contentlayer-temp/utils/effect' import * as zod from 'zod' import { FetchDataError } from '../../errors/index.js' diff --git a/packages/@contentlayer/source-files/src/fetchData/validateDocumentData.ts b/packages/@contentlayer/source-files/src/fetchData/validateDocumentData.ts index 1fc8d63f..c60fbaa4 100644 --- a/packages/@contentlayer/source-files/src/fetchData/validateDocumentData.ts +++ b/packages/@contentlayer/source-files/src/fetchData/validateDocumentData.ts @@ -1,7 +1,7 @@ -import type * as core from '@contentlayer/core' -import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer/utils' -import { filePathJoin, fs } from '@contentlayer/utils' -import { O, OT, pipe, T, These } from '@contentlayer/utils/effect' +import type * as core from '@contentlayer-temp/core' +import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer-temp/utils' +import { filePathJoin, fs } from '@contentlayer-temp/utils' +import { O, OT, pipe, T, These } from '@contentlayer-temp/utils/effect' import micromatch from 'micromatch' import { FetchDataError } from '../errors/index.js' diff --git a/packages/@contentlayer/source-files/src/index.ts b/packages/@contentlayer/source-files/src/index.ts index d2b550bc..686f6a49 100644 --- a/packages/@contentlayer/source-files/src/index.ts +++ b/packages/@contentlayer/source-files/src/index.ts @@ -1,7 +1,7 @@ -import * as core from '@contentlayer/core' -import { processArgs, SourceProvideSchemaError } from '@contentlayer/core' -import { unknownToAbsolutePosixFilePath, unknownToRelativePosixFilePath } from '@contentlayer/utils' -import { pipe, S, T } from '@contentlayer/utils/effect' +import * as core from '@contentlayer-temp/core' +import { processArgs, SourceProvideSchemaError } from '@contentlayer-temp/core' +import { unknownToAbsolutePosixFilePath, unknownToRelativePosixFilePath } from '@contentlayer-temp/utils' +import { pipe, S, T } from '@contentlayer-temp/utils/effect' import { fetchData } from './fetchData/index.js' import type * as LocalSchema from './schema/defs/index.js' diff --git a/packages/@contentlayer/source-files/src/schema/defs/computed-field.ts b/packages/@contentlayer/source-files/src/schema/defs/computed-field.ts index 69efe0c7..3a6fe74a 100644 --- a/packages/@contentlayer/source-files/src/schema/defs/computed-field.ts +++ b/packages/@contentlayer/source-files/src/schema/defs/computed-field.ts @@ -1,4 +1,4 @@ -import type { GetDocumentTypeMapGen } from '@contentlayer/core' +import type { GetDocumentTypeMapGen } from '@contentlayer-temp/core' import type { LocalDocument } from '../../types.js' import type { FieldDefType } from './index.js' diff --git a/packages/@contentlayer/source-files/src/schema/defs/index.ts b/packages/@contentlayer/source-files/src/schema/defs/index.ts index 6600d7b2..fcb742d0 100644 --- a/packages/@contentlayer/source-files/src/schema/defs/index.ts +++ b/packages/@contentlayer/source-files/src/schema/defs/index.ts @@ -1,5 +1,5 @@ -import type * as core from '@contentlayer/core' -import type { Thunk } from '@contentlayer/utils' +import type * as core from '@contentlayer-temp/core' +import type { Thunk } from '@contentlayer-temp/utils' import type { ComputedField } from './computed-field.js' import type { FieldDef, FieldDefWithName } from './field.js' diff --git a/packages/@contentlayer/source-files/src/schema/provideSchema.ts b/packages/@contentlayer/source-files/src/schema/provideSchema.ts index 7ca13eca..618e8b45 100644 --- a/packages/@contentlayer/source-files/src/schema/provideSchema.ts +++ b/packages/@contentlayer/source-files/src/schema/provideSchema.ts @@ -1,6 +1,6 @@ -import * as core from '@contentlayer/core' -import * as utils from '@contentlayer/utils' -import { identity, T } from '@contentlayer/utils/effect' +import * as core from '@contentlayer-temp/core' +import * as utils from '@contentlayer-temp/utils' +import { identity, T } from '@contentlayer-temp/utils/effect' import type { SchemaError } from '../errors/index.js' import { DuplicateBodyFieldError } from '../errors/index.js' diff --git a/packages/@contentlayer/source-files/src/types.ts b/packages/@contentlayer/source-files/src/types.ts index 7d96a9f6..e83dd148 100644 --- a/packages/@contentlayer/source-files/src/types.ts +++ b/packages/@contentlayer/source-files/src/types.ts @@ -1,4 +1,4 @@ -import type { DateOptions, MarkdownOptions, MarkdownUnifiedBuilderCallback, MDXOptions } from '@contentlayer/core' +import type { DateOptions, MarkdownOptions, MarkdownUnifiedBuilderCallback, MDXOptions } from '@contentlayer-temp/core' import type { DocumentContentType } from './schema/defs/index.js' diff --git a/packages/@contentlayer/source-remote-files/package.json b/packages/@contentlayer/source-remote-files/package.json index 827ab5cb..c45e81bc 100644 --- a/packages/@contentlayer/source-remote-files/package.json +++ b/packages/@contentlayer/source-remote-files/package.json @@ -1,5 +1,5 @@ { - "name": "@contentlayer/source-remote-files", + "name": "@contentlayer-temp/source-remote-files", "version": "0.3.4", "type": "module", "exports": { @@ -15,8 +15,8 @@ "./package.json" ], "dependencies": { - "@contentlayer/core": "workspace:*", - "@contentlayer/source-files": "workspace:*", - "@contentlayer/utils": "workspace:*" + "@contentlayer-temp/core": "workspace:*", + "@contentlayer-temp/source-files": "workspace:*", + "@contentlayer-temp/utils": "workspace:*" } } diff --git a/packages/@contentlayer/source-remote-files/src/index.ts b/packages/@contentlayer/source-remote-files/src/index.ts index c4b193ae..16f83aca 100644 --- a/packages/@contentlayer/source-remote-files/src/index.ts +++ b/packages/@contentlayer/source-remote-files/src/index.ts @@ -1,8 +1,8 @@ -import * as core from '@contentlayer/core' -import type { Args as SourceFilesArgs } from '@contentlayer/source-files' -import { makeSource as makeSourceFromSourceFiles } from '@contentlayer/source-files' -import { unknownToAbsolutePosixFilePath } from '@contentlayer/utils' -import { M, OT, pipe, S, T } from '@contentlayer/utils/effect' +import * as core from '@contentlayer-temp/core' +import type { Args as SourceFilesArgs } from '@contentlayer-temp/source-files' +import { makeSource as makeSourceFromSourceFiles } from '@contentlayer-temp/source-files' +import { unknownToAbsolutePosixFilePath } from '@contentlayer-temp/utils' +import { M, OT, pipe, S, T } from '@contentlayer-temp/utils/effect' type CancelFn = () => void diff --git a/packages/@contentlayer/utils/package.json b/packages/@contentlayer/utils/package.json index 41856ed4..141f22cf 100644 --- a/packages/@contentlayer/utils/package.json +++ b/packages/@contentlayer/utils/package.json @@ -1,5 +1,5 @@ { - "name": "@contentlayer/utils", + "name": "@contentlayer-temp/utils", "version": "0.3.4", "type": "module", "exports": { diff --git a/packages/contentful-generator/package.json b/packages/contentful-generator/package.json index 473f4147..6f87fb05 100644 --- a/packages/contentful-generator/package.json +++ b/packages/contentful-generator/package.json @@ -1,5 +1,5 @@ { - "name": "contentful-generator", + "name": "contentful-generator-temp", "private": true, "scripts": { "dev": "ts-node --transpile-only --compiler-options '{\"module\":\"CommonJS\"}' ./src/index.ts" diff --git a/packages/contentlayer-stackbit-yaml-generator/package.json b/packages/contentlayer-stackbit-yaml-generator/package.json index 8bd255ea..be9f1a47 100644 --- a/packages/contentlayer-stackbit-yaml-generator/package.json +++ b/packages/contentlayer-stackbit-yaml-generator/package.json @@ -1,5 +1,5 @@ { - "name": "contentlayer-stackbit-yaml-generator", + "name": "contentlayer-stackbit-yaml-generator-temp", "version": "0.3.4", "type": "module", "bin": "./dist/cli/index.js", @@ -15,15 +15,15 @@ "test": "FORCE_COLOR=1 vitest" }, "dependencies": { - "@contentlayer/core": "workspace:*", - "@contentlayer/utils": "workspace:*", + "@contentlayer-temp/core": "workspace:*", + "@contentlayer-temp/utils": "workspace:*", "@stackbit/sdk": "^0.3.25", "clipanion": "^3.2.1", "typanion": "3.12.1", "yaml": "^2.3.1" }, "devDependencies": { - "contentlayer": "workspace:*", + "contentlayer-temp": "workspace:*", "typescript": "^5.1.6", "vite": "^5.0.12", "vitest": "1.2.2" diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Blog.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Blog.ts index a38a2007..7eb6f299 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Blog.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Blog.ts @@ -1,4 +1,4 @@ -import { defineDocumentType } from 'contentlayer/source-files' +import { defineDocumentType } from 'contentlayer-temp/source-files' import { SEO } from '../nested/SEO.js' import { urlFromFilePath } from '../utils.js' diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Config.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Config.ts index a26ae432..ee5c8292 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Config.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Config.ts @@ -1,4 +1,4 @@ -import { defineDocumentType, defineFields, defineNestedType } from 'contentlayer/source-files' +import { defineDocumentType, defineFields, defineNestedType } from 'contentlayer-temp/source-files' import { Action } from '../nested/Action.js' import { FormField } from '../nested/FormField.js' diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Landing.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Landing.ts index 2821181c..cf3356eb 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Landing.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Landing.ts @@ -1,4 +1,4 @@ -import { defineDocumentType, defineFields, defineNestedType } from 'contentlayer/source-files' +import { defineDocumentType, defineFields, defineNestedType } from 'contentlayer-temp/source-files' import { Action } from '../nested/Action.js' import { FormField } from '../nested/FormField.js' diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Page.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Page.ts index 111dfd5a..4f14edcb 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Page.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Page.ts @@ -1,4 +1,4 @@ -import { defineDocumentType } from 'contentlayer/source-files' +import { defineDocumentType } from 'contentlayer-temp/source-files' import { SEO } from '../nested/SEO.js' import { urlFromFilePath } from '../utils.js' diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Person.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Person.ts index f0e230a6..0ee49774 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Person.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Person.ts @@ -1,4 +1,4 @@ -import { defineDocumentType } from 'contentlayer/source-files' +import { defineDocumentType } from 'contentlayer-temp/source-files' export const Person = defineDocumentType(() => ({ name: 'Person', diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Post.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Post.ts index 030ecf60..0541fe65 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Post.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Post.ts @@ -1,4 +1,4 @@ -import { defineDocumentType } from 'contentlayer/source-files' +import { defineDocumentType } from 'contentlayer-temp/source-files' import { SEO } from '../nested/SEO.js' import { urlFromFilePath } from '../utils.js' diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/Action.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/Action.ts index 8ab9864b..bb72e568 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/Action.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/Action.ts @@ -1,4 +1,4 @@ -import { defineNestedType } from 'contentlayer/source-files' +import { defineNestedType } from 'contentlayer-temp/source-files' export const Action = defineNestedType(() => ({ name: 'Action', diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/FormField.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/FormField.ts index 32d2508e..83a70e8d 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/FormField.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/FormField.ts @@ -1,4 +1,4 @@ -import { defineNestedType } from 'contentlayer/source-files' +import { defineNestedType } from 'contentlayer-temp/source-files' export const FormField = defineNestedType(() => ({ name: 'FormField', diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/SEO.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/SEO.ts index 2e686411..905bab4c 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/SEO.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/SEO.ts @@ -1,4 +1,4 @@ -import { defineNestedType } from 'contentlayer/source-files' +import { defineNestedType } from 'contentlayer-temp/source-files' export const SEO = defineNestedType(() => ({ name: 'SEO', diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/utils.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/utils.ts index e013b4e7..54e0637b 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/utils.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/utils.ts @@ -1,3 +1,3 @@ -import type { DocumentGen } from 'contentlayer/core' +import type { DocumentGen } from 'contentlayer-temp/core' export const urlFromFilePath = (doc: DocumentGen): string => doc._raw.flattenedPath.replace(/pages\/?/, '') diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/blog-schema/index.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/blog-schema/index.ts index 24c03b65..9ffb50aa 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/blog-schema/index.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/blog-schema/index.ts @@ -1,4 +1,4 @@ -import { defineDocumentType } from 'contentlayer/source-files' +import { defineDocumentType } from 'contentlayer-temp/source-files' export const post = defineDocumentType(() => ({ name: 'Post', diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/index.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/index.ts index 0d19fbf8..9bb1903b 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/index.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/index.ts @@ -1,7 +1,7 @@ -import { provideJaegerTracing } from '@contentlayer/utils' -import { pipe, provideConsole, T } from '@contentlayer/utils/effect' -import type { DocumentType } from 'contentlayer/source-files' -import { makeSource } from 'contentlayer/source-files' +import { provideJaegerTracing } from '@contentlayer-temp/utils' +import { pipe, provideConsole, T } from '@contentlayer-temp/utils/effect' +import type { DocumentType } from 'contentlayer-temp/source-files' +import { makeSource } from 'contentlayer-temp/source-files' import * as azimuth from './azimuth-schema/index.js' import * as blog from './blog-schema/index.js' diff --git a/packages/contentlayer-stackbit-yaml-generator/src/cli/DefaultCommand.ts b/packages/contentlayer-stackbit-yaml-generator/src/cli/DefaultCommand.ts index 33eb19cd..61b37602 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/cli/DefaultCommand.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/cli/DefaultCommand.ts @@ -1,13 +1,13 @@ import { promises as fsp } from 'node:fs' import * as path from 'node:path' -import type { HasCwd } from '@contentlayer/core' -import { getConfig, provideCwd } from '@contentlayer/core' -import type { fs } from '@contentlayer/utils' -import { provideJaegerTracing, recRemoveUndefinedValues } from '@contentlayer/utils' -import type { HasConsole } from '@contentlayer/utils/effect' -import { OT, pipe, pretty, provideConsole, T } from '@contentlayer/utils/effect' -import { NodeFsLive } from '@contentlayer/utils/node' +import type { HasCwd } from '@contentlayer-temp/core' +import { getConfig, provideCwd } from '@contentlayer-temp/core' +import type { fs } from '@contentlayer-temp/utils' +import { provideJaegerTracing, recRemoveUndefinedValues } from '@contentlayer-temp/utils' +import type { HasConsole } from '@contentlayer-temp/utils/effect' +import { OT, pipe, pretty, provideConsole, T } from '@contentlayer-temp/utils/effect' +import { NodeFsLive } from '@contentlayer-temp/utils/node' import { Command, Option } from 'clipanion' import * as t from 'typanion' @@ -35,7 +35,7 @@ export class DefaultCommand extends Command { validator: t.isString(), }) - // TODO refactor similar to `@contentlayer/cli` + // TODO refactor similar to `@contentlayer-temp/cli` async execute() { try { await pipe( diff --git a/packages/contentlayer-stackbit-yaml-generator/src/cli/convert.ts b/packages/contentlayer-stackbit-yaml-generator/src/cli/convert.ts index 984d69d2..2e098198 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/cli/convert.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/cli/convert.ts @@ -1,5 +1,5 @@ -import type * as core from '@contentlayer/core' -import * as utils from '@contentlayer/utils' +import type * as core from '@contentlayer-temp/core' +import * as utils from '@contentlayer-temp/utils' import type * as Stackbit from '@stackbit/sdk' import type * as StackbitTypes from '@stackbit/types' diff --git a/packages/contentlayer/bin/cli.cjs b/packages/contentlayer/bin/cli.cjs index 56f7221d..5c26269c 100755 --- a/packages/contentlayer/bin/cli.cjs +++ b/packages/contentlayer/bin/cli.cjs @@ -1,7 +1,7 @@ #!/usr/bin/env node const main = async () => { - const { run } = await import('@contentlayer/cli') + const { run } = await import('@contentlayer-temp/cli') await run() } diff --git a/packages/contentlayer/package.json b/packages/contentlayer/package.json index 7d38d05e..a772ef7c 100644 --- a/packages/contentlayer/package.json +++ b/packages/contentlayer/package.json @@ -1,5 +1,5 @@ { - "name": "contentlayer", + "name": "contentlayer-temp", "version": "0.3.4", "bin": "./bin/cli.cjs", "type": "module", @@ -61,12 +61,12 @@ "_bundle-cli": "esbuild ./dist/cli/index.js --bundle --platform=node --format=esm --external:esbuild --external:@esbuild-plugins/node-resolve --outfile=dist/cli/bundle.js --main-fields=module,main --metafile=meta.json --banner:js=\"import { createRequire as topLevelCreateRequire } from 'module'; const require = topLevelCreateRequire(import.meta.url); const __dirname = '__SET_BY_ESBUILD__';\"" }, "dependencies": { - "@contentlayer/cli": "workspace:*", - "@contentlayer/client": "workspace:*", - "@contentlayer/core": "workspace:*", - "@contentlayer/source-files": "workspace:*", - "@contentlayer/source-remote-files": "workspace:*", - "@contentlayer/utils": "workspace:*" + "@contentlayer-temp/cli": "workspace:*", + "@contentlayer-temp/client": "workspace:*", + "@contentlayer-temp/core": "workspace:*", + "@contentlayer-temp/source-files": "workspace:*", + "@contentlayer-temp/source-remote-files": "workspace:*", + "@contentlayer-temp/utils": "workspace:*" }, "devDependencies": { "typescript": "^5.1.6" diff --git a/packages/contentlayer/src/client/index.ts b/packages/contentlayer/src/client/index.ts index b9a10265..fa4c3a1c 100644 --- a/packages/contentlayer/src/client/index.ts +++ b/packages/contentlayer/src/client/index.ts @@ -1 +1 @@ -export * from '@contentlayer/client' +export * from '@contentlayer-temp/client' diff --git a/packages/contentlayer/src/core/index.ts b/packages/contentlayer/src/core/index.ts index ddac7f69..76846d42 100644 --- a/packages/contentlayer/src/core/index.ts +++ b/packages/contentlayer/src/core/index.ts @@ -1 +1 @@ -export * from '@contentlayer/core' +export * from '@contentlayer-temp/core' diff --git a/packages/contentlayer/src/source-files/index.ts b/packages/contentlayer/src/source-files/index.ts index 6a32e3e7..1f59bb41 100644 --- a/packages/contentlayer/src/source-files/index.ts +++ b/packages/contentlayer/src/source-files/index.ts @@ -1 +1 @@ -export * from '@contentlayer/source-files' +export * from '@contentlayer-temp/source-files' diff --git a/packages/contentlayer/src/source-files/schema/index.ts b/packages/contentlayer/src/source-files/schema/index.ts index d929777e..60c9a20c 100644 --- a/packages/contentlayer/src/source-files/schema/index.ts +++ b/packages/contentlayer/src/source-files/schema/index.ts @@ -1 +1 @@ -export * from '@contentlayer/source-files/schema/defs' +export * from '@contentlayer-temp/source-files/schema/defs' diff --git a/packages/contentlayer/src/source-remote-files/index.ts b/packages/contentlayer/src/source-remote-files/index.ts index 7f72211f..dd9848f3 100644 --- a/packages/contentlayer/src/source-remote-files/index.ts +++ b/packages/contentlayer/src/source-remote-files/index.ts @@ -1 +1 @@ -export * from '@contentlayer/source-remote-files' +export * from '@contentlayer-temp/source-remote-files' diff --git a/packages/contentlayer/src/utils/index.ts b/packages/contentlayer/src/utils/index.ts index e2d61095..4d6cab23 100644 --- a/packages/contentlayer/src/utils/index.ts +++ b/packages/contentlayer/src/utils/index.ts @@ -1 +1 @@ -export * from '@contentlayer/utils' +export * from '@contentlayer-temp/utils' diff --git a/packages/contentlayer/src/utils/node/index.ts b/packages/contentlayer/src/utils/node/index.ts index 68544c16..43db4f17 100644 --- a/packages/contentlayer/src/utils/node/index.ts +++ b/packages/contentlayer/src/utils/node/index.ts @@ -1 +1 @@ -export * from '@contentlayer/utils/node' +export * from '@contentlayer-temp/utils/node' diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json index cf460548..eec3a45b 100644 --- a/packages/integration-tests/package.json +++ b/packages/integration-tests/package.json @@ -6,7 +6,7 @@ "test": "FORCE_COLOR=1 vitest" }, "devDependencies": { - "contentlayer": "workspace:*", + "contentlayer-temp": "workspace:*", "remark-gfm": "^4.0.0", "remark-mdx-images": "^2.0.0", "typescript": "^5.1.6", diff --git a/packages/integration-tests/src/empty-content-folder/index.test.ts b/packages/integration-tests/src/empty-content-folder/index.test.ts index 7bbbf7c1..7b05f25e 100644 --- a/packages/integration-tests/src/empty-content-folder/index.test.ts +++ b/packages/integration-tests/src/empty-content-folder/index.test.ts @@ -2,9 +2,9 @@ import * as fs from 'node:fs/promises' import path from 'node:path' import { fileURLToPath } from 'node:url' -import { absolutePosixFilePath } from '@contentlayer/utils' -import * as core from 'contentlayer/core' -import { defineDocumentType, makeSource } from 'contentlayer/source-files' +import { absolutePosixFilePath } from '@contentlayer-temp/utils' +import * as core from 'contentlayer-temp/core' +import { defineDocumentType, makeSource } from 'contentlayer-temp/source-files' import { expect, test } from 'vitest' test('empty content folder', async () => { diff --git a/packages/integration-tests/src/image-field/index.test.ts b/packages/integration-tests/src/image-field/index.test.ts index 5ce13d3e..7fb8d68f 100644 --- a/packages/integration-tests/src/image-field/index.test.ts +++ b/packages/integration-tests/src/image-field/index.test.ts @@ -3,9 +3,9 @@ import * as fs from 'node:fs/promises' import path from 'node:path' import { fileURLToPath } from 'node:url' -import { absolutePosixFilePath } from '@contentlayer/utils' -import * as core from 'contentlayer/core' -import { defineDocumentType, makeSource } from 'contentlayer/source-files' +import { absolutePosixFilePath } from '@contentlayer-temp/utils' +import * as core from 'contentlayer-temp/core' +import { defineDocumentType, makeSource } from 'contentlayer-temp/source-files' import { expect, test } from 'vitest' test('mdx-image-field ', async () => { diff --git a/packages/integration-tests/src/markdown/index.test.ts b/packages/integration-tests/src/markdown/index.test.ts index 2c0981d0..7ec961ac 100644 --- a/packages/integration-tests/src/markdown/index.test.ts +++ b/packages/integration-tests/src/markdown/index.test.ts @@ -3,9 +3,9 @@ import * as fs from 'node:fs/promises' import path from 'node:path' import { fileURLToPath } from 'node:url' -import { absolutePosixFilePath } from '@contentlayer/utils' -import * as core from 'contentlayer/core' -import { defineDocumentType, makeSource } from 'contentlayer/source-files' +import { absolutePosixFilePath } from '@contentlayer-temp/utils' +import * as core from 'contentlayer-temp/core' +import { defineDocumentType, makeSource } from 'contentlayer-temp/source-files' import rehypeStringify from 'rehype-stringify' import remarkFrontmatter from 'remark-frontmatter' import remarkParse from 'remark-parse' diff --git a/packages/integration-tests/src/mdx-remark-images/index.test.ts b/packages/integration-tests/src/mdx-remark-images/index.test.ts index 4c65d0fd..1a93934a 100644 --- a/packages/integration-tests/src/mdx-remark-images/index.test.ts +++ b/packages/integration-tests/src/mdx-remark-images/index.test.ts @@ -3,9 +3,9 @@ import * as fs from 'node:fs/promises' import path from 'node:path' import { fileURLToPath } from 'node:url' -import { absolutePosixFilePath } from '@contentlayer/utils' -import * as core from 'contentlayer/core' -import { defineDocumentType, makeSource } from 'contentlayer/source-files' +import { absolutePosixFilePath } from '@contentlayer-temp/utils' +import * as core from 'contentlayer-temp/core' +import { defineDocumentType, makeSource } from 'contentlayer-temp/source-files' import remarkMdxImages from 'remark-mdx-images' import { expect, test } from 'vitest' diff --git a/packages/integration-tests/src/remark-gfm/index.test.ts b/packages/integration-tests/src/remark-gfm/index.test.ts index 59cfb05f..bc50fd80 100644 --- a/packages/integration-tests/src/remark-gfm/index.test.ts +++ b/packages/integration-tests/src/remark-gfm/index.test.ts @@ -3,9 +3,9 @@ import * as fs from 'node:fs/promises' import path from 'node:path' import { fileURLToPath } from 'node:url' -import { absolutePosixFilePath } from '@contentlayer/utils' -import * as core from 'contentlayer/core' -import { defineDocumentType, makeSource } from 'contentlayer/source-files' +import { absolutePosixFilePath } from '@contentlayer-temp/utils' +import * as core from 'contentlayer-temp/core' +import { defineDocumentType, makeSource } from 'contentlayer-temp/source-files' import remarkGfm from 'remark-gfm' import { expect, test } from 'vitest' diff --git a/packages/next-contentlayer/package.json b/packages/next-contentlayer/package.json index 397b8c06..a6fde837 100644 --- a/packages/next-contentlayer/package.json +++ b/packages/next-contentlayer/package.json @@ -1,5 +1,5 @@ { - "name": "next-contentlayer", + "name": "next-contentlayer-temp", "version": "0.3.4", "type": "module", "main": "./dist/index-cjs.cjs", @@ -38,11 +38,11 @@ "prepack": "sed '/^import\\|^export/d' dist/index-cjs.js > dist/index-cjs.cjs; cp src/hooks/jsx-runtime.cjs dist/hooks/jsx-runtime.cjs" }, "dependencies": { - "@contentlayer/core": "workspace:*", - "@contentlayer/utils": "workspace:*" + "@contentlayer-temp/core": "workspace:*", + "@contentlayer-temp/utils": "workspace:*" }, "peerDependencies": { - "contentlayer": "workspace:*", + "contentlayer-temp": "workspace:*", "next": "^12 || ^13 || ^14", "react": "*", "react-dom": "*" diff --git a/packages/next-contentlayer/src/plugin.ts b/packages/next-contentlayer/src/plugin.ts index a66ecb2b..8b6b4b94 100644 --- a/packages/next-contentlayer/src/plugin.ts +++ b/packages/next-contentlayer/src/plugin.ts @@ -1,8 +1,8 @@ -import '@contentlayer/utils/effect/Tracing/Enable' +import '@contentlayer-temp/utils/effect/Tracing/Enable' -import * as core from '@contentlayer/core' -import { errorToString } from '@contentlayer/utils' -import { E, OT, pipe, S, T } from '@contentlayer/utils/effect' +import * as core from '@contentlayer-temp/core' +import { errorToString } from '@contentlayer-temp/utils' +import { E, OT, pipe, S, T } from '@contentlayer-temp/utils/effect' import type { WebpackOptionsNormalized } from 'webpack' import { checkConstraints } from './check-constraints.js' diff --git a/tsconfig.base.json b/tsconfig.base.json index 524136b0..37ee792e 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -18,11 +18,11 @@ "target": "ES2020", "plugins": [{ "transform": "@effect-ts/tracing-plugin" }], "paths": { - "@contentlayer/utils/*": ["./packages/@contentlayer/utils/src/*"], - "@contentlayer/source-files/*": ["./packages/@contentlayer/source-files/src/*"], - "@contentlayer/*": ["./packages/@contentlayer/*/src"], - "contentlayer/*": ["./packages/contentlayer/src/*"], - "contentlayer": ["./pacakges/contentlayer/src"] + "@contentlayer-temp/utils/*": ["./packages/@contentlayer/utils/src/*"], + "@contentlayer-temp/source-files/*": ["./packages/@contentlayer/source-files/src/*"], + "@contentlayer-temp/*": ["./packages/@contentlayer/*/src"], + "contentlayer-temp/*": ["./packages/contentlayer/src/*"], + "contentlayer-temp": ["./pacakges/contentlayer/src"] } } } diff --git a/yarn.lock b/yarn.lock index 876709ff..bcaca8e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -318,31 +318,31 @@ __metadata: languageName: node linkType: hard -"@contentlayer/cli@workspace:*, @contentlayer/cli@workspace:packages/@contentlayer/cli": +"@contentlayer-temp/cli@workspace:*, @contentlayer-temp/cli@workspace:packages/@contentlayer/cli": version: 0.0.0-use.local - resolution: "@contentlayer/cli@workspace:packages/@contentlayer/cli" + resolution: "@contentlayer-temp/cli@workspace:packages/@contentlayer/cli" dependencies: - "@contentlayer/core": "workspace:*" - "@contentlayer/utils": "workspace:*" + "@contentlayer-temp/core": "workspace:*" + "@contentlayer-temp/utils": "workspace:*" "@types/node": ^20.3.2 clipanion: ^3.2.1 typanion: ^3.12.1 languageName: unknown linkType: soft -"@contentlayer/client@workspace:*, @contentlayer/client@workspace:packages/@contentlayer/client": +"@contentlayer-temp/client@workspace:*, @contentlayer-temp/client@workspace:packages/@contentlayer/client": version: 0.0.0-use.local - resolution: "@contentlayer/client@workspace:packages/@contentlayer/client" + resolution: "@contentlayer-temp/client@workspace:packages/@contentlayer/client" dependencies: - "@contentlayer/core": "workspace:*" + "@contentlayer-temp/core": "workspace:*" languageName: unknown linkType: soft -"@contentlayer/core@workspace:*, @contentlayer/core@workspace:packages/@contentlayer/core": +"@contentlayer-temp/core@workspace:*, @contentlayer-temp/core@workspace:packages/@contentlayer/core": version: 0.0.0-use.local - resolution: "@contentlayer/core@workspace:packages/@contentlayer/core" + resolution: "@contentlayer-temp/core@workspace:packages/@contentlayer/core" dependencies: - "@contentlayer/utils": "workspace:*" + "@contentlayer-temp/utils": "workspace:*" "@types/source-map-support": ^0.5.6 camel-case: ^4.1.2 comment-json: ^4.2.3 @@ -368,13 +368,13 @@ __metadata: languageName: unknown linkType: soft -"@contentlayer/experimental-source-files-stackbit@workspace:packages/@contentlayer/experimental-source-files-stackbit": +"@contentlayer-temp/experimental-source-files-stackbit@workspace:packages/@contentlayer/experimental-source-files-stackbit": version: 0.0.0-use.local - resolution: "@contentlayer/experimental-source-files-stackbit@workspace:packages/@contentlayer/experimental-source-files-stackbit" + resolution: "@contentlayer-temp/experimental-source-files-stackbit@workspace:packages/@contentlayer/experimental-source-files-stackbit" dependencies: - "@contentlayer/core": "workspace:*" - "@contentlayer/source-files": "workspace:*" - "@contentlayer/utils": "workspace:*" + "@contentlayer-temp/core": "workspace:*" + "@contentlayer-temp/source-files": "workspace:*" + "@contentlayer-temp/utils": "workspace:*" "@stackbit/sdk": ~0.3.25 vite: ^5.0.12 vitest: 1.2.2 @@ -386,23 +386,23 @@ __metadata: languageName: unknown linkType: soft -"@contentlayer/source-contentful@workspace:packages/@contentlayer/source-contentful": +"@contentlayer-temp/source-contentful@workspace:packages/@contentlayer/source-contentful": version: 0.0.0-use.local - resolution: "@contentlayer/source-contentful@workspace:packages/@contentlayer/source-contentful" + resolution: "@contentlayer-temp/source-contentful@workspace:packages/@contentlayer/source-contentful" dependencies: - "@contentlayer/core": "workspace:*" - "@contentlayer/utils": "workspace:*" + "@contentlayer-temp/core": "workspace:*" + "@contentlayer-temp/utils": "workspace:*" "@types/node": ^20.3.2 contentful-management: 7.22.4 languageName: unknown linkType: soft -"@contentlayer/source-files@workspace:*, @contentlayer/source-files@workspace:packages/@contentlayer/source-files": +"@contentlayer-temp/source-files@workspace:*, @contentlayer-temp/source-files@workspace:packages/@contentlayer/source-files": version: 0.0.0-use.local - resolution: "@contentlayer/source-files@workspace:packages/@contentlayer/source-files" + resolution: "@contentlayer-temp/source-files@workspace:packages/@contentlayer/source-files" dependencies: - "@contentlayer/core": "workspace:*" - "@contentlayer/utils": "workspace:*" + "@contentlayer-temp/core": "workspace:*" + "@contentlayer-temp/utils": "workspace:*" "@faker-js/faker": ^8.0.2 "@types/micromatch": ^4.0.2 "@types/node": ^20.3.2 @@ -423,19 +423,19 @@ __metadata: languageName: unknown linkType: soft -"@contentlayer/source-remote-files@workspace:*, @contentlayer/source-remote-files@workspace:packages/@contentlayer/source-remote-files": +"@contentlayer-temp/source-remote-files@workspace:*, @contentlayer-temp/source-remote-files@workspace:packages/@contentlayer/source-remote-files": version: 0.0.0-use.local - resolution: "@contentlayer/source-remote-files@workspace:packages/@contentlayer/source-remote-files" + resolution: "@contentlayer-temp/source-remote-files@workspace:packages/@contentlayer/source-remote-files" dependencies: - "@contentlayer/core": "workspace:*" - "@contentlayer/source-files": "workspace:*" - "@contentlayer/utils": "workspace:*" + "@contentlayer-temp/core": "workspace:*" + "@contentlayer-temp/source-files": "workspace:*" + "@contentlayer-temp/utils": "workspace:*" languageName: unknown linkType: soft -"@contentlayer/utils@workspace:*, @contentlayer/utils@workspace:packages/@contentlayer/utils": +"@contentlayer-temp/utils@workspace:*, @contentlayer-temp/utils@workspace:packages/@contentlayer/utils": version: 0.0.0-use.local - resolution: "@contentlayer/utils@workspace:packages/@contentlayer/utils" + resolution: "@contentlayer-temp/utils@workspace:packages/@contentlayer/utils" dependencies: "@effect-ts/core": ^0.60.5 "@effect-ts/otel": ^0.15.1 @@ -3422,9 +3422,9 @@ __metadata: languageName: node linkType: hard -"contentful-generator@workspace:packages/contentful-generator": +"contentful-generator-temp@workspace:packages/contentful-generator": version: 0.0.0-use.local - resolution: "contentful-generator@workspace:packages/contentful-generator" + resolution: "contentful-generator-temp@workspace:packages/contentful-generator" dependencies: contentful-management: 7.22.4 contentful-migration: ^4.2.3 @@ -3520,38 +3520,38 @@ __metadata: languageName: unknown linkType: soft -"contentlayer-stackbit-yaml-generator@workspace:packages/contentlayer-stackbit-yaml-generator": +"contentlayer-stackbit-yaml-generator-temp@workspace:packages/contentlayer-stackbit-yaml-generator": version: 0.0.0-use.local - resolution: "contentlayer-stackbit-yaml-generator@workspace:packages/contentlayer-stackbit-yaml-generator" + resolution: "contentlayer-stackbit-yaml-generator-temp@workspace:packages/contentlayer-stackbit-yaml-generator" dependencies: - "@contentlayer/core": "workspace:*" - "@contentlayer/utils": "workspace:*" + "@contentlayer-temp/core": "workspace:*" + "@contentlayer-temp/utils": "workspace:*" "@stackbit/sdk": ^0.3.25 clipanion: ^3.2.1 - contentlayer: "workspace:*" + contentlayer-temp: "workspace:*" typanion: 3.12.1 typescript: ^5.1.6 vite: ^5.0.12 vitest: 1.2.2 yaml: ^2.3.1 bin: - contentlayer-stackbit-yaml-generator: ./dist/cli/index.js + contentlayer-stackbit-yaml-generator-temp: ./dist/cli/index.js languageName: unknown linkType: soft -"contentlayer@workspace:*, contentlayer@workspace:packages/contentlayer": +"contentlayer-temp@workspace:*, contentlayer-temp@workspace:packages/contentlayer": version: 0.0.0-use.local - resolution: "contentlayer@workspace:packages/contentlayer" - dependencies: - "@contentlayer/cli": "workspace:*" - "@contentlayer/client": "workspace:*" - "@contentlayer/core": "workspace:*" - "@contentlayer/source-files": "workspace:*" - "@contentlayer/source-remote-files": "workspace:*" - "@contentlayer/utils": "workspace:*" + resolution: "contentlayer-temp@workspace:packages/contentlayer" + dependencies: + "@contentlayer-temp/cli": "workspace:*" + "@contentlayer-temp/client": "workspace:*" + "@contentlayer-temp/core": "workspace:*" + "@contentlayer-temp/source-files": "workspace:*" + "@contentlayer-temp/source-remote-files": "workspace:*" + "@contentlayer-temp/utils": "workspace:*" typescript: ^5.1.6 bin: - contentlayer: ./bin/cli.cjs + contentlayer-temp: ./bin/cli.cjs languageName: unknown linkType: soft @@ -5509,7 +5509,7 @@ __metadata: version: 0.0.0-use.local resolution: "integration-tests@workspace:packages/integration-tests" dependencies: - contentlayer: "workspace:*" + contentlayer-temp: "workspace:*" remark-gfm: ^4.0.0 remark-mdx-images: ^2.0.0 typescript: ^5.1.6 @@ -7455,10 +7455,10 @@ __metadata: dependencies: "@types/react": 18.2.14 autoprefixer: ^10.4.14 - contentlayer: latest + contentlayer-temp: latest date-fns: 2.30.0 next: 14.1.0 - next-contentlayer: latest + next-contentlayer-temp: latest postcss: ^8.4.24 react: 18.2.0 react-dom: 18.2.0 @@ -7467,19 +7467,19 @@ __metadata: languageName: unknown linkType: soft -"next-contentlayer@workspace:*, next-contentlayer@workspace:packages/next-contentlayer": +"next-contentlayer-temp@workspace:*, next-contentlayer-temp@workspace:packages/next-contentlayer": version: 0.0.0-use.local - resolution: "next-contentlayer@workspace:packages/next-contentlayer" + resolution: "next-contentlayer-temp@workspace:packages/next-contentlayer" dependencies: - "@contentlayer/core": "workspace:*" - "@contentlayer/utils": "workspace:*" + "@contentlayer-temp/core": "workspace:*" + "@contentlayer-temp/utils": "workspace:*" "@types/react": ^18.2.14 "@types/react-dom": ^18.2.6 next: ^14.1.0 typescript: ^5.1.6 webpack: ^5.88.1 peerDependencies: - contentlayer: "workspace:*" + contentlayer-temp: "workspace:*" next: ^12 || ^13 || ^14 react: "*" react-dom: "*" @@ -7492,10 +7492,10 @@ __metadata: dependencies: "@types/react": 18.2.14 autoprefixer: ^10.4.14 - contentlayer: latest + contentlayer-temp: latest date-fns: 2.30.0 next: 14.1.0 - next-contentlayer: latest + next-contentlayer-temp: latest postcss: ^8.4.24 react: 18.2.0 react-dom: 18.2.0 @@ -7510,10 +7510,10 @@ __metadata: dependencies: "@types/react": 18.2.14 autoprefixer: ^10.4.14 - contentlayer: latest + contentlayer-temp: latest date-fns: 2.30.0 next: 14.1.0 - next-contentlayer: latest + next-contentlayer-temp: latest postcss: ^8.4.24 react: 18.2.0 react-dom: 18.2.0 @@ -7651,7 +7651,7 @@ __metadata: version: 0.0.0-use.local resolution: "node-script-example@workspace:examples/node-script" dependencies: - contentlayer: latest + contentlayer-temp: latest languageName: unknown linkType: soft @@ -7659,7 +7659,7 @@ __metadata: version: 0.0.0-use.local resolution: "node-script-mdx-example@workspace:examples/node-script-mdx" dependencies: - contentlayer: latest + contentlayer-temp: latest languageName: unknown linkType: soft @@ -7667,7 +7667,7 @@ __metadata: version: 0.0.0-use.local resolution: "node-script-remote-content-example@workspace:examples/node-script-remote-content" dependencies: - contentlayer: latest + contentlayer-temp: latest languageName: unknown linkType: soft From e423a0f3c97c288df304720e60a1823190061068 Mon Sep 17 00:00:00 2001 From: Timothy Lin Date: Sun, 4 Feb 2024 17:36:37 +0800 Subject: [PATCH 2/9] update package use in app dir --- examples/next-images/app/page.tsx | 25 ++++++++----------- .../next-images/app/posts/[slug]/page.tsx | 2 +- examples/node-script-mdx/package.json | 2 +- .../node-script-remote-content/package.json | 2 +- examples/node-script/package.json | 2 +- 5 files changed, 14 insertions(+), 19 deletions(-) diff --git a/examples/next-images/app/page.tsx b/examples/next-images/app/page.tsx index 84bbf2dc..5d36dfe8 100644 --- a/examples/next-images/app/page.tsx +++ b/examples/next-images/app/page.tsx @@ -1,35 +1,30 @@ -import Link from "next/link"; -import { compareDesc, format, parseISO } from "date-fns"; -import { allPosts, Post } from "contentlayer/generated"; -import { getMDXComponent } from "next-contentlayer/hooks"; +import Link from 'next/link' +import { compareDesc, format, parseISO } from 'date-fns' +import { allPosts, Post } from 'contentlayer/generated' +import { getMDXComponent } from 'next-contentlayer-temp/hooks' function PostCard(post: Post) { - const Content = getMDXComponent(post.body.code); + const Content = getMDXComponent(post.body.code) return (

- + {post.title}

- ); + ) } export default function Home() { - const posts = allPosts.sort((a, b) => - compareDesc(new Date(a.date), new Date(b.date)) - ); + const posts = allPosts.sort((a, b) => compareDesc(new Date(a.date), new Date(b.date))) return (
@@ -39,5 +34,5 @@ export default function Home() { ))}
- ); + ) } diff --git a/examples/next-images/app/posts/[slug]/page.tsx b/examples/next-images/app/posts/[slug]/page.tsx index 940dbf20..aee01850 100644 --- a/examples/next-images/app/posts/[slug]/page.tsx +++ b/examples/next-images/app/posts/[slug]/page.tsx @@ -1,6 +1,6 @@ import { format, parseISO } from 'date-fns' import { allPosts } from 'contentlayer/generated' -import { getMDXComponent } from 'next-contentlayer/hooks' +import { getMDXComponent } from 'next-contentlayer-temp/hooks' import Image from 'next/image' export const generateStaticParams = async () => allPosts.map((post) => ({ slug: post._raw.flattenedPath })) diff --git a/examples/node-script-mdx/package.json b/examples/node-script-mdx/package.json index 4de338c6..60672455 100644 --- a/examples/node-script-mdx/package.json +++ b/examples/node-script-mdx/package.json @@ -7,4 +7,4 @@ "dependencies": { "contentlayer-temp": "latest" } -} \ No newline at end of file +} diff --git a/examples/node-script-remote-content/package.json b/examples/node-script-remote-content/package.json index fdc5c367..11f08166 100644 --- a/examples/node-script-remote-content/package.json +++ b/examples/node-script-remote-content/package.json @@ -7,4 +7,4 @@ "dependencies": { "contentlayer-temp": "latest" } -} \ No newline at end of file +} diff --git a/examples/node-script/package.json b/examples/node-script/package.json index 2606a7e1..046d4f75 100644 --- a/examples/node-script/package.json +++ b/examples/node-script/package.json @@ -7,4 +7,4 @@ "dependencies": { "contentlayer-temp": "latest" } -} \ No newline at end of file +} From a10389ae30e3c302af2db9a5ee570ba332a481b2 Mon Sep 17 00:00:00 2001 From: Timothy Lin Date: Sun, 4 Feb 2024 18:14:52 +0800 Subject: [PATCH 3/9] fix prepack and bump versions --- .../@contentlayer/source-files/package.json | 4 +- .../source-remote-files/package.json | 4 +- .../package.json | 4 +- packages/contentlayer/package.json | 4 +- packages/integration-tests/package.json | 2 +- .../src/mdx-remark-images/index.test.ts | 2 + packages/next-contentlayer/package.json | 6 +- yarn.lock | 110 ++---------------- 8 files changed, 23 insertions(+), 113 deletions(-) diff --git a/packages/@contentlayer/source-files/package.json b/packages/@contentlayer/source-files/package.json index 78ae9b1e..eaaf677d 100644 --- a/packages/@contentlayer/source-files/package.json +++ b/packages/@contentlayer/source-files/package.json @@ -1,6 +1,6 @@ { "name": "@contentlayer-temp/source-files", - "version": "0.3.4", + "version": "0.4.0", "type": "module", "exports": { ".": { @@ -51,4 +51,4 @@ "vitest": "1.2.2" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/@contentlayer/source-remote-files/package.json b/packages/@contentlayer/source-remote-files/package.json index c45e81bc..85bfc65d 100644 --- a/packages/@contentlayer/source-remote-files/package.json +++ b/packages/@contentlayer/source-remote-files/package.json @@ -1,6 +1,6 @@ { "name": "@contentlayer-temp/source-remote-files", - "version": "0.3.4", + "version": "0.4.0", "type": "module", "exports": { ".": { @@ -19,4 +19,4 @@ "@contentlayer-temp/source-files": "workspace:*", "@contentlayer-temp/utils": "workspace:*" } -} +} \ No newline at end of file diff --git a/packages/contentlayer-stackbit-yaml-generator/package.json b/packages/contentlayer-stackbit-yaml-generator/package.json index be9f1a47..618176ec 100644 --- a/packages/contentlayer-stackbit-yaml-generator/package.json +++ b/packages/contentlayer-stackbit-yaml-generator/package.json @@ -1,6 +1,6 @@ { "name": "contentlayer-stackbit-yaml-generator-temp", - "version": "0.3.4", + "version": "0.4.1", "type": "module", "bin": "./dist/cli/index.js", "exports": "./dist/lib/index.js", @@ -28,4 +28,4 @@ "vite": "^5.0.12", "vitest": "1.2.2" } -} +} \ No newline at end of file diff --git a/packages/contentlayer/package.json b/packages/contentlayer/package.json index a772ef7c..c305fb0d 100644 --- a/packages/contentlayer/package.json +++ b/packages/contentlayer/package.json @@ -1,6 +1,6 @@ { "name": "contentlayer-temp", - "version": "0.3.4", + "version": "0.4.1", "bin": "./bin/cli.cjs", "type": "module", "engines": { @@ -81,4 +81,4 @@ "bug": { "url": "https://github.com/contentlayerdev/contentlayer/issues" } -} +} \ No newline at end of file diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json index eec3a45b..7cdd41fa 100644 --- a/packages/integration-tests/package.json +++ b/packages/integration-tests/package.json @@ -8,7 +8,7 @@ "devDependencies": { "contentlayer-temp": "workspace:*", "remark-gfm": "^4.0.0", - "remark-mdx-images": "^2.0.0", + "remark-mdx-images": "^3.0.0", "typescript": "^5.1.6", "vite": "^5.0.12", "vitest": "1.2.2" diff --git a/packages/integration-tests/src/mdx-remark-images/index.test.ts b/packages/integration-tests/src/mdx-remark-images/index.test.ts index 1a93934a..51d2ce1d 100644 --- a/packages/integration-tests/src/mdx-remark-images/index.test.ts +++ b/packages/integration-tests/src/mdx-remark-images/index.test.ts @@ -31,6 +31,7 @@ test('mdx - resolveCwd - contentDirPath', async () => { documentTypes: [Post], mdx: { resolveCwd: 'contentDirPath', + // @ts-ignore - remarkMdxImages has not been updated to the new unified js types remarkPlugins: [remarkMdxImages], esbuildOptions: (options) => { options.platform = 'node' @@ -77,6 +78,7 @@ test('mdx - resolveCwd - relative', async () => { documentTypes: [Post], mdx: { resolveCwd: 'relative', + // @ts-ignore - remarkMdxImages has not been updated to the new unified js types remarkPlugins: [remarkMdxImages], esbuildOptions: (options) => { options.platform = 'node' diff --git a/packages/next-contentlayer/package.json b/packages/next-contentlayer/package.json index a6fde837..063e45a1 100644 --- a/packages/next-contentlayer/package.json +++ b/packages/next-contentlayer/package.json @@ -1,6 +1,6 @@ { "name": "next-contentlayer-temp", - "version": "0.3.4", + "version": "0.4.1", "type": "module", "main": "./dist/index-cjs.cjs", "sideEffects": false, @@ -35,7 +35,7 @@ "./package.json" ], "scripts": { - "prepack": "sed '/^import\\|^export/d' dist/index-cjs.js > dist/index-cjs.cjs; cp src/hooks/jsx-runtime.cjs dist/hooks/jsx-runtime.cjs" + "prepack": "awk '!/^export|^import/' dist/index-cjs.js > dist/index-cjs.cjs; cp src/hooks/jsx-runtime.cjs dist/hooks/jsx-runtime.cjs" }, "dependencies": { "@contentlayer-temp/core": "workspace:*", @@ -64,4 +64,4 @@ "bug": { "url": "https://github.com/contentlayerdev/contentlayer/issues" } -} +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index bcaca8e5..8323d972 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1834,15 +1834,6 @@ __metadata: languageName: node linkType: hard -"@types/mdast@npm:^3.0.0": - version: 3.0.13 - resolution: "@types/mdast@npm:3.0.13" - dependencies: - "@types/unist": ^2 - checksum: f13fa17a2931ed1492a2f0012a3abd6de3a2d1128145981321909e03fedba80162668f284a4af92aca3732b27e933c5f4772336d96b9ae660bfde696d07abbe6 - languageName: node - linkType: hard - "@types/mdast@npm:^4.0.0": version: 4.0.1 resolution: "@types/mdast@npm:4.0.1" @@ -2003,7 +1994,7 @@ __metadata: languageName: node linkType: hard -"@types/unist@npm:^2, @types/unist@npm:^2.0.0": +"@types/unist@npm:^2.0.0": version: 2.0.8 resolution: "@types/unist@npm:2.0.8" checksum: f4852d10a6752dc70df363917ef74453e5d2fd42824c0f6d09d19d530618e1402193977b1207366af4415aaec81d4e262c64d00345402020c4ca179216e553c7 @@ -5511,7 +5502,7 @@ __metadata: dependencies: contentlayer-temp: "workspace:*" remark-gfm: ^4.0.0 - remark-mdx-images: ^2.0.0 + remark-mdx-images: ^3.0.0 typescript: ^5.1.6 vite: ^5.0.12 vitest: 1.2.2 @@ -5613,13 +5604,6 @@ __metadata: languageName: node linkType: hard -"is-buffer@npm:^2.0.0": - version: 2.0.5 - resolution: "is-buffer@npm:2.0.5" - checksum: 764c9ad8b523a9f5a32af29bdf772b08eb48c04d2ad0a7240916ac2688c983bf5f8504bf25b35e66240edeb9d9085461f9b5dae1f3d2861c6b06a65fe983de42 - languageName: node - linkType: hard - "is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7": version: 1.2.7 resolution: "is-callable@npm:1.2.7" @@ -8669,14 +8653,14 @@ __metadata: languageName: node linkType: hard -"remark-mdx-images@npm:^2.0.0": - version: 2.0.0 - resolution: "remark-mdx-images@npm:2.0.0" +"remark-mdx-images@npm:^3.0.0": + version: 3.0.0 + resolution: "remark-mdx-images@npm:3.0.0" dependencies: - "@types/mdast": ^3.0.0 - unified: ^10.0.0 - unist-util-visit: ^4.0.0 - checksum: d744b68ca3a6810e28e526b8b0a9fdbab8929a05ac71bc4be69a4e8dadb7c65f492cbaf5fff9fb3e45c7585c5e166b899d6265f637cef52d4b6ea37c056eebd4 + "@types/mdast": ^4.0.0 + unified: ^11.0.0 + unist-util-visit: ^5.0.0 + checksum: 774d912ab87d50eff6400aadfc10cb029adf2850356c66f75336bb6cd64f312cda2c67bf553e7cf5230d2708d4ce70bfc9af860f20cb0730bb9c0f74e6bcbeb2 languageName: node linkType: hard @@ -10223,21 +10207,6 @@ __metadata: languageName: node linkType: hard -"unified@npm:^10.0.0": - version: 10.1.2 - resolution: "unified@npm:10.1.2" - dependencies: - "@types/unist": ^2.0.0 - bail: ^2.0.0 - extend: ^3.0.0 - is-buffer: ^2.0.0 - is-plain-obj: ^4.0.0 - trough: ^2.0.0 - vfile: ^5.0.0 - checksum: 053e7c65ede644607f87bd625a299e4b709869d2f76ec8138569e6e886903b6988b21cd9699e471eda42bee189527be0a9dac05936f1d069a5e65d0125d5d756 - languageName: node - linkType: hard - "unified@npm:^11.0.0": version: 11.0.3 resolution: "unified@npm:11.0.3" @@ -10286,15 +10255,6 @@ __metadata: languageName: node linkType: hard -"unist-util-is@npm:^5.0.0": - version: 5.2.1 - resolution: "unist-util-is@npm:5.2.1" - dependencies: - "@types/unist": ^2.0.0 - checksum: ae76fdc3d35352cd92f1bedc3a0d407c3b9c42599a52ab9141fe89bdd786b51f0ec5a2ab68b93fb532e239457cae62f7e39eaa80229e1cb94875da2eafcbe5c4 - languageName: node - linkType: hard - "unist-util-is@npm:^6.0.0": version: 6.0.0 resolution: "unist-util-is@npm:6.0.0" @@ -10332,15 +10292,6 @@ __metadata: languageName: node linkType: hard -"unist-util-stringify-position@npm:^3.0.0": - version: 3.0.3 - resolution: "unist-util-stringify-position@npm:3.0.3" - dependencies: - "@types/unist": ^2.0.0 - checksum: dbd66c15183607ca942a2b1b7a9f6a5996f91c0d30cf8966fb88955a02349d9eefd3974e9010ee67e71175d784c5a9fea915b0aa0b0df99dcb921b95c4c9e124 - languageName: node - linkType: hard - "unist-util-stringify-position@npm:^4.0.0": version: 4.0.0 resolution: "unist-util-stringify-position@npm:4.0.0" @@ -10350,16 +10301,6 @@ __metadata: languageName: node linkType: hard -"unist-util-visit-parents@npm:^5.1.1": - version: 5.1.3 - resolution: "unist-util-visit-parents@npm:5.1.3" - dependencies: - "@types/unist": ^2.0.0 - unist-util-is: ^5.0.0 - checksum: 8ecada5978994f846b64658cf13b4092cd78dea39e1ba2f5090a5de842ba4852712c02351a8ae95250c64f864635e7b02aedf3b4a093552bb30cf1bd160efbaa - languageName: node - linkType: hard - "unist-util-visit-parents@npm:^6.0.0": version: 6.0.1 resolution: "unist-util-visit-parents@npm:6.0.1" @@ -10370,17 +10311,6 @@ __metadata: languageName: node linkType: hard -"unist-util-visit@npm:^4.0.0": - version: 4.1.2 - resolution: "unist-util-visit@npm:4.1.2" - dependencies: - "@types/unist": ^2.0.0 - unist-util-is: ^5.0.0 - unist-util-visit-parents: ^5.1.1 - checksum: 95a34e3f7b5b2d4b68fd722b6229972099eb97b6df18913eda44a5c11df8b1e27efe7206dd7b88c4ed244a48c474a5b2e2629ab79558ff9eb936840295549cee - languageName: node - linkType: hard - "unist-util-visit@npm:^5.0.0": version: 5.0.0 resolution: "unist-util-visit@npm:5.0.0" @@ -10479,16 +10409,6 @@ __metadata: languageName: node linkType: hard -"vfile-message@npm:^3.0.0": - version: 3.1.4 - resolution: "vfile-message@npm:3.1.4" - dependencies: - "@types/unist": ^2.0.0 - unist-util-stringify-position: ^3.0.0 - checksum: d0ee7da1973ad76513c274e7912adbed4d08d180eaa34e6bd40bc82459f4b7bc50fcaff41556135e3339995575eac5f6f709aba9332b80f775618ea4880a1367 - languageName: node - linkType: hard - "vfile-message@npm:^4.0.0": version: 4.0.2 resolution: "vfile-message@npm:4.0.2" @@ -10499,18 +10419,6 @@ __metadata: languageName: node linkType: hard -"vfile@npm:^5.0.0": - version: 5.3.7 - resolution: "vfile@npm:5.3.7" - dependencies: - "@types/unist": ^2.0.0 - is-buffer: ^2.0.0 - unist-util-stringify-position: ^3.0.0 - vfile-message: ^3.0.0 - checksum: 642cce703afc186dbe7cabf698dc954c70146e853491086f5da39e1ce850676fc96b169fcf7898aa3ff245e9313aeec40da93acd1e1fcc0c146dc4f6308b4ef9 - languageName: node - linkType: hard - "vfile@npm:^6.0.0, vfile@npm:^6.0.1": version: 6.0.1 resolution: "vfile@npm:6.0.1" From bcd88d122007f8ae9d50b698ddb069334c7eb9fa Mon Sep 17 00:00:00 2001 From: Timothy Lin Date: Sun, 4 Feb 2024 19:21:59 +0800 Subject: [PATCH 4/9] upgrade to memfs 4 --- packages/@contentlayer/utils/package.json | 2 +- .../@contentlayer/utils/src/fs-in-memory.ts | 2 +- yarn.lock | 1801 +++++++++-------- 3 files changed, 992 insertions(+), 813 deletions(-) diff --git a/packages/@contentlayer/utils/package.json b/packages/@contentlayer/utils/package.json index 141f22cf..fcebf686 100644 --- a/packages/@contentlayer/utils/package.json +++ b/packages/@contentlayer/utils/package.json @@ -72,7 +72,7 @@ "chokidar": "^3.5.3", "hash-wasm": "^4.11.0", "inflection": "^3.0.0", - "memfs": "^3.5.1", + "memfs": "^4.6.0", "oo-ascii-tree": "^1.94.0", "ts-pattern": "^5.0.6", "type-fest": "^4.10.0" diff --git a/packages/@contentlayer/utils/src/fs-in-memory.ts b/packages/@contentlayer/utils/src/fs-in-memory.ts index 916d6f9e..d5b2f27d 100644 --- a/packages/@contentlayer/utils/src/fs-in-memory.ts +++ b/packages/@contentlayer/utils/src/fs-in-memory.ts @@ -126,7 +126,7 @@ export const writeFileJson = ({ export const mkdirp = (dirPath: T): T.Effect => OT.withSpan('mkdirp', { attributes: { dirPath } })( T.tryCatch( - () => fs.mkdirpSync(dirPath), + () => fs.mkdirSync(dirPath, { recursive: true }), (error) => new MkdirError({ dirPath, error }), ), ) diff --git a/yarn.lock b/yarn.lock index 8323d972..a91d8369 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20,12 +20,12 @@ __metadata: linkType: hard "@babel/code-frame@npm:^7.0.0": - version: 7.22.13 - resolution: "@babel/code-frame@npm:7.22.13" + version: 7.23.5 + resolution: "@babel/code-frame@npm:7.23.5" dependencies: - "@babel/highlight": ^7.22.13 + "@babel/highlight": ^7.23.4 chalk: ^2.4.2 - checksum: 22e342c8077c8b77eeb11f554ecca2ba14153f707b85294fcf6070b6f6150aae88a7b7436dd88d8c9289970585f3fe5b9b941c5aa3aa26a6d5a8ef3f292da058 + checksum: d90981fdf56a2824a9b14d19a4c0e8db93633fd488c772624b4e83e0ceac6039a27cd298a247c3214faa952bf803ba23696172ae7e7235f3b97f43ba278c569a languageName: node linkType: hard @@ -36,27 +36,18 @@ __metadata: languageName: node linkType: hard -"@babel/highlight@npm:^7.22.13": - version: 7.22.20 - resolution: "@babel/highlight@npm:7.22.20" +"@babel/highlight@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/highlight@npm:7.23.4" dependencies: "@babel/helper-validator-identifier": ^7.22.20 chalk: ^2.4.2 js-tokens: ^4.0.0 - checksum: 84bd034dca309a5e680083cd827a766780ca63cef37308404f17653d32366ea76262bd2364b2d38776232f2d01b649f26721417d507e8b4b6da3e4e739f6d134 + checksum: 643acecdc235f87d925979a979b539a5d7d1f31ae7db8d89047269082694122d11aa85351304c9c978ceeb6d250591ccadb06c366f358ccee08bb9c122476b89 languageName: node linkType: hard -"@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.10.4, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.5.5": - version: 7.23.2 - resolution: "@babel/runtime@npm:7.23.2" - dependencies: - regenerator-runtime: ^0.14.0 - checksum: 6c4df4839ec75ca10175f636d6362f91df8a3137f86b38f6cd3a4c90668a0fe8e9281d320958f4fbd43b394988958585a17c3aab2a4ea6bf7316b22916a371fb - languageName: node - linkType: hard - -"@babel/runtime@npm:^7.23.2": +"@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.10.4, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.5.5": version: 7.23.9 resolution: "@babel/runtime@npm:7.23.9" dependencies: @@ -318,6 +309,13 @@ __metadata: languageName: node linkType: hard +"@contentful/rich-text-types@npm:^16.3.0": + version: 16.3.4 + resolution: "@contentful/rich-text-types@npm:16.3.4" + checksum: 16bd16d3089eefe7953cf3fa72b93765f3b769820ea25df291d5eedb0bf2ba50ba2443bfa39d65fedb351ee67e0acc3280e0622f3d8407ec5c496ef3591ca1dc + languageName: node + linkType: hard + "@contentlayer-temp/cli@workspace:*, @contentlayer-temp/cli@workspace:packages/@contentlayer/cli": version: 0.0.0-use.local resolution: "@contentlayer-temp/cli@workspace:packages/@contentlayer/cli" @@ -453,7 +451,7 @@ __metadata: chokidar: ^3.5.3 hash-wasm: ^4.11.0 inflection: ^3.0.0 - memfs: ^3.5.1 + memfs: ^4.6.0 oo-ascii-tree: ^1.94.0 ts-pattern: ^5.0.6 type-fest: ^4.10.0 @@ -541,6 +539,15 @@ __metadata: languageName: node linkType: hard +"@emnapi/runtime@npm:^0.45.0": + version: 0.45.0 + resolution: "@emnapi/runtime@npm:0.45.0" + dependencies: + tslib: ^2.4.0 + checksum: 59c81a4edc68c959b2f891eb310b063c87e69ef18eb77563bfd59b0086b27c7581b8e40edbf590e3fd3af437ace98d06e81b7a8613e8317c619e479831540b93 + languageName: node + linkType: hard + "@esbuild-plugins/node-resolve@npm:^0.2.2": version: 0.2.2 resolution: "@esbuild-plugins/node-resolve@npm:0.2.2" @@ -721,15 +728,15 @@ __metadata: linkType: hard "@eslint-community/regexpp@npm:^4.4.0, @eslint-community/regexpp@npm:^4.6.1": - version: 4.9.1 - resolution: "@eslint-community/regexpp@npm:4.9.1" - checksum: 06fb839e9c756f6375cc545c2f2e05a0a64576bd6370e8e3c07983fd29a3d6e164ef4aa48a361f7d27e6713ab79c83053ff6a2ccb78748bc955e344279c4a3b6 + version: 4.10.0 + resolution: "@eslint-community/regexpp@npm:4.10.0" + checksum: 2a6e345429ea8382aaaf3a61f865cae16ed44d31ca917910033c02dc00d505d939f10b81e079fa14d43b51499c640138e153b7e40743c4c094d9df97d4e56f7b languageName: node linkType: hard -"@eslint/eslintrc@npm:^2.1.2": - version: 2.1.2 - resolution: "@eslint/eslintrc@npm:2.1.2" +"@eslint/eslintrc@npm:^2.1.4": + version: 2.1.4 + resolution: "@eslint/eslintrc@npm:2.1.4" dependencies: ajv: ^6.12.4 debug: ^4.3.2 @@ -740,21 +747,21 @@ __metadata: js-yaml: ^4.1.0 minimatch: ^3.1.2 strip-json-comments: ^3.1.1 - checksum: bc742a1e3b361f06fedb4afb6bf32cbd27171292ef7924f61c62f2aed73048367bcc7ac68f98c06d4245cd3fabc43270f844e3c1699936d4734b3ac5398814a7 + checksum: 10957c7592b20ca0089262d8c2a8accbad14b4f6507e35416c32ee6b4dbf9cad67dfb77096bbd405405e9ada2b107f3797fe94362e1c55e0b09d6e90dd149127 languageName: node linkType: hard -"@eslint/js@npm:8.51.0": - version: 8.51.0 - resolution: "@eslint/js@npm:8.51.0" - checksum: 0228bf1e1e0414843e56d9ff362a2a72d579c078f93174666f29315690e9e30a8633ad72c923297f7fd7182381b5a476805ff04dac8debe638953eb1ded3ac73 +"@eslint/js@npm:8.56.0": + version: 8.56.0 + resolution: "@eslint/js@npm:8.56.0" + checksum: 5804130574ef810207bdf321c265437814e7a26f4e6fac9b496de3206afd52f533e09ec002a3be06cd9adcc9da63e727f1883938e663c4e4751c007d5b58e539 languageName: node linkType: hard "@faker-js/faker@npm:^8.0.2": - version: 8.2.0 - resolution: "@faker-js/faker@npm:8.2.0" - checksum: febc17018acfb841a348591bfe415e815ea981bf7fa0a12670ac2b449479ad7e9e7b130c42878ec30210da964c13a620a3303dc00d63cb13ded00c6fc701e2be + version: 8.4.0 + resolution: "@faker-js/faker@npm:8.4.0" + checksum: 682581f0b009b7e8b81bc0736a3f1df2fb5179706786b87ef5bed5e2e28e22dfeba10e5122942371f12d68e833be3b3726850f96940baf080500cef35a77403b languageName: node linkType: hard @@ -766,12 +773,12 @@ __metadata: linkType: hard "@grpc/grpc-js@npm:^1.7.1": - version: 1.9.5 - resolution: "@grpc/grpc-js@npm:1.9.5" + version: 1.9.14 + resolution: "@grpc/grpc-js@npm:1.9.14" dependencies: "@grpc/proto-loader": ^0.7.8 "@types/node": ">=12.12.47" - checksum: 06834554a0935906652b4b9c5c71f08dd9bdcd4a00d65465c569eae770a9856ecabf7711290bf6d935a8127779c1f35d9cc8cf029693493da02864a330c78e25 + checksum: 1e0821876fc55fa1d71a674e65db6227ca398f6ff77735bd44d8d4a554fa97dcddd06e7844c3d7da37350feafd824ec88af04f0ab0e0c2e0bc8f753939935240 languageName: node linkType: hard @@ -789,21 +796,21 @@ __metadata: languageName: node linkType: hard -"@hapi/hoek@npm:^10.0.1": - version: 10.0.1 - resolution: "@hapi/hoek@npm:10.0.1" - checksum: 6dbcd7ae138fc751b2d81169516668bc6e4b878bb2bfdfab5eb3d51fdfd361544cc791ff12375587bf71dbeb801810cd62105f5d744dfa457140fb1709bbea6f +"@hapi/hoek@npm:^11.0.4": + version: 11.0.4 + resolution: "@hapi/hoek@npm:11.0.4" + checksum: 67dc9782a8235e066e3885352e40faa3c239621d7de29bfc88a72aba60eeb8df76b5c05d77962c734c8b0ef3fc7f818cc692689003d270a1b73ea98ba1508c5b languageName: node linkType: hard -"@hapi/hoek@npm:^9.0.0": +"@hapi/hoek@npm:^9.0.0, @hapi/hoek@npm:^9.3.0": version: 9.3.0 resolution: "@hapi/hoek@npm:9.3.0" checksum: 4771c7a776242c3c022b168046af4e324d116a9d2e1d60631ee64f474c6e38d1bb07092d898bf95c7bc5d334c5582798a1456321b2e53ca817d4e7c88bc25b43 languageName: node linkType: hard -"@hapi/topo@npm:^5.0.0": +"@hapi/topo@npm:^5.1.0": version: 5.1.0 resolution: "@hapi/topo@npm:5.1.0" dependencies: @@ -812,14 +819,14 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/config-array@npm:^0.11.11": - version: 0.11.11 - resolution: "@humanwhocodes/config-array@npm:0.11.11" +"@humanwhocodes/config-array@npm:^0.11.13": + version: 0.11.14 + resolution: "@humanwhocodes/config-array@npm:0.11.14" dependencies: - "@humanwhocodes/object-schema": ^1.2.1 - debug: ^4.1.1 + "@humanwhocodes/object-schema": ^2.0.2 + debug: ^4.3.1 minimatch: ^3.0.5 - checksum: db84507375ab77b8ffdd24f498a5b49ad6b64391d30dd2ac56885501d03964d29637e05b1ed5aefa09d57ac667e28028bc22d2da872bfcd619652fbdb5f4ca19 + checksum: 861ccce9eaea5de19546653bccf75bf09fe878bc39c3aab00aeee2d2a0e654516adad38dd1098aab5e3af0145bbcbf3f309bdf4d964f8dab9dcd5834ae4c02f2 languageName: node linkType: hard @@ -830,10 +837,10 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/object-schema@npm:^1.2.1": - version: 1.2.1 - resolution: "@humanwhocodes/object-schema@npm:1.2.1" - checksum: a824a1ec31591231e4bad5787641f59e9633827d0a2eaae131a288d33c9ef0290bd16fda8da6f7c0fcb014147865d12118df10db57f27f41e20da92369fcb3f1 +"@humanwhocodes/object-schema@npm:^2.0.2": + version: 2.0.2 + resolution: "@humanwhocodes/object-schema@npm:2.0.2" + checksum: 2fc11503361b5fb4f14714c700c02a3f4c7c93e9acd6b87a29f62c522d90470f364d6161b03d1cc618b979f2ae02aed1106fd29d302695d8927e2fc8165ba8ee languageName: node linkType: hard @@ -844,6 +851,181 @@ __metadata: languageName: node linkType: hard +"@img/sharp-darwin-arm64@npm:0.33.2": + version: 0.33.2 + resolution: "@img/sharp-darwin-arm64@npm:0.33.2" + dependencies: + "@img/sharp-libvips-darwin-arm64": 1.0.1 + dependenciesMeta: + "@img/sharp-libvips-darwin-arm64": + optional: true + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@img/sharp-darwin-x64@npm:0.33.2": + version: 0.33.2 + resolution: "@img/sharp-darwin-x64@npm:0.33.2" + dependencies: + "@img/sharp-libvips-darwin-x64": 1.0.1 + dependenciesMeta: + "@img/sharp-libvips-darwin-x64": + optional: true + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@img/sharp-libvips-darwin-arm64@npm:1.0.1": + version: 1.0.1 + resolution: "@img/sharp-libvips-darwin-arm64@npm:1.0.1" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@img/sharp-libvips-darwin-x64@npm:1.0.1": + version: 1.0.1 + resolution: "@img/sharp-libvips-darwin-x64@npm:1.0.1" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@img/sharp-libvips-linux-arm64@npm:1.0.1": + version: 1.0.1 + resolution: "@img/sharp-libvips-linux-arm64@npm:1.0.1" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@img/sharp-libvips-linux-arm@npm:1.0.1": + version: 1.0.1 + resolution: "@img/sharp-libvips-linux-arm@npm:1.0.1" + conditions: os=linux & cpu=arm & libc=glibc + languageName: node + linkType: hard + +"@img/sharp-libvips-linux-s390x@npm:1.0.1": + version: 1.0.1 + resolution: "@img/sharp-libvips-linux-s390x@npm:1.0.1" + conditions: os=linux & cpu=s390x & libc=glibc + languageName: node + linkType: hard + +"@img/sharp-libvips-linux-x64@npm:1.0.1": + version: 1.0.1 + resolution: "@img/sharp-libvips-linux-x64@npm:1.0.1" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@img/sharp-libvips-linuxmusl-arm64@npm:1.0.1": + version: 1.0.1 + resolution: "@img/sharp-libvips-linuxmusl-arm64@npm:1.0.1" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@img/sharp-libvips-linuxmusl-x64@npm:1.0.1": + version: 1.0.1 + resolution: "@img/sharp-libvips-linuxmusl-x64@npm:1.0.1" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@img/sharp-linux-arm64@npm:0.33.2": + version: 0.33.2 + resolution: "@img/sharp-linux-arm64@npm:0.33.2" + dependencies: + "@img/sharp-libvips-linux-arm64": 1.0.1 + dependenciesMeta: + "@img/sharp-libvips-linux-arm64": + optional: true + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@img/sharp-linux-arm@npm:0.33.2": + version: 0.33.2 + resolution: "@img/sharp-linux-arm@npm:0.33.2" + dependencies: + "@img/sharp-libvips-linux-arm": 1.0.1 + dependenciesMeta: + "@img/sharp-libvips-linux-arm": + optional: true + conditions: os=linux & cpu=arm & libc=glibc + languageName: node + linkType: hard + +"@img/sharp-linux-s390x@npm:0.33.2": + version: 0.33.2 + resolution: "@img/sharp-linux-s390x@npm:0.33.2" + dependencies: + "@img/sharp-libvips-linux-s390x": 1.0.1 + dependenciesMeta: + "@img/sharp-libvips-linux-s390x": + optional: true + conditions: os=linux & cpu=s390x & libc=glibc + languageName: node + linkType: hard + +"@img/sharp-linux-x64@npm:0.33.2": + version: 0.33.2 + resolution: "@img/sharp-linux-x64@npm:0.33.2" + dependencies: + "@img/sharp-libvips-linux-x64": 1.0.1 + dependenciesMeta: + "@img/sharp-libvips-linux-x64": + optional: true + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@img/sharp-linuxmusl-arm64@npm:0.33.2": + version: 0.33.2 + resolution: "@img/sharp-linuxmusl-arm64@npm:0.33.2" + dependencies: + "@img/sharp-libvips-linuxmusl-arm64": 1.0.1 + dependenciesMeta: + "@img/sharp-libvips-linuxmusl-arm64": + optional: true + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@img/sharp-linuxmusl-x64@npm:0.33.2": + version: 0.33.2 + resolution: "@img/sharp-linuxmusl-x64@npm:0.33.2" + dependencies: + "@img/sharp-libvips-linuxmusl-x64": 1.0.1 + dependenciesMeta: + "@img/sharp-libvips-linuxmusl-x64": + optional: true + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@img/sharp-wasm32@npm:0.33.2": + version: 0.33.2 + resolution: "@img/sharp-wasm32@npm:0.33.2" + dependencies: + "@emnapi/runtime": ^0.45.0 + conditions: cpu=wasm32 + languageName: node + linkType: hard + +"@img/sharp-win32-ia32@npm:0.33.2": + version: 0.33.2 + resolution: "@img/sharp-win32-ia32@npm:0.33.2" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"@img/sharp-win32-x64@npm:0.33.2": + version: 0.33.2 + resolution: "@img/sharp-win32-x64@npm:0.33.2" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@isaacs/cliui@npm:^8.0.2": version: 8.0.2 resolution: "@isaacs/cliui@npm:8.0.2" @@ -919,13 +1101,13 @@ __metadata: languageName: node linkType: hard -"@jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9": - version: 0.3.19 - resolution: "@jridgewell/trace-mapping@npm:0.3.19" +"@jridgewell/trace-mapping@npm:^0.3.20, @jridgewell/trace-mapping@npm:^0.3.9": + version: 0.3.22 + resolution: "@jridgewell/trace-mapping@npm:0.3.22" dependencies: "@jridgewell/resolve-uri": ^3.1.0 "@jridgewell/sourcemap-codec": ^1.4.14 - checksum: 956a6f0f6fec060fb48c6bf1f5ec2064e13cd38c8be3873877d4b92b4a27ba58289a34071752671262a3e3c202abcc3fa2aac64d8447b4b0fa1ba3c9047f1c20 + checksum: ac7dd2cfe0b479aa1b81776d40d789243131cc792dc8b6b6a028c70fcd6171958ae1a71bf67b618ffe3c0c3feead9870c095ee46a5e30319410d92976b28f498 languageName: node linkType: hard @@ -1107,6 +1289,19 @@ __metadata: languageName: node linkType: hard +"@npmcli/agent@npm:^2.0.0": + version: 2.2.0 + resolution: "@npmcli/agent@npm:2.2.0" + dependencies: + agent-base: ^7.1.0 + http-proxy-agent: ^7.0.0 + https-proxy-agent: ^7.0.1 + lru-cache: ^10.0.1 + socks-proxy-agent: ^8.0.1 + checksum: 3b25312edbdfaa4089af28e2d423b6f19838b945e47765b0c8174c1395c79d43c3ad6d23cb364b43f59fd3acb02c93e3b493f72ddbe3dfea04c86843a7311fc4 + languageName: node + linkType: hard + "@npmcli/fs@npm:^3.1.0": version: 3.1.0 resolution: "@npmcli/fs@npm:3.1.0" @@ -1256,14 +1451,7 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/api@npm:^1.0.0": - version: 1.6.0 - resolution: "@opentelemetry/api@npm:1.6.0" - checksum: 3283b78b62a39f6568eaa050ac7045fcca747679e255874f6d2107cb8e1a3b2e10bfbf553c3e82a72500fb5fdca49dc07a5fe27fd6980debac24506cca638859 - languageName: node - linkType: hard - -"@opentelemetry/api@npm:^1.7.0": +"@opentelemetry/api@npm:^1.0.0, @opentelemetry/api@npm:^1.7.0": version: 1.7.0 resolution: "@opentelemetry/api@npm:1.7.0" checksum: 2398cbe65f199c3a7050125b3ad9c835f789bb0a616665e9c7f4475a29ac8334b6a3c15f38db48d345b522180c41c00b04cc174cd0eeffba98eb4874a565fa7e @@ -1614,12 +1802,12 @@ __metadata: languageName: node linkType: hard -"@sideway/address@npm:^4.1.3": - version: 4.1.4 - resolution: "@sideway/address@npm:4.1.4" +"@sideway/address@npm:^4.1.5": + version: 4.1.5 + resolution: "@sideway/address@npm:4.1.5" dependencies: "@hapi/hoek": ^9.0.0 - checksum: b9fca2a93ac2c975ba12e0a6d97853832fb1f4fb02393015e012b47fa916a75ca95102d77214b2a29a2784740df2407951af8c5dde054824c65577fd293c4cdb + checksum: 3e3ea0f00b4765d86509282290368a4a5fd39a7995fdc6de42116ca19a96120858e56c2c995081def06e1c53e1f8bccc7d013f6326602bec9d56b72ee2772b9d languageName: node linkType: hard @@ -1694,13 +1882,6 @@ __metadata: languageName: node linkType: hard -"@tootallnate/once@npm:2": - version: 2.0.0 - resolution: "@tootallnate/once@npm:2.0.0" - checksum: ad87447820dd3f24825d2d947ebc03072b20a42bfc96cbafec16bff8bbda6c1a81fcb0be56d5b21968560c5359a0af4038a68ba150c3e1694fe4c109a063bed8 - languageName: node - linkType: hard - "@tsconfig/node10@npm:^1.0.7": version: 1.0.9 resolution: "@tsconfig/node10@npm:1.0.9" @@ -1739,58 +1920,51 @@ __metadata: linkType: hard "@types/braces@npm:*": - version: 3.0.2 - resolution: "@types/braces@npm:3.0.2" - checksum: 0b1bee5e8332fabf57397de8dec1a24c3bf53efc3284d15d64d7dd67c0ba9853e0191e5220464ff171a4963c1db2b0cfd3926e2b363a95909ff723a4426a1964 + version: 3.0.4 + resolution: "@types/braces@npm:3.0.4" + checksum: 7324497b6cc34c963c44d3f8516c67a83b749ab4f18defd9418b231b071af7ee8f0a0f345a52b204e867de80f684cabb21158512e1eaecbcebbabed1d1e357a3 languageName: node linkType: hard "@types/debug@npm:^4.0.0": - version: 4.1.9 - resolution: "@types/debug@npm:4.1.9" + version: 4.1.12 + resolution: "@types/debug@npm:4.1.12" dependencies: "@types/ms": "*" - checksum: e88ee8b19d106f33eb0d3bc58bacff9702e98d821fd1ebd1de8942e6b97419e19a1ccf39370f1764a1dc66f79fd4619f3412e1be6eeb9f0b76412f5ffe4ead93 + checksum: 47876a852de8240bfdaf7481357af2b88cb660d30c72e73789abf00c499d6bc7cd5e52f41c915d1b9cd8ec9fef5b05688d7b7aef17f7f272c2d04679508d1053 languageName: node linkType: hard "@types/eslint-scope@npm:^3.7.3": - version: 3.7.5 - resolution: "@types/eslint-scope@npm:3.7.5" + version: 3.7.7 + resolution: "@types/eslint-scope@npm:3.7.7" dependencies: "@types/eslint": "*" "@types/estree": "*" - checksum: e91ce335c3791c2cf6084caa0073f90d5b7ae3fcf27785ade8422b7d896159fa14a5a3f1efd31ef03e9ebc1ff04983288280dfe8c9a5579a958539f59df8cc9f + checksum: e2889a124aaab0b89af1bab5959847c5bec09809209255de0e63b9f54c629a94781daa04adb66bffcdd742f5e25a17614fb933965093c0eea64aacda4309380e languageName: node linkType: hard "@types/eslint@npm:*": - version: 8.44.4 - resolution: "@types/eslint@npm:8.44.4" + version: 8.56.2 + resolution: "@types/eslint@npm:8.56.2" dependencies: "@types/estree": "*" "@types/json-schema": "*" - checksum: 15bafdaba800e2995f38d3a2a929d8e9303035315e8d3535523a21cd719b6769a45884afa955f0b845ffa545a4150429b0178e2c44feeedf59ebb285eeae9825 + checksum: 38e054971596f5c0413f66a62dc26b10e0a21ac46ceacb06fbf8cfb838d20820787209b17218b3916e4c23d990ff77cfdb482d655cac0e0d2b837d430fcc5db8 languageName: node linkType: hard "@types/estree-jsx@npm:^1.0.0": - version: 1.0.1 - resolution: "@types/estree-jsx@npm:1.0.1" + version: 1.0.4 + resolution: "@types/estree-jsx@npm:1.0.4" dependencies: "@types/estree": "*" - checksum: c2eb9fd8868df238ae11b91f47644261ce017295a1cddaeb0bad50dc13efa9913c164b8717d458ec40f47835c98ee142755cde155d1ec24b446da78f81da73ac + checksum: fb97b3226814e833689304759d8bac29d869ca4cfcfa36f2f3877fb9819f218a11396a28963607e1d0cc72363c3803bfe9a8b16a42924819824e63d10ec386db languageName: node linkType: hard -"@types/estree@npm:*, @types/estree@npm:^1.0.0": - version: 1.0.2 - resolution: "@types/estree@npm:1.0.2" - checksum: aeedb1b2fe20cbe06f44b99b562bf9703e360bfcdf5bb3d61d248182ee1dd63500f2474e12f098ffe1f5ac3202b43b3e18ec99902d9328d5374f5512fa077e45 - languageName: node - linkType: hard - -"@types/estree@npm:1.0.5": +"@types/estree@npm:*, @types/estree@npm:1.0.5, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.5": version: 1.0.5 resolution: "@types/estree@npm:1.0.5" checksum: dd8b5bed28e6213b7acd0fb665a84e693554d850b0df423ac8076cc3ad5823a6bc26b0251d080bdc545af83179ede51dd3f6fa78cad2c46ed1f29624ddf3e41a @@ -1798,18 +1972,18 @@ __metadata: linkType: hard "@types/hast@npm:^3.0.0": - version: 3.0.1 - resolution: "@types/hast@npm:3.0.1" + version: 3.0.4 + resolution: "@types/hast@npm:3.0.4" dependencies: "@types/unist": "*" - checksum: b7ae475436575273dcc7e6d724f50e7fae86ba42f11fabf74243ac3db37379974fe017582a92ef2e00028cc6299690c6fdd8e15823ac9e68ee745c6258efa1f0 + checksum: 7a973e8d16fcdf3936090fa2280f408fb2b6a4f13b42edeb5fbd614efe042b82eac68e298e556d50f6b4ad585a3a93c353e9c826feccdc77af59de8dd400d044 languageName: node linkType: hard "@types/inflection@npm:^1.13.0": - version: 1.13.0 - resolution: "@types/inflection@npm:1.13.0" - checksum: 0c7cb5b31d0b9418db5c391af07c1d9bfc56daa3a7d6b7c4697e5ea59f24933e19fbcbd8eb921053c0d8db9146b26e166e8f21feed1d5ae020cc3308c10587e2 + version: 1.13.2 + resolution: "@types/inflection@npm:1.13.2" + checksum: 1f9e4c4f4401edcec30a799e46031534a8af720727f14e425bb8a5edbd1b00129ed25bfbb7555392a385cd6922e442826ef036af990167419e49eff46019e213 languageName: node linkType: hard @@ -1821,9 +1995,9 @@ __metadata: linkType: hard "@types/json-schema@npm:*, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": - version: 7.0.13 - resolution: "@types/json-schema@npm:7.0.13" - checksum: 345df21a678fa72fb389f35f33de77833d09d4a142bb2bcb27c18690efa4cf70fc2876e43843cefb3fbdb9fcb12cd3e970a90936df30f53bbee899865ff605ab + version: 7.0.15 + resolution: "@types/json-schema@npm:7.0.15" + checksum: 97ed0cb44d4070aecea772b7b2e2ed971e10c81ec87dd4ecc160322ffa55ff330dace1793489540e3e318d90942064bb697cc0f8989391797792d919737b3b98 languageName: node linkType: hard @@ -1835,50 +2009,50 @@ __metadata: linkType: hard "@types/mdast@npm:^4.0.0": - version: 4.0.1 - resolution: "@types/mdast@npm:4.0.1" + version: 4.0.3 + resolution: "@types/mdast@npm:4.0.3" dependencies: "@types/unist": "*" - checksum: 3d8fe54a6fb747376c4cc2f05c319730a5737b77844d8ea58d2d696417fa933cd270c20e197f531fc1b4be5e340dc416129f8b4f5fa2f0d2d0cf51850928340a + checksum: 345c5a22fccf05f35239ea6313ee4aaf6ebed5927c03ac79744abccb69b9ba5e692f9b771e36a012b79e17429082cada30f579e9c43b8a54e0ffb365431498b6 languageName: node linkType: hard "@types/mdx@npm:^2.0.0": - version: 2.0.8 - resolution: "@types/mdx@npm:2.0.8" - checksum: 4a7c2241c37e87aaab044c561f24874fabcd5cd2d6feb28dc665e2c80562afa7ddf94391a3b8ab3f76041199c8bafcff9131acf6d060f1aca45d763b171bbc29 + version: 2.0.11 + resolution: "@types/mdx@npm:2.0.11" + checksum: 4199e8d58f0a40be908fe8148959a4e9779f94339f83327495dd5a6609fc82cd5f6ff7391bf6077d7d2ca73cedec3557a51cac5044f0d6f2ae37e40019813dfe languageName: node linkType: hard "@types/micromatch@npm:^4.0.2": - version: 4.0.3 - resolution: "@types/micromatch@npm:4.0.3" + version: 4.0.6 + resolution: "@types/micromatch@npm:4.0.6" dependencies: "@types/braces": "*" - checksum: 61ad692f9808beb3787a8a74f657c726b92a010ea1b3ce46a0f7dad81951adea24340eaa1eae72f6b05a1e5643ef04423c000560db2478b8781b0ac217bee1d0 + checksum: 70e2b7d2ef5d65d9df255d8a9a35c4e9f7b455513df9c886a5660956fb7d083e415d35f0bc1778d49328d2dd182242917889fe8b29d561cd50f298e526fddfed languageName: node linkType: hard "@types/minimist@npm:^1.2.0": - version: 1.2.3 - resolution: "@types/minimist@npm:1.2.3" - checksum: 666ea4f8c39dcbdfbc3171fe6b3902157c845cc9cb8cee33c10deb706cda5e0cc80f98ace2d6d29f6774b0dc21180c96cd73c592a1cbefe04777247c7ba0e84b + version: 1.2.5 + resolution: "@types/minimist@npm:1.2.5" + checksum: 477047b606005058ab0263c4f58097136268007f320003c348794f74adedc3166ffc47c80ec3e94687787f2ab7f4e72c468223946e79892cf0fd9e25e9970a90 languageName: node linkType: hard "@types/ms@npm:*": - version: 0.7.32 - resolution: "@types/ms@npm:0.7.32" - checksum: 610744605c5924aa2657c8a62d307052af4f0e38e2aa015f154ef03391fabb4fd903f9c9baacb41f6e5798b8697e898463c351e5faf638738603ed29137b5254 + version: 0.7.34 + resolution: "@types/ms@npm:0.7.34" + checksum: f38d36e7b6edecd9badc9cf50474159e9da5fa6965a75186cceaf883278611b9df6669dc3a3cc122b7938d317b68a9e3d573d316fcb35d1be47ec9e468c6bd8a languageName: node linkType: hard "@types/node@npm:*, @types/node@npm:>=12.12.47, @types/node@npm:>=13.7.0, @types/node@npm:^20.3.2": - version: 20.8.6 - resolution: "@types/node@npm:20.8.6" + version: 20.11.16 + resolution: "@types/node@npm:20.11.16" dependencies: - undici-types: ~5.25.1 - checksum: ccfb7ac482c5a96edeb239893c5c099f5257fcc2ed9ae62fefdfbc782b79e16dbc2af9a85b379665237bf759904b44ca2be68e75d239e0297882aad42f61905c + undici-types: ~5.26.4 + checksum: 51f0831c1219bf4698e7430aeb9892237bd851deeb25ce23c5bb0ceefcc77c3b114e48f4e98d9fc26def5a87ba9d8079f0281dd37bee691140a93f133812c152 languageName: node linkType: hard @@ -1890,9 +2064,9 @@ __metadata: linkType: hard "@types/normalize-package-data@npm:^2.4.0": - version: 2.4.2 - resolution: "@types/normalize-package-data@npm:2.4.2" - checksum: 2132e4054711e6118de967ae3a34f8c564e58d71fbcab678ec2c34c14659f638a86c35a0fd45237ea35a4a03079cf0a485e3f97736ffba5ed647bfb5da086b03 + version: 2.4.4 + resolution: "@types/normalize-package-data@npm:2.4.4" + checksum: 65dff72b543997b7be8b0265eca7ace0e34b75c3e5fee31de11179d08fa7124a7a5587265d53d0409532ecb7f7fba662c2012807963e1f9b059653ec2c83ee05 languageName: node linkType: hard @@ -1904,29 +2078,29 @@ __metadata: linkType: hard "@types/prop-types@npm:*": - version: 15.7.8 - resolution: "@types/prop-types@npm:15.7.8" - checksum: 61dfad79da8b1081c450bab83b77935df487ae1cdd4660ec7df6be8e74725c15fa45cf486ce057addc956ca4ae78300b97091e2a25061133d1b9a1440bc896ae + version: 15.7.11 + resolution: "@types/prop-types@npm:15.7.11" + checksum: 7519ff11d06fbf6b275029fe03fff9ec377b4cb6e864cac34d87d7146c7f5a7560fd164bdc1d2dbe00b60c43713631251af1fd3d34d46c69cd354602bc0c7c54 languageName: node linkType: hard "@types/react-dom@npm:^18.2.6": - version: 18.2.13 - resolution: "@types/react-dom@npm:18.2.13" + version: 18.2.18 + resolution: "@types/react-dom@npm:18.2.18" dependencies: "@types/react": "*" - checksum: 22ba066b141dca5a5a9227fae0afc7c94b470fff8e8a38ade72649da57a8ea04d0cb2ba3e22005e7d8e772d49bddd28855b1dd98e6defd033bba6afb6edff883 + checksum: 8e3da404c980e2b2a76da3852f812ea6d8b9d0e7f5923fbaf3bfbbbfa1d59116ff91c129de8f68e9b7668a67ae34484fe9df74d5a7518cf8591ec07a0c4dad57 languageName: node linkType: hard "@types/react@npm:*, @types/react@npm:^18.2.14": - version: 18.2.28 - resolution: "@types/react@npm:18.2.28" + version: 18.2.52 + resolution: "@types/react@npm:18.2.52" dependencies: "@types/prop-types": "*" "@types/scheduler": "*" csstype: ^3.0.2 - checksum: 81381bedeba83278f4c9febb0b83e0bd3f42a25897a50b9cb36ef53651d34b3d50f87ebf11211ea57ea575131f85d31e93e496ce46478a00b0f9bf7b26b5917a + checksum: 4abc9bd63879e57c3df43a9cacff54c079e21b61ef934d33801e0177c26f582aa7d1d88a0769a740a4fd273168e3b150ff61de23e0fa85d1070e82ddce2b7fd2 languageName: node linkType: hard @@ -1942,30 +2116,30 @@ __metadata: linkType: hard "@types/resolve@npm:^1.17.1": - version: 1.20.3 - resolution: "@types/resolve@npm:1.20.3" - checksum: 1d5b7fb852505bfc8e4671ce0ffc8573d7b0aa1acfca1f009f1ed879268301e68b8cc06dc6e065dc0c07e9f87699a01a0e972c8b4105b6ffcae236f7d7f91870 + version: 1.20.6 + resolution: "@types/resolve@npm:1.20.6" + checksum: dc35f5517606b6687cd971c0281ac58bdee2c50c051b030f04647d3991688be2259c304ee97e5b5d4b9936072c36767eb5933b54611a407d6557972bb6fea4f6 languageName: node linkType: hard "@types/scheduler@npm:*": - version: 0.16.4 - resolution: "@types/scheduler@npm:0.16.4" - checksum: a57b0f10da1b021e6bd5eeef8a1917dd3b08a8715bd8029e2ded2096d8f091bb1bb1fef2d66e139588a983c4bfbad29b59e48011141725fa83c76e986e1257d7 + version: 0.16.8 + resolution: "@types/scheduler@npm:0.16.8" + checksum: 6c091b096daa490093bf30dd7947cd28e5b2cd612ec93448432b33f724b162587fed9309a0acc104d97b69b1d49a0f3fc755a62282054d62975d53d7fd13472d languageName: node linkType: hard "@types/semver@npm:^6.0.0": - version: 6.2.4 - resolution: "@types/semver@npm:6.2.4" - checksum: ac368f1ec98cfddc9a3b2418d01599895c778a8193dc60f1f0961b9591439af2cf4f9807808749b96785bbe791d96eb5ed6592cc7e293226025f486075c1c171 + version: 6.2.7 + resolution: "@types/semver@npm:6.2.7" + checksum: 341e701d9bf07a9f26ddbf15f9c9ec4243f4e2d3f59d4b9a4d551999eea28bd4f81a37160505044c2a6292fa50226a8df493e06f44f966b0a881fbb0b1725ea0 languageName: node linkType: hard "@types/semver@npm:^7.3.12": - version: 7.5.3 - resolution: "@types/semver@npm:7.5.3" - checksum: 349fdd1ab6c213bac5c991bac766bd07b8b12e63762462bb058740dcd2eb09c8193d068bb226f134661275f2022976214c0e727a4e5eb83ec1b131127c980d3e + version: 7.5.6 + resolution: "@types/semver@npm:7.5.6" + checksum: 563a0120ec0efcc326567db2ed920d5d98346f3638b6324ea6b50222b96f02a8add3c51a916b6897b51523aad8ac227d21d3dcf8913559f1bfc6c15b14d23037 languageName: node linkType: hard @@ -1979,25 +2153,25 @@ __metadata: linkType: hard "@types/source-map-support@npm:^0.5.6": - version: 0.5.8 - resolution: "@types/source-map-support@npm:0.5.8" + version: 0.5.10 + resolution: "@types/source-map-support@npm:0.5.10" dependencies: source-map: ^0.6.0 - checksum: 333d77b70fd793de066572aa1c7d988ac351e6591b860db8df05bdb2ad40ee2aa1a31d66c3c0d019137d72fb7b806dfc55c2b47958d1599e775e1d37dc1f736d + checksum: ef287caea52a41b600a128d36cf961f048913e30fe143f7d882d19014635d0ca89e27013a48b0e6353ca277689d633c2ef65a25b2f8cd6d82916a2f908f18c38 languageName: node linkType: hard "@types/unist@npm:*, @types/unist@npm:^3.0.0": - version: 3.0.0 - resolution: "@types/unist@npm:3.0.0" - checksum: e9d21a8fb5e332be0acef29192d82632875b2ef3e700f1bc64fdfc1520189542de85c3d4f3bcfbc2f4afdb210f4c23f68061f3fbf10744e920d4f18430d19f49 + version: 3.0.2 + resolution: "@types/unist@npm:3.0.2" + checksum: 3d04d0be69316e5f14599a0d993a208606c12818cf631fd399243d1dc7a9bd8a3917d6066baa6abc290814afbd744621484756803c80cba892c39cd4b4a85616 languageName: node linkType: hard "@types/unist@npm:^2.0.0": - version: 2.0.8 - resolution: "@types/unist@npm:2.0.8" - checksum: f4852d10a6752dc70df363917ef74453e5d2fd42824c0f6d09d19d530618e1402193977b1207366af4415aaec81d4e262c64d00345402020c4ca179216e553c7 + version: 2.0.10 + resolution: "@types/unist@npm:2.0.10" + checksum: e2924e18dedf45f68a5c6ccd6015cd62f1643b1b43baac1854efa21ae9e70505db94290434a23da1137d9e31eb58e54ca175982005698ac37300a1c889f6c4aa languageName: node linkType: hard @@ -2131,7 +2305,7 @@ __metadata: languageName: node linkType: hard -"@ungap/structured-clone@npm:^1.0.0": +"@ungap/structured-clone@npm:^1.0.0, @ungap/structured-clone@npm:^1.2.0": version: 1.2.0 resolution: "@ungap/structured-clone@npm:1.2.0" checksum: 4f656b7b4672f2ce6e272f2427d8b0824ed11546a601d8d5412b9d7704e83db38a8d9f402ecdf2b9063fc164af842ad0ec4a55819f621ed7e7ea4d1efcc74524 @@ -2357,10 +2531,10 @@ __metadata: languageName: node linkType: hard -"abbrev@npm:^1.0.0": - version: 1.1.1 - resolution: "abbrev@npm:1.1.1" - checksum: a4a97ec07d7ea112c517036882b2ac22f3109b7b19077dc656316d07d308438aac28e4d9746dc4d84bf6b1e75b4a7b0a5f3cb30592419f128ca9a8cee3bcfa17 +"abbrev@npm:^2.0.0": + version: 2.0.0 + resolution: "abbrev@npm:2.0.0" + checksum: 0e994ad2aa6575f94670d8a2149afe94465de9cedaaaac364e7fb43a40c3691c980ff74899f682f4ca58fa96b4cbd7421a015d3a6defe43a442117d7821a2f36 languageName: node linkType: hard @@ -2382,30 +2556,14 @@ __metadata: languageName: node linkType: hard -"acorn-walk@npm:^8.1.1": - version: 8.2.0 - resolution: "acorn-walk@npm:8.2.0" - checksum: 1715e76c01dd7b2d4ca472f9c58968516a4899378a63ad5b6c2d668bba8da21a71976c14ec5f5b75f887b6317c4ae0b897ab141c831d741dc76024d8745f1ad1 - languageName: node - linkType: hard - -"acorn-walk@npm:^8.3.2": +"acorn-walk@npm:^8.1.1, acorn-walk@npm:^8.3.2": version: 8.3.2 resolution: "acorn-walk@npm:8.3.2" checksum: 3626b9d26a37b1b427796feaa5261faf712307a8920392c8dce9a5739fb31077667f4ad2ec71c7ac6aaf9f61f04a9d3d67ff56f459587206fc04aa31c27ef392 languageName: node linkType: hard -"acorn@npm:^8.0.0, acorn@npm:^8.10.0, acorn@npm:^8.2.4, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0": - version: 8.10.0 - resolution: "acorn@npm:8.10.0" - bin: - acorn: bin/acorn - checksum: 538ba38af0cc9e5ef983aee196c4b8b4d87c0c94532334fa7e065b2c8a1f85863467bb774231aae91613fcda5e68740c15d97b1967ae3394d20faddddd8af61d - languageName: node - linkType: hard - -"acorn@npm:^8.11.3": +"acorn@npm:^8.0.0, acorn@npm:^8.10.0, acorn@npm:^8.11.3, acorn@npm:^8.2.4, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0": version: 8.11.3 resolution: "acorn@npm:8.11.3" bin: @@ -2414,7 +2572,7 @@ __metadata: languageName: node linkType: hard -"agent-base@npm:6, agent-base@npm:^6.0.2": +"agent-base@npm:6": version: 6.0.2 resolution: "agent-base@npm:6.0.2" dependencies: @@ -2423,12 +2581,12 @@ __metadata: languageName: node linkType: hard -"agentkeepalive@npm:^4.2.1": - version: 4.5.0 - resolution: "agentkeepalive@npm:4.5.0" +"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0": + version: 7.1.0 + resolution: "agent-base@npm:7.1.0" dependencies: - humanize-ms: ^1.2.1 - checksum: 13278cd5b125e51eddd5079f04d6fe0914ac1b8b91c1f3db2c1822f99ac1a7457869068997784342fe455d59daaff22e14fb7b8c3da4e741896e7e31faf92481 + debug: ^4.3.4 + checksum: f7828f991470a0cc22cb579c86a18cbae83d8a3cbed39992ab34fc7217c4d126017f1c74d0ab66be87f71455318a8ea3e757d6a37881b8d0f2a2c6aa55e5418f languageName: node linkType: hard @@ -2565,23 +2723,6 @@ __metadata: languageName: node linkType: hard -"aproba@npm:^1.0.3 || ^2.0.0": - version: 2.0.0 - resolution: "aproba@npm:2.0.0" - checksum: 5615cadcfb45289eea63f8afd064ab656006361020e1735112e346593856f87435e02d8dcc7ff0d11928bc7d425f27bc7c2a84f6c0b35ab0ff659c814c138a24 - languageName: node - linkType: hard - -"are-we-there-yet@npm:^3.0.0": - version: 3.0.1 - resolution: "are-we-there-yet@npm:3.0.1" - dependencies: - delegates: ^1.0.0 - readable-stream: ^3.6.0 - checksum: 52590c24860fa7173bedeb69a4c05fb573473e860197f618b9a28432ee4379049336727ae3a1f9c4cb083114601c1140cee578376164d0e651217a9843f9fe83 - languageName: node - linkType: hard - "arg@npm:^4.1.0": version: 4.1.3 resolution: "arg@npm:4.1.3" @@ -2613,16 +2754,16 @@ __metadata: linkType: hard "array-buffer-byte-length@npm:^1.0.0": - version: 1.0.0 - resolution: "array-buffer-byte-length@npm:1.0.0" + version: 1.0.1 + resolution: "array-buffer-byte-length@npm:1.0.1" dependencies: - call-bind: ^1.0.2 - is-array-buffer: ^3.0.1 - checksum: 044e101ce150f4804ad19c51d6c4d4cfa505c5b2577bd179256e4aa3f3f6a0a5e9874c78cd428ee566ac574c8a04d7ce21af9fe52e844abfdccb82b33035a7c3 + call-bind: ^1.0.5 + is-array-buffer: ^3.0.4 + checksum: 53524e08f40867f6a9f35318fafe467c32e45e9c682ba67b11943e167344d2febc0f6977a17e699b05699e805c3e8f073d876f8bbf1b559ed494ad2cd0fae09e languageName: node linkType: hard -"array-includes@npm:^3.1.6": +"array-includes@npm:^3.1.7": version: 3.1.7 resolution: "array-includes@npm:3.1.7" dependencies: @@ -2649,7 +2790,7 @@ __metadata: languageName: node linkType: hard -"array.prototype.findlastindex@npm:^1.2.2": +"array.prototype.findlastindex@npm:^1.2.3": version: 1.2.3 resolution: "array.prototype.findlastindex@npm:1.2.3" dependencies: @@ -2662,7 +2803,7 @@ __metadata: languageName: node linkType: hard -"array.prototype.flat@npm:^1.3.1": +"array.prototype.flat@npm:^1.3.2": version: 1.3.2 resolution: "array.prototype.flat@npm:1.3.2" dependencies: @@ -2674,7 +2815,7 @@ __metadata: languageName: node linkType: hard -"array.prototype.flatmap@npm:^1.3.1": +"array.prototype.flatmap@npm:^1.3.2": version: 1.3.2 resolution: "array.prototype.flatmap@npm:1.3.2" dependencies: @@ -2731,6 +2872,13 @@ __metadata: languageName: node linkType: hard +"asynckit@npm:^0.4.0": + version: 0.4.0 + resolution: "asynckit@npm:0.4.0" + checksum: 7b78c451df768adba04e2d02e63e2d0bf3b07adcd6e42b4cf665cb7ce899bedd344c69a1dcbce355b5f972d597b25aaa1c1742b52cffd9caccb22f348114f6be + languageName: node + linkType: hard + "at-least-node@npm:^1.0.0": version: 1.0.0 resolution: "at-least-node@npm:1.0.0" @@ -2739,12 +2887,12 @@ __metadata: linkType: hard "autoprefixer@npm:^10.4.14": - version: 10.4.16 - resolution: "autoprefixer@npm:10.4.16" + version: 10.4.17 + resolution: "autoprefixer@npm:10.4.17" dependencies: - browserslist: ^4.21.10 - caniuse-lite: ^1.0.30001538 - fraction.js: ^4.3.6 + browserslist: ^4.22.2 + caniuse-lite: ^1.0.30001578 + fraction.js: ^4.3.7 normalize-range: ^0.1.2 picocolors: ^1.0.0 postcss-value-parser: ^4.2.0 @@ -2752,18 +2900,18 @@ __metadata: postcss: ^8.1.0 bin: autoprefixer: bin/autoprefixer - checksum: 45fad7086495048dacb14bb7b00313e70e135b5d8e8751dcc60548889400763705ab16fc2d99ea628b44c3472698fb0e39598f595ba28409c965ab159035afde + checksum: 1b4cf4097507f9dc48cef3194f18a05901311c881380cc634b308fce54a6554cf2dcd20aec8384b44e994d4665ab12c63dc89492523f8d74ff5d4d5eb1469f8c languageName: node linkType: hard -"available-typed-arrays@npm:^1.0.5": - version: 1.0.5 - resolution: "available-typed-arrays@npm:1.0.5" - checksum: 20eb47b3cefd7db027b9bbb993c658abd36d4edd3fe1060e83699a03ee275b0c9b216cc076ff3f2db29073225fb70e7613987af14269ac1fe2a19803ccc97f1a +"available-typed-arrays@npm:^1.0.5, available-typed-arrays@npm:^1.0.6": + version: 1.0.6 + resolution: "available-typed-arrays@npm:1.0.6" + checksum: 8295571eb86447138adf64a0df0c08ae61250b17190bba30e1fae8c80a816077a6d028e5506f602c382c0197d3080bae131e92e331139d55460989580eeae659 languageName: node linkType: hard -"axios@npm:^0.21.0, axios@npm:^0.21.4": +"axios@npm:^0.21.0": version: 0.21.4 resolution: "axios@npm:0.21.4" dependencies: @@ -2772,6 +2920,17 @@ __metadata: languageName: node linkType: hard +"axios@npm:^1.6.2": + version: 1.6.7 + resolution: "axios@npm:1.6.7" + dependencies: + follow-redirects: ^1.15.4 + form-data: ^4.0.0 + proxy-from-env: ^1.1.0 + checksum: 87d4d429927d09942771f3b3a6c13580c183e31d7be0ee12f09be6d5655304996bb033d85e54be81606f4e89684df43be7bf52d14becb73a12727bf33298a082 + languageName: node + linkType: hard + "b4a@npm:^1.6.4": version: 1.6.4 resolution: "b4a@npm:1.6.4" @@ -2893,17 +3052,17 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.14.5, browserslist@npm:^4.21.10": - version: 4.22.1 - resolution: "browserslist@npm:4.22.1" +"browserslist@npm:^4.21.10, browserslist@npm:^4.22.2": + version: 4.22.3 + resolution: "browserslist@npm:4.22.3" dependencies: - caniuse-lite: ^1.0.30001541 - electron-to-chromium: ^1.4.535 - node-releases: ^2.0.13 + caniuse-lite: ^1.0.30001580 + electron-to-chromium: ^1.4.648 + node-releases: ^2.0.14 update-browserslist-db: ^1.0.13 bin: browserslist: cli.js - checksum: 7e6b10c53f7dd5d83fd2b95b00518889096382539fed6403829d447e05df4744088de46a571071afb447046abc3c66ad06fbc790e70234ec2517452e32ffd862 + checksum: e62b17348e92143fe58181b02a6a97c4a98bd812d1dc9274673a54f73eec53dbed1c855ebf73e318ee00ee039f23c9a6d0e7629d24f3baef08c7a5b469742d57 languageName: node linkType: hard @@ -2940,33 +3099,34 @@ __metadata: languageName: node linkType: hard -"cacache@npm:^17.0.0": - version: 17.1.4 - resolution: "cacache@npm:17.1.4" +"cacache@npm:^18.0.0": + version: 18.0.2 + resolution: "cacache@npm:18.0.2" dependencies: "@npmcli/fs": ^3.1.0 fs-minipass: ^3.0.0 glob: ^10.2.2 - lru-cache: ^7.7.1 + lru-cache: ^10.0.1 minipass: ^7.0.3 - minipass-collect: ^1.0.2 + minipass-collect: ^2.0.1 minipass-flush: ^1.0.5 minipass-pipeline: ^1.2.4 p-map: ^4.0.0 ssri: ^10.0.0 tar: ^6.1.11 unique-filename: ^3.0.0 - checksum: b7751df756656954a51201335addced8f63fc53266fa56392c9f5ae83c8d27debffb4458ac2d168a744a4517ec3f2163af05c20097f93d17bdc2dc8a385e14a6 + checksum: 0250df80e1ad0c828c956744850c5f742c24244e9deb5b7dc81bca90f8c10e011e132ecc58b64497cc1cad9a98968676147fb6575f4f94722f7619757b17a11b languageName: node linkType: hard -"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2": - version: 1.0.2 - resolution: "call-bind@npm:1.0.2" +"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2, call-bind@npm:^1.0.5": + version: 1.0.5 + resolution: "call-bind@npm:1.0.5" dependencies: - function-bind: ^1.1.1 - get-intrinsic: ^1.0.2 - checksum: f8e31de9d19988a4b80f3e704788c4a2d6b6f3d17cfec4f57dc29ced450c53a49270dc66bf0fbd693329ee948dd33e6c90a329519aef17474a4d961e8d6426b0 + function-bind: ^1.1.2 + get-intrinsic: ^1.2.1 + set-function-length: ^1.1.1 + checksum: 449e83ecbd4ba48e7eaac5af26fea3b50f8f6072202c2dd7c5a6e7a6308f2421abe5e13a3bbd55221087f76320c5e09f25a8fdad1bab2b77c68ae74d92234ea5 languageName: node linkType: hard @@ -3019,14 +3179,7 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.30001538, caniuse-lite@npm:^1.0.30001541": - version: 1.0.30001549 - resolution: "caniuse-lite@npm:1.0.30001549" - checksum: 7f2abeedc8cf8b92cc0613855d71b995ce436068c0bcdd798c5af7d297ccf9f52496b00181beda42d82d25079dd4b6e389c67486156d40d8854e5707a25cb054 - languageName: node - linkType: hard - -"caniuse-lite@npm:^1.0.30001579": +"caniuse-lite@npm:^1.0.30001578, caniuse-lite@npm:^1.0.30001579, caniuse-lite@npm:^1.0.30001580": version: 1.0.30001583 resolution: "caniuse-lite@npm:1.0.30001583" checksum: 35d34eac99c1f55a2232180254e9b674dd6326a89310e6896863bb0484278c6cdf1e934c9fbfb8ef7b215c47467354051f46dfce571f9b34c413f53b67c55aa1 @@ -3213,9 +3366,9 @@ __metadata: linkType: hard "cli-spinners@npm:^2.5.0": - version: 2.9.1 - resolution: "cli-spinners@npm:2.9.1" - checksum: 1780618be58309c469205bc315db697934bac68bce78cd5dfd46248e507a533172d623c7348ecfd904734f597ce0a4e5538684843d2cfb7af485d4466699940c + version: 2.9.2 + resolution: "cli-spinners@npm:2.9.2" + checksum: 1bd588289b28432e4676cb5d40505cfe3e53f2e4e10fbe05c8a710a154d6fe0ce7836844b00d6858f740f2ffe67cdc36e0fce9c7b6a8430e80e6388d5aa4956c languageName: node linkType: hard @@ -3332,15 +3485,6 @@ __metadata: languageName: node linkType: hard -"color-support@npm:^1.1.3": - version: 1.1.3 - resolution: "color-support@npm:1.1.3" - bin: - color-support: bin.js - checksum: 9b7356817670b9a13a26ca5af1c21615463b500783b739b7634a0c2047c16cef4b2865d7576875c31c3cddf9dd621fa19285e628f20198b233a5cfdda6d0793b - languageName: node - linkType: hard - "color@npm:^4.2.3": version: 4.2.3 resolution: "color@npm:4.2.3" @@ -3358,6 +3502,15 @@ __metadata: languageName: node linkType: hard +"combined-stream@npm:^1.0.8": + version: 1.0.8 + resolution: "combined-stream@npm:1.0.8" + dependencies: + delayed-stream: ~1.0.0 + checksum: 49fa4aeb4916567e33ea81d088f6584749fc90c7abec76fd516bf1c5aa5c79f3584b5ba3de6b86d26ddd64bae5329c4c7479343250cfe71c75bb366eae53bb7c + languageName: node + linkType: hard + "comma-separated-tokens@npm:^2.0.0": version: 2.0.3 resolution: "comma-separated-tokens@npm:2.0.3" @@ -3406,13 +3559,6 @@ __metadata: languageName: node linkType: hard -"console-control-strings@npm:^1.1.0": - version: 1.1.0 - resolution: "console-control-strings@npm:1.1.0" - checksum: 8755d76787f94e6cf79ce4666f0c5519906d7f5b02d4b884cf41e11dcd759ed69c57da0670afd9236d229a46e0f9cf519db0cd829c6dca820bb5a5c3def584ed - languageName: node - linkType: hard - "contentful-generator-temp@workspace:packages/contentful-generator": version: 0.0.0-use.local resolution: "contentful-generator-temp@workspace:packages/contentful-generator" @@ -3438,31 +3584,32 @@ __metadata: languageName: node linkType: hard -"contentful-management@npm:^7.51.5": - version: 7.54.2 - resolution: "contentful-management@npm:7.54.2" +"contentful-management@npm:^11.5.7": + version: 11.14.2 + resolution: "contentful-management@npm:11.14.2" dependencies: + "@contentful/rich-text-types": ^16.3.0 "@types/json-patch": 0.0.30 - axios: ^0.21.4 - contentful-sdk-core: ^6.10.4 - fast-copy: ^2.1.0 + axios: ^1.6.2 + contentful-sdk-core: ^8.1.0 + fast-copy: ^3.0.0 lodash.isplainobject: ^4.0.6 - type-fest: ^2.5.3 - checksum: 4e602f3c99d4de7000246c5478bc06bb32aafae27e57285a1df2b59100f7090f9815c52c29342929a6dd6c709fe360608317e3b2bd6d854758ec3e1766bfdd95 + type-fest: ^4.0.0 + checksum: f194b2eeb434d48984f2ac15ff2372d372f828bd25aa22389abb0c6e7b7b7e8154510a67536f3beda943a75cd164d9376e1204cad8d152e3641dce588dacfbff languageName: node linkType: hard "contentful-migration@npm:^4.2.3": - version: 4.16.0 - resolution: "contentful-migration@npm:4.16.0" + version: 4.19.1 + resolution: "contentful-migration@npm:4.19.1" dependencies: - "@hapi/hoek": ^10.0.1 - axios: ^0.21.0 + "@hapi/hoek": ^11.0.4 + axios: ^1.6.2 bluebird: ^3.7.2 callsites: ^3.1.0 cardinal: ^2.1.1 chalk: ^4.0.0 - contentful-management: ^7.51.5 + contentful-management: ^11.5.7 didyoumean2: ^5.0.0 https-proxy-agent: ^5.0.0 inquirer: ^8.1.2 @@ -3470,15 +3617,16 @@ __metadata: kind-of: ^6.0.3 listr2: ^3.13.5 lodash: ^4.17.15 + p-throttle: ^4.1.1 uuid: ^9.0.0 yargs: ^15.3.1 bin: contentful-migration: bin/contentful-migration - checksum: f0466fad6edf634297862598a63aabf480616a273fe822054764ab82a17e70455665bfd577d43d276c3ee69a351c9d46dc77be97d73670aeda6be5daf380d8ba + checksum: 2e0bec7f860257f3cc6f7acdef6037cc3fe78d95e8c42daa7a22dbc0108c392b2590b58eb4811334226b1eb4fc5bc710dc27cd656b12b799cdf6a016832ad0d4 languageName: node linkType: hard -"contentful-sdk-core@npm:^6.10.4, contentful-sdk-core@npm:^6.8.0": +"contentful-sdk-core@npm:^6.8.0": version: 6.11.0 resolution: "contentful-sdk-core@npm:6.11.0" dependencies: @@ -3491,6 +3639,19 @@ __metadata: languageName: node linkType: hard +"contentful-sdk-core@npm:^8.1.0": + version: 8.1.2 + resolution: "contentful-sdk-core@npm:8.1.2" + dependencies: + fast-copy: ^2.1.7 + lodash.isplainobject: ^4.0.6 + lodash.isstring: ^4.0.1 + p-throttle: ^4.1.1 + qs: ^6.11.2 + checksum: 146a31ce1eba65394026293a35179e5a3a390dbb7924c9530f6f0689f03c5d177b3e972e9b7890ed815eb1b1133a49912adcf977903647e00405be3770693de1 + languageName: node + linkType: hard + "contentlayer-monorepo@workspace:.": version: 0.0.0-use.local resolution: "contentlayer-monorepo@workspace:." @@ -3592,9 +3753,9 @@ __metadata: linkType: hard "csstype@npm:^3.0.2": - version: 3.1.2 - resolution: "csstype@npm:3.1.2" - checksum: e1a52e6c25c1314d6beef5168da704ab29c5186b877c07d822bd0806717d9a265e8493a2e35ca7e68d0f5d472d43fac1cdce70fd79fd0853dff81f3028d857b5 + version: 3.1.3 + resolution: "csstype@npm:3.1.3" + checksum: 8db785cc92d259102725b3c694ec0c823f5619a84741b5c7991b8ad135dfaa66093038a1cc63e03361a6cd28d122be48f2106ae72334e067dd619a51f49eddf7 languageName: node linkType: hard @@ -3640,7 +3801,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": +"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4": version: 4.3.4 resolution: "debug@npm:4.3.4" dependencies: @@ -3728,7 +3889,7 @@ __metadata: languageName: node linkType: hard -"define-data-property@npm:^1.0.1": +"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.1": version: 1.1.1 resolution: "define-data-property@npm:1.1.1" dependencies: @@ -3739,7 +3900,7 @@ __metadata: languageName: node linkType: hard -"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0": +"define-properties@npm:^1.1.3, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1": version: 1.2.1 resolution: "define-properties@npm:1.2.1" dependencies: @@ -3750,10 +3911,10 @@ __metadata: languageName: node linkType: hard -"delegates@npm:^1.0.0": +"delayed-stream@npm:~1.0.0": version: 1.0.0 - resolution: "delegates@npm:1.0.0" - checksum: a51744d9b53c164ba9c0492471a1a2ffa0b6727451bdc89e31627fdf4adda9d51277cfcbfb20f0a6f08ccb3c436f341df3e92631a3440226d93a8971724771fd + resolution: "delayed-stream@npm:1.0.0" + checksum: 46fe6e83e2cb1d85ba50bd52803c68be9bd953282fa7096f51fc29edd5d67ff84ff753c51966061e5ba7cb5e47ef6d36a91924eddb7f3f3483b1c560f77a0020 languageName: node linkType: hard @@ -3867,10 +4028,10 @@ __metadata: languageName: node linkType: hard -"electron-to-chromium@npm:^1.4.535": - version: 1.4.556 - resolution: "electron-to-chromium@npm:1.4.556" - checksum: 8c9aa48776d80c23d8709dcd4342f1b18ca5b63bdb233fb6913f0db7b382d69afa84d5f08ead84bde6378a6a7ab3d1127f7cb6f4d0642fa625e96de6559dc1d7 +"electron-to-chromium@npm:^1.4.648": + version: 1.4.656 + resolution: "electron-to-chromium@npm:1.4.656" + checksum: b9e00c81e74ee307141a216ef971efeff8784232a9eaa9074a65687b631029725f8f4ddeefd98c43287339cdadb6c7aba92c01806122f9cae813a95735fcd432 languageName: node linkType: hard @@ -3957,24 +4118,24 @@ __metadata: linkType: hard "es-abstract@npm:^1.22.1": - version: 1.22.2 - resolution: "es-abstract@npm:1.22.2" + version: 1.22.3 + resolution: "es-abstract@npm:1.22.3" dependencies: array-buffer-byte-length: ^1.0.0 arraybuffer.prototype.slice: ^1.0.2 available-typed-arrays: ^1.0.5 - call-bind: ^1.0.2 + call-bind: ^1.0.5 es-set-tostringtag: ^2.0.1 es-to-primitive: ^1.2.1 function.prototype.name: ^1.1.6 - get-intrinsic: ^1.2.1 + get-intrinsic: ^1.2.2 get-symbol-description: ^1.0.0 globalthis: ^1.0.3 gopd: ^1.0.1 - has: ^1.0.3 has-property-descriptors: ^1.0.0 has-proto: ^1.0.1 has-symbols: ^1.0.3 + hasown: ^2.0.0 internal-slot: ^1.0.5 is-array-buffer: ^3.0.2 is-callable: ^1.2.7 @@ -3984,7 +4145,7 @@ __metadata: is-string: ^1.0.7 is-typed-array: ^1.1.12 is-weakref: ^1.0.2 - object-inspect: ^1.12.3 + object-inspect: ^1.13.1 object-keys: ^1.1.1 object.assign: ^4.1.4 regexp.prototype.flags: ^1.5.1 @@ -3998,35 +4159,42 @@ __metadata: typed-array-byte-offset: ^1.0.0 typed-array-length: ^1.0.4 unbox-primitive: ^1.0.2 - which-typed-array: ^1.1.11 - checksum: cc70e592d360d7d729859013dee7a610c6b27ed8630df0547c16b0d16d9fe6505a70ee14d1af08d970fdd132b3f88c9ca7815ce72c9011608abf8ab0e55fc515 + which-typed-array: ^1.1.13 + checksum: b1bdc962856836f6e72be10b58dc128282bdf33771c7a38ae90419d920fc3b36cc5d2b70a222ad8016e3fc322c367bf4e9e89fc2bc79b7e933c05b218e83d79a + languageName: node + linkType: hard + +"es-errors@npm:^1.0.0": + version: 1.0.0 + resolution: "es-errors@npm:1.0.0" + checksum: 04e425a3874d2824e48817a83f9009922172730042ddf326ba6849935c1fd6d121d24c049be4fd6d68aed4ab9f0c55d9861df5277b742bf2bea51713eab672c9 languageName: node linkType: hard "es-module-lexer@npm:^1.2.1": - version: 1.3.1 - resolution: "es-module-lexer@npm:1.3.1" - checksum: 3beafa7e171eb1e8cc45695edf8d51638488dddf65294d7911f8d6a96249da6a9838c87529262cc6ea53988d8272cec0f4bff93f476ed031a54ba3afb51a0ed3 + version: 1.4.1 + resolution: "es-module-lexer@npm:1.4.1" + checksum: a11b5a256d4e8e9c7d94c2fd87415ccd1591617b6edd847e064503f8eaece2d25e2e9078a02c5ce3ed5e83bb748f5b4820efbe78072c8beb07ac619c2edec35d languageName: node linkType: hard "es-set-tostringtag@npm:^2.0.1": - version: 2.0.1 - resolution: "es-set-tostringtag@npm:2.0.1" + version: 2.0.2 + resolution: "es-set-tostringtag@npm:2.0.2" dependencies: - get-intrinsic: ^1.1.3 - has: ^1.0.3 + get-intrinsic: ^1.2.2 has-tostringtag: ^1.0.0 - checksum: ec416a12948cefb4b2a5932e62093a7cf36ddc3efd58d6c58ca7ae7064475ace556434b869b0bbeb0c365f1032a8ccd577211101234b69837ad83ad204fff884 + hasown: ^2.0.0 + checksum: afcec3a4c9890ae14d7ec606204858441c801ff84f312538e1d1ccf1e5493c8b17bd672235df785f803756472cb4f2d49b87bde5237aef33411e74c22f194e07 languageName: node linkType: hard "es-shim-unscopables@npm:^1.0.0": - version: 1.0.0 - resolution: "es-shim-unscopables@npm:1.0.0" + version: 1.0.2 + resolution: "es-shim-unscopables@npm:1.0.2" dependencies: - has: ^1.0.3 - checksum: 83e95cadbb6ee44d3644dfad60dcad7929edbc42c85e66c3e99aefd68a3a5c5665f2686885cddb47dfeabfd77bd5ea5a7060f2092a955a729bbd8834f0d86fa1 + hasown: ^2.0.0 + checksum: 432bd527c62065da09ed1d37a3f8e623c423683285e6188108286f4a1e8e164a5bcbfbc0051557c7d14633cd2a41ce24c7048e6bbb66a985413fd32f1be72626 languageName: node linkType: hard @@ -4157,7 +4325,7 @@ __metadata: languageName: node linkType: hard -"eslint-import-resolver-node@npm:^0.3.7": +"eslint-import-resolver-node@npm:^0.3.9": version: 0.3.9 resolution: "eslint-import-resolver-node@npm:0.3.9" dependencies: @@ -4181,29 +4349,29 @@ __metadata: linkType: hard "eslint-plugin-import@npm:^2.27.5": - version: 2.28.1 - resolution: "eslint-plugin-import@npm:2.28.1" + version: 2.29.1 + resolution: "eslint-plugin-import@npm:2.29.1" dependencies: - array-includes: ^3.1.6 - array.prototype.findlastindex: ^1.2.2 - array.prototype.flat: ^1.3.1 - array.prototype.flatmap: ^1.3.1 + array-includes: ^3.1.7 + array.prototype.findlastindex: ^1.2.3 + array.prototype.flat: ^1.3.2 + array.prototype.flatmap: ^1.3.2 debug: ^3.2.7 doctrine: ^2.1.0 - eslint-import-resolver-node: ^0.3.7 + eslint-import-resolver-node: ^0.3.9 eslint-module-utils: ^2.8.0 - has: ^1.0.3 - is-core-module: ^2.13.0 + hasown: ^2.0.0 + is-core-module: ^2.13.1 is-glob: ^4.0.3 minimatch: ^3.1.2 - object.fromentries: ^2.0.6 - object.groupby: ^1.0.0 - object.values: ^1.1.6 + object.fromentries: ^2.0.7 + object.groupby: ^1.0.1 + object.values: ^1.1.7 semver: ^6.3.1 - tsconfig-paths: ^3.14.2 + tsconfig-paths: ^3.15.0 peerDependencies: eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 - checksum: e8ae6dd8f06d8adf685f9c1cfd46ac9e053e344a05c4090767e83b63a85c8421ada389807a39e73c643b9bff156715c122e89778169110ed68d6428e12607edf + checksum: e65159aef808136d26d029b71c8c6e4cb5c628e65e5de77f1eb4c13a379315ae55c9c3afa847f43f4ff9df7e54515c77ffc6489c6a6f81f7dd7359267577468c languageName: node linkType: hard @@ -4253,16 +4421,17 @@ __metadata: linkType: hard "eslint@npm:^8.43.0": - version: 8.51.0 - resolution: "eslint@npm:8.51.0" + version: 8.56.0 + resolution: "eslint@npm:8.56.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 "@eslint-community/regexpp": ^4.6.1 - "@eslint/eslintrc": ^2.1.2 - "@eslint/js": 8.51.0 - "@humanwhocodes/config-array": ^0.11.11 + "@eslint/eslintrc": ^2.1.4 + "@eslint/js": 8.56.0 + "@humanwhocodes/config-array": ^0.11.13 "@humanwhocodes/module-importer": ^1.0.1 "@nodelib/fs.walk": ^1.2.8 + "@ungap/structured-clone": ^1.2.0 ajv: ^6.12.4 chalk: ^4.0.0 cross-spawn: ^7.0.2 @@ -4295,7 +4464,7 @@ __metadata: text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: 214fa5d1fcb67af1b8992ce9584ccd85e1aa7a482f8b8ea5b96edc28fa838a18a3b69456db45fc1ed3ef95f1e9efa9714f737292dc681e572d471d02fda9649c + checksum: 883436d1e809b4a25d9eb03d42f584b84c408dbac28b0019f6ea07b5177940bf3cca86208f749a6a1e0039b63e085ee47aca1236c30721e91f0deef5cc5a5136 languageName: node linkType: hard @@ -4514,13 +4683,20 @@ __metadata: languageName: node linkType: hard -"fast-copy@npm:^2.1.0": +"fast-copy@npm:^2.1.0, fast-copy@npm:^2.1.7": version: 2.1.7 resolution: "fast-copy@npm:2.1.7" checksum: af8016c174b02bd4f706ffdf9f138511b17b748665b291fec6c5ca1922cb55da35cf86ded46b31890930bcf9b1c2481c03c793a47110ab81ec385e14972b9d7e languageName: node linkType: hard +"fast-copy@npm:^3.0.0": + version: 3.0.1 + resolution: "fast-copy@npm:3.0.1" + checksum: 5496b5cf47df29eea479deef03b6b7188626a2cbc356b3015649062846729de6f1a9f555f937e772da8feae0a1231fab13096ed32424b2d61e4d065abc9969fe + languageName: node + linkType: hard + "fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3": version: 3.1.3 resolution: "fast-deep-equal@npm:3.1.3" @@ -4535,16 +4711,16 @@ __metadata: languageName: node linkType: hard -"fast-glob@npm:^3.2.12, fast-glob@npm:^3.2.9": - version: 3.3.1 - resolution: "fast-glob@npm:3.3.1" +"fast-glob@npm:^3.2.12, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0": + version: 3.3.2 + resolution: "fast-glob@npm:3.3.2" dependencies: "@nodelib/fs.stat": ^2.0.2 "@nodelib/fs.walk": ^1.2.3 glob-parent: ^5.1.2 merge2: ^1.3.0 micromatch: ^4.0.4 - checksum: b6f3add6403e02cf3a798bfbb1183d0f6da2afd368f27456010c0bc1f9640aea308243d4cb2c0ab142f618276e65ecb8be1661d7c62a7b4e5ba774b9ce5432e5 + checksum: 900e4979f4dbc3313840078419245621259f349950411ca2fa445a2f9a1a6d98c3b5e7e0660c5ccd563aa61abe133a21765c6c0dec8e57da1ba71d8000b05ec1 languageName: node linkType: hard @@ -4570,11 +4746,11 @@ __metadata: linkType: hard "fastq@npm:^1.6.0": - version: 1.15.0 - resolution: "fastq@npm:1.15.0" + version: 1.17.0 + resolution: "fastq@npm:1.17.0" dependencies: reusify: ^1.0.4 - checksum: 0170e6bfcd5d57a70412440b8ef600da6de3b2a6c5966aeaf0a852d542daff506a0ee92d6de7679d1de82e644bce69d7a574a6c93f0b03964b5337eed75ada1a + checksum: a1c88c357a220bdc666c2df5ec6071d49bdf79ea827d92f9a9559da3ff1b4288eecca3ecbb7b6ddf0ba016eb0a4bf756bf17c411a6d10c814aecd26e939cbd06 languageName: node linkType: hard @@ -4645,13 +4821,13 @@ __metadata: linkType: hard "flat-cache@npm:^3.0.4": - version: 3.1.1 - resolution: "flat-cache@npm:3.1.1" + version: 3.2.0 + resolution: "flat-cache@npm:3.2.0" dependencies: flatted: ^3.2.9 keyv: ^4.5.3 rimraf: ^3.0.2 - checksum: 4958cfe0f46acf84953d4e16676ef5f0d38eab3a92d532a1e8d5f88f11eea8b36d5d598070ff2aeae15f1fde18f8d7d089eefaf9db10b5a587cc1c9072325c7a + checksum: e7e0f59801e288b54bee5cb9681e9ee21ee28ef309f886b312c9d08415b79fc0f24ac842f84356ce80f47d6a53de62197ce0e6e148dc42d5db005992e2a756ec languageName: node linkType: hard @@ -4662,13 +4838,13 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.14.0": - version: 1.15.3 - resolution: "follow-redirects@npm:1.15.3" +"follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.15.4": + version: 1.15.5 + resolution: "follow-redirects@npm:1.15.5" peerDependenciesMeta: debug: optional: true - checksum: 584da22ec5420c837bd096559ebfb8fe69d82512d5585004e36a3b4a6ef6d5905780e0c74508c7b72f907d1fa2b7bd339e613859e9c304d0dc96af2027fd0231 + checksum: 5ca49b5ce6f44338cbfc3546823357e7a70813cecc9b7b768158a1d32c1e62e7407c944402a918ea8c38ae2e78266312d617dc68783fac502cbb55e1047b34ec languageName: node linkType: hard @@ -4691,6 +4867,17 @@ __metadata: languageName: node linkType: hard +"form-data@npm:^4.0.0": + version: 4.0.0 + resolution: "form-data@npm:4.0.0" + dependencies: + asynckit: ^0.4.0 + combined-stream: ^1.0.8 + mime-types: ^2.1.12 + checksum: 01135bf8675f9d5c61ff18e2e2932f719ca4de964e3be90ef4c36aacfc7b9cb2fceb5eca0b7e0190e3383fe51c5b37f4cb80b62ca06a99aaabfcfd6ac7c9328c + languageName: node + linkType: hard + "format@npm:^0.2.0": version: 0.2.2 resolution: "format@npm:0.2.2" @@ -4698,7 +4885,7 @@ __metadata: languageName: node linkType: hard -"fraction.js@npm:^4.3.6": +"fraction.js@npm:^4.3.7": version: 4.3.7 resolution: "fraction.js@npm:4.3.7" checksum: e1553ae3f08e3ba0e8c06e43a3ab20b319966dfb7ddb96fd9b5d0ee11a66571af7f993229c88ebbb0d4a816eb813a24ed48207b140d442a8f76f33763b8d1f3f @@ -4764,13 +4951,6 @@ __metadata: languageName: node linkType: hard -"fs-monkey@npm:^1.0.4": - version: 1.0.5 - resolution: "fs-monkey@npm:1.0.5" - checksum: 424b67f65b37fe66117ae2bb061f790fe6d4b609e1d160487c74b3d69fbf42f262c665ccfba32e8b5f113f96f92e9a58fcdebe42d5f6649bdfc72918093a3119 - languageName: node - linkType: hard - "fs.realpath@npm:^1.0.0": version: 1.0.0 resolution: "fs.realpath@npm:1.0.0" @@ -4797,7 +4977,7 @@ __metadata: languageName: node linkType: hard -"function-bind@npm:^1.1.1": +"function-bind@npm:^1.1.2": version: 1.1.2 resolution: "function-bind@npm:1.1.2" checksum: 2b0ff4ce708d99715ad14a6d1f894e2a83242e4a52ccfcefaee5e40050562e5f6dafc1adbb4ce2d4ab47279a45dc736ab91ea5042d843c3c092820dfe032efb1 @@ -4823,22 +5003,6 @@ __metadata: languageName: node linkType: hard -"gauge@npm:^4.0.3": - version: 4.0.4 - resolution: "gauge@npm:4.0.4" - dependencies: - aproba: ^1.0.3 || ^2.0.0 - color-support: ^1.1.3 - console-control-strings: ^1.1.0 - has-unicode: ^2.0.1 - signal-exit: ^3.0.7 - string-width: ^4.2.3 - strip-ansi: ^6.0.1 - wide-align: ^1.1.5 - checksum: 788b6bfe52f1dd8e263cda800c26ac0ca2ff6de0b6eee2fe0d9e3abf15e149b651bd27bf5226be10e6e3edb5c4e5d5985a5a1a98137e7a892f75eff76467ad2d - languageName: node - linkType: hard - "get-caller-file@npm:^2.0.1, get-caller-file@npm:^2.0.5": version: 2.0.5 resolution: "get-caller-file@npm:2.0.5" @@ -4853,15 +5017,16 @@ __metadata: languageName: node linkType: hard -"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1": - version: 1.2.1 - resolution: "get-intrinsic@npm:1.2.1" +"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.2": + version: 1.2.3 + resolution: "get-intrinsic@npm:1.2.3" dependencies: - function-bind: ^1.1.1 - has: ^1.0.3 + es-errors: ^1.0.0 + function-bind: ^1.1.2 has-proto: ^1.0.1 has-symbols: ^1.0.3 - checksum: 5b61d88552c24b0cf6fa2d1b3bc5459d7306f699de060d76442cce49a4721f52b8c560a33ab392cf5575b7810277d54ded9d4d39a1ea61855619ebc005aa7e5f + hasown: ^2.0.0 + checksum: 497fe6e444a2c570d174486c2450fc2b8c5020ae33a945a4b3d06c88bd69fb02a4611163e7a5bd9a5f61162e85ee83e55f06400dd3de108d6407eea32c6330b7 languageName: node linkType: hard @@ -4921,21 +5086,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:7.1.6": - version: 7.1.6 - resolution: "glob@npm:7.1.6" - dependencies: - fs.realpath: ^1.0.0 - inflight: ^1.0.4 - inherits: 2 - minimatch: ^3.0.4 - once: ^1.3.0 - path-is-absolute: ^1.0.0 - checksum: 351d549dd90553b87c2d3f90ce11aed9e1093c74130440e7ae0592e11bbcd2ce7f0ebb8ba6bfe63aaf9b62166a7f4c80cb84490ae5d78408bb2572bf7d4ee0a6 - languageName: node - linkType: hard - -"glob@npm:^10.2.2": +"glob@npm:^10.2.2, glob@npm:^10.3.10": version: 10.3.10 resolution: "glob@npm:10.3.10" dependencies: @@ -4950,7 +5101,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^7.0.0, glob@npm:^7.1.3, glob@npm:^7.1.4": +"glob@npm:^7.0.0, glob@npm:^7.1.3": version: 7.2.3 resolution: "glob@npm:7.2.3" dependencies: @@ -4989,11 +5140,11 @@ __metadata: linkType: hard "globals@npm:^13.19.0": - version: 13.23.0 - resolution: "globals@npm:13.23.0" + version: 13.24.0 + resolution: "globals@npm:13.24.0" dependencies: type-fest: ^0.20.2 - checksum: 194c97cf8d1ef6ba59417234c2386549c4103b6e5f24b1ff1952de61a4753e5d2069435ba629de711a6480b1b1d114a98e2ab27f85e966d5a10c319c3bbd3dc3 + checksum: 56066ef058f6867c04ff203b8a44c15b038346a62efbc3060052a1016be9f56f4cf0b2cd45b74b22b81e521a889fc7786c73691b0549c2f3a6e825b3d394f43c languageName: node linkType: hard @@ -5097,12 +5248,12 @@ __metadata: languageName: node linkType: hard -"has-property-descriptors@npm:^1.0.0": - version: 1.0.0 - resolution: "has-property-descriptors@npm:1.0.0" +"has-property-descriptors@npm:^1.0.0, has-property-descriptors@npm:^1.0.1": + version: 1.0.1 + resolution: "has-property-descriptors@npm:1.0.1" dependencies: - get-intrinsic: ^1.1.1 - checksum: a6d3f0a266d0294d972e354782e872e2fe1b6495b321e6ef678c9b7a06a40408a6891817350c62e752adced73a94ac903c54734fee05bf65b1905ee1368194bb + get-intrinsic: ^1.2.2 + checksum: 2bcc6bf6ec6af375add4e4b4ef586e43674850a91ad4d46666d0b28ba8e1fd69e424c7677d24d60f69470ad0afaa2f3197f508b20b0bb7dd99a8ab77ffc4b7c4 languageName: node linkType: hard @@ -5120,26 +5271,12 @@ __metadata: languageName: node linkType: hard -"has-tostringtag@npm:^1.0.0": - version: 1.0.0 - resolution: "has-tostringtag@npm:1.0.0" +"has-tostringtag@npm:^1.0.0, has-tostringtag@npm:^1.0.1": + version: 1.0.2 + resolution: "has-tostringtag@npm:1.0.2" dependencies: - has-symbols: ^1.0.2 - checksum: cc12eb28cb6ae22369ebaad3a8ab0799ed61270991be88f208d508076a1e99abe4198c965935ce85ea90b60c94ddda73693b0920b58e7ead048b4a391b502c1c - languageName: node - linkType: hard - -"has-unicode@npm:^2.0.1": - version: 2.0.1 - resolution: "has-unicode@npm:2.0.1" - checksum: 1eab07a7436512db0be40a710b29b5dc21fa04880b7f63c9980b706683127e3c1b57cb80ea96d47991bdae2dfe479604f6a1ba410106ee1046a41d1bd0814400 - languageName: node - linkType: hard - -"has@npm:^1.0.3": - version: 1.0.4 - resolution: "has@npm:1.0.4" - checksum: 8a11ba062e0627c9578a1d08285401e39f1d071a9692ddf793199070edb5648b21c774dd733e2a181edd635bf6862731885f476f4ccf67c998d7a5ff7cef2550 + has-symbols: ^1.0.3 + checksum: 999d60bb753ad714356b2c6c87b7fb74f32463b8426e159397da4bde5bca7e598ab1073f4d8d4deafac297f2eb311484cd177af242776bf05f0d11565680468d languageName: node linkType: hard @@ -5150,6 +5287,15 @@ __metadata: languageName: node linkType: hard +"hasown@npm:^2.0.0": + version: 2.0.0 + resolution: "hasown@npm:2.0.0" + dependencies: + function-bind: ^1.1.2 + checksum: 6151c75ca12554565098641c98a40f4cc86b85b0fd5b6fe92360967e4605a4f9610f7757260b4e8098dd1c2ce7f4b095f2006fe72a570e3b6d2d28de0298c176 + languageName: node + linkType: hard + "hast-util-from-parse5@npm:^8.0.0": version: 8.0.1 resolution: "hast-util-from-parse5@npm:8.0.1" @@ -5176,8 +5322,8 @@ __metadata: linkType: hard "hast-util-raw@npm:^9.0.0": - version: 9.0.1 - resolution: "hast-util-raw@npm:9.0.1" + version: 9.0.2 + resolution: "hast-util-raw@npm:9.0.2" dependencies: "@types/hast": ^3.0.0 "@types/unist": ^3.0.0 @@ -5192,7 +5338,7 @@ __metadata: vfile: ^6.0.0 web-namespaces: ^2.0.0 zwitch: ^2.0.0 - checksum: 4b486eb4782eafb471ae639d45c14ac8797676518cf5da16adc973f52d7b8e1075a1451558c023b390820bd9fd213213e6248a2dae71b68ac5040b277509b8d9 + checksum: 27fd7c723b3b1e06481cd85ca20b447d58d340c53abd2bd61f4a502982109d16aa17b3d71db2ef7c9d24bd627e306ad81cbcaf98c146a3641ba150db731e644c languageName: node linkType: hard @@ -5321,14 +5467,13 @@ __metadata: languageName: node linkType: hard -"http-proxy-agent@npm:^5.0.0": - version: 5.0.0 - resolution: "http-proxy-agent@npm:5.0.0" +"http-proxy-agent@npm:^7.0.0": + version: 7.0.0 + resolution: "http-proxy-agent@npm:7.0.0" dependencies: - "@tootallnate/once": 2 - agent-base: 6 - debug: 4 - checksum: e2ee1ff1656a131953839b2a19cd1f3a52d97c25ba87bd2559af6ae87114abf60971e498021f9b73f9fd78aea8876d1fb0d4656aac8a03c6caa9fc175f22b786 + agent-base: ^7.1.0 + debug: ^4.3.4 + checksum: 48d4fac997917e15f45094852b63b62a46d0c8a4f0b9c6c23ca26d27b8df8d178bed88389e604745e748bd9a01f5023e25093722777f0593c3f052009ff438b6 languageName: node linkType: hard @@ -5342,6 +5487,16 @@ __metadata: languageName: node linkType: hard +"https-proxy-agent@npm:^7.0.1": + version: 7.0.2 + resolution: "https-proxy-agent@npm:7.0.2" + dependencies: + agent-base: ^7.0.2 + debug: 4 + checksum: 088969a0dd476ea7a0ed0a2cf1283013682b08f874c3bc6696c83fa061d2c157d29ef0ad3eb70a2046010bb7665573b2388d10fdcb3e410a66995e5248444292 + languageName: node + linkType: hard + "human-id@npm:^1.0.2": version: 1.0.2 resolution: "human-id@npm:1.0.2" @@ -5356,12 +5511,10 @@ __metadata: languageName: node linkType: hard -"humanize-ms@npm:^1.2.1": - version: 1.2.1 - resolution: "humanize-ms@npm:1.2.1" - dependencies: - ms: ^2.0.0 - checksum: 9c7a74a2827f9294c009266c82031030eae811ca87b0da3dceb8d6071b9bde22c9f3daef0469c3c533cc67a97d8a167cd9fc0389350e5f415f61a79b171ded16 +"hyperdyperid@npm:^1.2.0": + version: 1.2.0 + resolution: "hyperdyperid@npm:1.2.0" + checksum: 210029d1c86926f09109f6317d143f8b056fc38e8dd11b0c3e3205fc6c6ff8429fb55b4b9c2bce065462719ed9d34366eced387aaa0035d93eb76b306a8547ef languageName: node linkType: hard @@ -5391,16 +5544,16 @@ __metadata: linkType: hard "ignore@npm:^5.2.0": - version: 5.2.4 - resolution: "ignore@npm:5.2.4" - checksum: 3d4c309c6006e2621659311783eaea7ebcd41fe4ca1d78c91c473157ad6666a57a2df790fe0d07a12300d9aac2888204d7be8d59f9aaf665b1c7fcdb432517ef + version: 5.3.1 + resolution: "ignore@npm:5.3.1" + checksum: 71d7bb4c1dbe020f915fd881108cbe85a0db3d636a0ea3ba911393c53946711d13a9b1143c7e70db06d571a5822c0a324a6bcde5c9904e7ca5047f01f1bf8cd3 languageName: node linkType: hard "imagescript@npm:^1.2.16": - version: 1.2.16 - resolution: "imagescript@npm:1.2.16" - checksum: be6b14bf9ebb478233e03e22343bc5d222fd04d9f99fac59eb9c4978e8685d47920cceccb1d8562bc11b5cfdd9bfdee3965b324417759e03513678d758f8ace2 + version: 1.2.18 + resolution: "imagescript@npm:1.2.18" + checksum: ee3df4ac8111ec3e43dc0fe2d5895eb1d3e26184907171b293df134214012464841a7072d2475d0dd11a70ab3748192e201d07fc81701a1bb8feb4a22eec2929 languageName: node linkType: hard @@ -5510,13 +5663,13 @@ __metadata: linkType: soft "internal-slot@npm:^1.0.5": - version: 1.0.5 - resolution: "internal-slot@npm:1.0.5" + version: 1.0.6 + resolution: "internal-slot@npm:1.0.6" dependencies: - get-intrinsic: ^1.2.0 - has: ^1.0.3 + get-intrinsic: ^1.2.2 + hasown: ^2.0.0 side-channel: ^1.0.4 - checksum: 97e84046bf9e7574d0956bd98d7162313ce7057883b6db6c5c7b5e5f05688864b0978ba07610c726d15d66544ffe4b1050107d93f8a39ebc59b15d8b429b497a + checksum: 7872454888047553ce97a3fa1da7cc054a28ec5400a9c2e9f4dbe4fe7c1d041cb8e8301467614b80d4246d50377aad2fb58860b294ed74d6700cc346b6f89549 languageName: node linkType: hard @@ -5551,14 +5704,13 @@ __metadata: languageName: node linkType: hard -"is-array-buffer@npm:^3.0.1, is-array-buffer@npm:^3.0.2": - version: 3.0.2 - resolution: "is-array-buffer@npm:3.0.2" +"is-array-buffer@npm:^3.0.2, is-array-buffer@npm:^3.0.4": + version: 3.0.4 + resolution: "is-array-buffer@npm:3.0.4" dependencies: call-bind: ^1.0.2 - get-intrinsic: ^1.2.0 - is-typed-array: ^1.1.10 - checksum: dcac9dda66ff17df9cabdc58214172bf41082f956eab30bb0d86bc0fab1e44b690fc8e1f855cf2481245caf4e8a5a006a982a71ddccec84032ed41f9d8da8c14 + get-intrinsic: ^1.2.1 + checksum: e4e3e6ef0ff2239e75371d221f74bc3c26a03564a22efb39f6bb02609b598917ddeecef4e8c877df2a25888f247a98198959842a5e73236bc7f22cabdf6351a7 languageName: node linkType: hard @@ -5622,12 +5774,12 @@ __metadata: languageName: node linkType: hard -"is-core-module@npm:^2.13.0": - version: 2.13.0 - resolution: "is-core-module@npm:2.13.0" +"is-core-module@npm:^2.13.0, is-core-module@npm:^2.13.1": + version: 2.13.1 + resolution: "is-core-module@npm:2.13.1" dependencies: - has: ^1.0.3 - checksum: 053ab101fb390bfeb2333360fd131387bed54e476b26860dc7f5a700bbf34a0ec4454f7c8c4d43e8a0030957e4b3db6e16d35e1890ea6fb654c833095e040355 + hasown: ^2.0.0 + checksum: 256559ee8a9488af90e4bad16f5583c6d59e92f0742e9e8bb4331e758521ee86b810b93bae44f390766ffbc518a0488b18d9dab7da9a5ff997d499efc9403f7c languageName: node linkType: hard @@ -5826,11 +5978,11 @@ __metadata: linkType: hard "is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.12, is-typed-array@npm:^1.1.9": - version: 1.1.12 - resolution: "is-typed-array@npm:1.1.12" + version: 1.1.13 + resolution: "is-typed-array@npm:1.1.13" dependencies: - which-typed-array: ^1.1.11 - checksum: 4c89c4a3be07186caddadf92197b17fda663a9d259ea0d44a85f171558270d36059d1c386d34a12cba22dfade5aba497ce22778e866adc9406098c8fc4771796 + which-typed-array: ^1.1.14 + checksum: 150f9ada183a61554c91e1c4290086d2c100b0dff45f60b028519be72a8db964da403c48760723bf5253979b8dffe7b544246e0e5351dcd05c5fdb1dcc1dc0f0 languageName: node linkType: hard @@ -5871,6 +6023,13 @@ __metadata: languageName: node linkType: hard +"isexe@npm:^3.1.1": + version: 3.1.1 + resolution: "isexe@npm:3.1.1" + checksum: 7fe1931ee4e88eb5aa524cd3ceb8c882537bc3a81b02e438b240e47012eef49c86904d0f0e593ea7c3a9996d18d0f1f3be8d3eaa92333977b0c3a9d353d5563e + languageName: node + linkType: hard + "jackspeak@npm:^2.3.5": version: 2.3.6 resolution: "jackspeak@npm:2.3.6" @@ -5895,25 +6054,25 @@ __metadata: languageName: node linkType: hard -"jiti@npm:^1.18.2": - version: 1.20.0 - resolution: "jiti@npm:1.20.0" +"jiti@npm:^1.19.1": + version: 1.21.0 + resolution: "jiti@npm:1.21.0" bin: jiti: bin/jiti.js - checksum: 7924062b5675142e3e272a27735be84b7bfc0a0eb73217fc2dcafa034f37c4f7b4b9ffc07dd98bcff0f739a8811ce1544db205ae7e97b1c86f0df92c65ce3c72 + checksum: a7bd5d63921c170eaec91eecd686388181c7828e1fa0657ab374b9372bfc1f383cf4b039e6b272383d5cb25607509880af814a39abdff967322459cca41f2961 languageName: node linkType: hard "joi@npm:^17.4.0": - version: 17.11.0 - resolution: "joi@npm:17.11.0" + version: 17.12.1 + resolution: "joi@npm:17.12.1" dependencies: - "@hapi/hoek": ^9.0.0 - "@hapi/topo": ^5.0.0 - "@sideway/address": ^4.1.3 + "@hapi/hoek": ^9.3.0 + "@hapi/topo": ^5.1.0 + "@sideway/address": ^4.1.5 "@sideway/formula": ^3.0.1 "@sideway/pinpoint": ^2.0.0 - checksum: 3a4e9ecba345cdafe585e7ed8270a44b39718e11dff3749aa27e0001a63d578b75100c062be28e6f48f960b594864034e7a13833f33fbd7ad56d5ce6b617f9bf + checksum: 31c85bf49cfacd094dd70e52a3cba40c7eb95240f199cad06609d6e76563761864bcf9920b94a6eb8b46839a50087d44f8d5d4126df8be7502847e4b276ca8b0 languageName: node linkType: hard @@ -5961,6 +6120,29 @@ __metadata: languageName: node linkType: hard +"json-joy@npm:^9.2.0": + version: 9.9.1 + resolution: "json-joy@npm:9.9.1" + dependencies: + arg: ^5.0.2 + hyperdyperid: ^1.2.0 + peerDependencies: + quill-delta: ^5 + rxjs: 7 + tslib: 2 + bin: + jj: bin/jj.js + json-pack: bin/json-pack.js + json-pack-test: bin/json-pack-test.js + json-patch: bin/json-patch.js + json-patch-test: bin/json-patch-test.js + json-pointer: bin/json-pointer.js + json-pointer-test: bin/json-pointer-test.js + json-unpack: bin/json-unpack.js + checksum: d165398682f00019796225faf365cd8d060f3e086af39bb5081c30907b7e52eaf13697d1c0f6ee2b010fe255ae1fd776e05ad7d6ee5fb549e98fe982f560884b + languageName: node + linkType: hard + "json-parse-even-better-errors@npm:^2.3.0, json-parse-even-better-errors@npm:^2.3.1": version: 2.3.1 resolution: "json-parse-even-better-errors@npm:2.3.1" @@ -5994,9 +6176,9 @@ __metadata: linkType: hard "jsonc-parser@npm:^3.2.0": - version: 3.2.0 - resolution: "jsonc-parser@npm:3.2.0" - checksum: 946dd9a5f326b745aa326d48a7257e3f4a4b62c5e98ec8e49fa2bdd8d96cef7e6febf1399f5c7016114fd1f68a1c62c6138826d5d90bc650448e3cf0951c53c7 + version: 3.2.1 + resolution: "jsonc-parser@npm:3.2.1" + checksum: 656d9027b91de98d8ab91b3aa0d0a4cab7dc798a6830845ca664f3e76c82d46b973675bbe9b500fae1de37fd3e81aceacbaa2a57884bf2f8f29192150d2d1ef7 languageName: node linkType: hard @@ -6051,13 +6233,20 @@ __metadata: languageName: node linkType: hard -"lilconfig@npm:^2.0.5, lilconfig@npm:^2.1.0": +"lilconfig@npm:^2.1.0": version: 2.1.0 resolution: "lilconfig@npm:2.1.0" checksum: 8549bb352b8192375fed4a74694cd61ad293904eee33f9d4866c2192865c44c4eb35d10782966242634e0cbc1e91fe62b1247f148dc5514918e3a966da7ea117 languageName: node linkType: hard +"lilconfig@npm:^3.0.0": + version: 3.0.0 + resolution: "lilconfig@npm:3.0.0" + checksum: a155f1cd24d324ab20dd6974db9ebcf3fb6f2b60175f7c052d917ff8a746b590bc1ee550f6fc3cb1e8716c8b58304e22fe2193febebc0cf16fa86d85e6f896c5 + languageName: node + linkType: hard + "lines-and-columns@npm:^1.1.6": version: 1.2.4 resolution: "lines-and-columns@npm:1.2.4" @@ -6258,6 +6447,13 @@ __metadata: languageName: node linkType: hard +"lru-cache@npm:^10.0.1, lru-cache@npm:^9.1.1 || ^10.0.0": + version: 10.2.0 + resolution: "lru-cache@npm:10.2.0" + checksum: eee7ddda4a7475deac51ac81d7dd78709095c6fa46e8350dc2d22462559a1faa3b81ed931d5464b13d48cbd7e08b46100b6f768c76833912bc444b99c37e25db + languageName: node + linkType: hard + "lru-cache@npm:^4.0.1": version: 4.1.5 resolution: "lru-cache@npm:4.1.5" @@ -6277,20 +6473,6 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^7.7.1": - version: 7.18.3 - resolution: "lru-cache@npm:7.18.3" - checksum: e550d772384709deea3f141af34b6d4fa392e2e418c1498c078de0ee63670f1f46f5eee746e8ef7e69e1c895af0d4224e62ee33e66a543a14763b0f2e74c1356 - languageName: node - linkType: hard - -"lru-cache@npm:^9.1.1 || ^10.0.0": - version: 10.0.1 - resolution: "lru-cache@npm:10.0.1" - checksum: 06f8d0e1ceabd76bb6f644a26dbb0b4c471b79c7b514c13c6856113879b3bf369eb7b497dad4ff2b7e2636db202412394865b33c332100876d838ad1372f0181 - languageName: node - linkType: hard - "magic-string@npm:^0.30.5": version: 0.30.6 resolution: "magic-string@npm:0.30.6" @@ -6307,26 +6489,22 @@ __metadata: languageName: node linkType: hard -"make-fetch-happen@npm:^11.0.3": - version: 11.1.1 - resolution: "make-fetch-happen@npm:11.1.1" +"make-fetch-happen@npm:^13.0.0": + version: 13.0.0 + resolution: "make-fetch-happen@npm:13.0.0" dependencies: - agentkeepalive: ^4.2.1 - cacache: ^17.0.0 + "@npmcli/agent": ^2.0.0 + cacache: ^18.0.0 http-cache-semantics: ^4.1.1 - http-proxy-agent: ^5.0.0 - https-proxy-agent: ^5.0.0 is-lambda: ^1.0.1 - lru-cache: ^7.7.1 - minipass: ^5.0.0 + minipass: ^7.0.2 minipass-fetch: ^3.0.0 minipass-flush: ^1.0.5 minipass-pipeline: ^1.2.4 negotiator: ^0.6.3 promise-retry: ^2.0.1 - socks-proxy-agent: ^7.0.0 ssri: ^10.0.0 - checksum: 7268bf274a0f6dcf0343829489a4506603ff34bd0649c12058753900b0eb29191dce5dba12680719a5d0a983d3e57810f594a12f3c18494e93a1fbc6348a4540 + checksum: 7c7a6d381ce919dd83af398b66459a10e2fe8f4504f340d1d090d3fa3d1b0c93750220e1d898114c64467223504bd258612ba83efbc16f31b075cd56de24b4af languageName: node linkType: hard @@ -6551,18 +6729,18 @@ __metadata: linkType: hard "mdast-util-phrasing@npm:^4.0.0": - version: 4.0.0 - resolution: "mdast-util-phrasing@npm:4.0.0" + version: 4.1.0 + resolution: "mdast-util-phrasing@npm:4.1.0" dependencies: "@types/mdast": ^4.0.0 unist-util-is: ^6.0.0 - checksum: 95d5d8e18d5ea6dbfe2ee4ed1045961372efae9077e5c98e10bfef7025ee3fd9449f9a82840068ff50aa98fa43af0a0a14898ae10b5e46e96edde01e2797df34 + checksum: 3a97533e8ad104a422f8bebb34b3dde4f17167b8ed3a721cf9263c7416bd3447d2364e6d012a594aada40cac9e949db28a060bb71a982231693609034ed5324e languageName: node linkType: hard "mdast-util-to-hast@npm:^13.0.0": - version: 13.0.2 - resolution: "mdast-util-to-hast@npm:13.0.2" + version: 13.1.0 + resolution: "mdast-util-to-hast@npm:13.1.0" dependencies: "@types/hast": ^3.0.0 "@types/mdast": ^4.0.0 @@ -6572,7 +6750,8 @@ __metadata: trim-lines: ^3.0.0 unist-util-position: ^5.0.0 unist-util-visit: ^5.0.0 - checksum: 8fef6c3752476461d9c00b1dea4f141bc7d980e1b3bac7bd965bc68f532b6d30fb1c9e810433327c167176e68e071b8f4ab5a45355954857dc095c878421f35e + vfile: ^6.0.0 + checksum: 640bc897286af8fe760cd477fb04bbf544a5a897cdc2220ce36fe2f892f067b483334610387aeb969511bd78a2d841a54851079cd676ac513d6a5ff75852514e languageName: node linkType: hard @@ -6620,12 +6799,15 @@ __metadata: languageName: node linkType: hard -"memfs@npm:^3.5.1": - version: 3.5.3 - resolution: "memfs@npm:3.5.3" +"memfs@npm:^4.6.0": + version: 4.6.0 + resolution: "memfs@npm:4.6.0" dependencies: - fs-monkey: ^1.0.4 - checksum: 18dfdeacad7c8047b976a6ccd58bc98ba76e122ad3ca0e50a21837fe2075fc0d9aafc58ab9cf2576c2b6889da1dd2503083f2364191b695273f40969db2ecc44 + json-joy: ^9.2.0 + thingies: ^1.11.1 + peerDependencies: + tslib: 2 + checksum: b32a35bee9f96dc011605f3bb39e74e6d2a5de51c952a77bb38a0dfabd3381c40ae382d27f385aa290edee8081597fb1a3b41a07bb3f775fd55312dc30ac1d9d languageName: node linkType: hard @@ -6941,12 +7123,12 @@ __metadata: linkType: hard "micromark-util-character@npm:^2.0.0": - version: 2.0.1 - resolution: "micromark-util-character@npm:2.0.1" + version: 2.1.0 + resolution: "micromark-util-character@npm:2.1.0" dependencies: micromark-util-symbol: ^2.0.0 micromark-util-types: ^2.0.0 - checksum: 318d6e16fdcbe9d89e18b8e7796568d986abbb10a9f3037b7ac9b92a236bcc962f3cd380e26a7c49df40fd1d9ca33eb546268956345b662f4c4ca4962c7695f2 + checksum: 36ee910f84077cf16626fa618cfe46ac25956b3242e3166b8e8e98c5a8c524af7e5bf3d70822264b1fd2d297a36104a7eb7e3462c19c28353eaca7b0d8717594 languageName: node linkType: hard @@ -6981,11 +7163,11 @@ __metadata: linkType: hard "micromark-util-decode-numeric-character-reference@npm:^2.0.0": - version: 2.0.0 - resolution: "micromark-util-decode-numeric-character-reference@npm:2.0.0" + version: 2.0.1 + resolution: "micromark-util-decode-numeric-character-reference@npm:2.0.1" dependencies: micromark-util-symbol: ^2.0.0 - checksum: 705715a2dd6f10d85c69371b4176a0b2fec5811a14f7d26f66f358ac5adebb12975f79597b1a1a184a6dcf6799319f7cf8eb91398e47c1faa2cab2c84f155b78 + checksum: 9512507722efd2033a9f08715eeef787fbfe27e23edf55db21423d46d82ab46f76c89b4f960be3f5e50a2d388d89658afc0647989cf256d051e9ea01277a1adb languageName: node linkType: hard @@ -7128,7 +7310,7 @@ __metadata: languageName: node linkType: hard -"mime-types@npm:^2.1.27": +"mime-types@npm:^2.1.12, mime-types@npm:^2.1.27": version: 2.1.35 resolution: "mime-types@npm:2.1.35" dependencies: @@ -7165,7 +7347,7 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": +"minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": version: 3.1.2 resolution: "minimatch@npm:3.1.2" dependencies: @@ -7210,12 +7392,12 @@ __metadata: languageName: node linkType: hard -"minipass-collect@npm:^1.0.2": - version: 1.0.2 - resolution: "minipass-collect@npm:1.0.2" +"minipass-collect@npm:^2.0.1": + version: 2.0.1 + resolution: "minipass-collect@npm:2.0.1" dependencies: - minipass: ^3.0.0 - checksum: 14df761028f3e47293aee72888f2657695ec66bd7d09cae7ad558da30415fdc4752bbfee66287dcc6fd5e6a2fa3466d6c484dc1cbd986525d9393b9523d97f10 + minipass: ^7.0.3 + checksum: b251bceea62090f67a6cced7a446a36f4cd61ee2d5cea9aee7fff79ba8030e416327a1c5aa2908dc22629d06214b46d88fdab8c51ac76bacbf5703851b5ad342 languageName: node linkType: hard @@ -7277,7 +7459,7 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.3": +"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3": version: 7.0.4 resolution: "minipass@npm:7.0.4" checksum: 87585e258b9488caf2e7acea242fd7856bbe9a2c84a7807643513a338d66f368c7d518200ad7b70a508664d408aa000517647b2930c259a8b1f9f0984f344a21 @@ -7295,9 +7477,9 @@ __metadata: linkType: hard "mixme@npm:^0.5.1": - version: 0.5.9 - resolution: "mixme@npm:0.5.9" - checksum: ec0e96b2fa099a051fe14477577e3da13f158690c64114a50ecd039694ca2cca1cb7c71a8755aaee8a3ef7229ef33408df822faa4d1d6123b52295eecf50620f + version: 0.5.10 + resolution: "mixme@npm:0.5.10" + checksum: 51885f19847b98859645a592917f3939d6f262ba3cc1843a3d7858ac894704b054e7a94737a53163bc1e870e3ea23316ba97d3ba20e1dfd292fe74d5a318be98 languageName: node linkType: hard @@ -7317,19 +7499,7 @@ __metadata: languageName: node linkType: hard -"mlly@npm:^1.2.0": - version: 1.4.2 - resolution: "mlly@npm:1.4.2" - dependencies: - acorn: ^8.10.0 - pathe: ^1.1.1 - pkg-types: ^1.0.3 - ufo: ^1.3.0 - checksum: ad0813eca133e59ac03b356b87deea57da96083dce7dda58a8eeb2dce92b7cc2315bedd9268f3ff8e98effe1867ddb1307486d4c5cd8be162daa8e0fa0a98ed4 - languageName: node - linkType: hard - -"mlly@npm:^1.4.2": +"mlly@npm:^1.2.0, mlly@npm:^1.4.2": version: 1.5.0 resolution: "mlly@npm:1.5.0" dependencies: @@ -7342,9 +7512,9 @@ __metadata: linkType: hard "moment@npm:^2.29.1": - version: 2.29.4 - resolution: "moment@npm:2.29.4" - checksum: 0ec3f9c2bcba38dc2451b1daed5daded747f17610b92427bebe1d08d48d8b7bdd8d9197500b072d14e326dd0ccf3e326b9e3d07c5895d3d49e39b6803b76e80e + version: 2.30.1 + resolution: "moment@npm:2.30.1" + checksum: 859236bab1e88c3e5802afcf797fc801acdbd0ee509d34ea3df6eea21eb6bcc2abd4ae4e4e64aa7c986aa6cba563c6e62806218e6412a765010712e5fa121ba6 languageName: node linkType: hard @@ -7355,7 +7525,7 @@ __metadata: languageName: node linkType: hard -"ms@npm:^2.0.0, ms@npm:^2.1.1": +"ms@npm:^2.1.1": version: 2.1.3 resolution: "ms@npm:2.1.3" checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d @@ -7380,16 +7550,7 @@ __metadata: languageName: node linkType: hard -"nanoid@npm:^3.3.6": - version: 3.3.6 - resolution: "nanoid@npm:3.3.6" - bin: - nanoid: bin/nanoid.cjs - checksum: 7d0eda657002738aa5206107bd0580aead6c95c460ef1bdd0b1a87a9c7ae6277ac2e9b945306aaa5b32c6dcb7feaf462d0f552e7f8b5718abfc6ead5c94a71b3 - languageName: node - linkType: hard - -"nanoid@npm:^3.3.7": +"nanoid@npm:^3.3.6, nanoid@npm:^3.3.7": version: 3.3.7 resolution: "nanoid@npm:3.3.7" bin: @@ -7572,11 +7733,11 @@ __metadata: linkType: hard "node-abi@npm:^3.3.0": - version: 3.51.0 - resolution: "node-abi@npm:3.51.0" + version: 3.54.0 + resolution: "node-abi@npm:3.54.0" dependencies: semver: ^7.3.5 - checksum: 3fabc9d58f0478767157560249f79c4a9e95082b96700cd8cc470f517bd566dbab82a37c862db3f78d3187be9f19f5cd9822b6f1b7ac7a3254fa70c3e3b38a83 + checksum: 260caae87299bb2fac6a269ba5dd378dbe1d99030396832fca7199b6cb5fd46556d2ec0d431f4a76ab2d53e49948047543afe3f1d70d0e6ebad04d33139650da languageName: node linkType: hard @@ -7604,30 +7765,29 @@ __metadata: linkType: hard "node-gyp@npm:latest": - version: 9.4.0 - resolution: "node-gyp@npm:9.4.0" + version: 10.0.1 + resolution: "node-gyp@npm:10.0.1" dependencies: env-paths: ^2.2.0 exponential-backoff: ^3.1.1 - glob: ^7.1.4 + glob: ^10.3.10 graceful-fs: ^4.2.6 - make-fetch-happen: ^11.0.3 - nopt: ^6.0.0 - npmlog: ^6.0.0 - rimraf: ^3.0.2 + make-fetch-happen: ^13.0.0 + nopt: ^7.0.0 + proc-log: ^3.0.0 semver: ^7.3.5 tar: ^6.1.2 - which: ^2.0.2 + which: ^4.0.0 bin: node-gyp: bin/node-gyp.js - checksum: 78b404e2e0639d64e145845f7f5a3cb20c0520cdaf6dda2f6e025e9b644077202ea7de1232396ba5bde3fee84cdc79604feebe6ba3ec84d464c85d407bb5da99 + checksum: 60a74e66d364903ce02049966303a57f898521d139860ac82744a5fdd9f7b7b3b61f75f284f3bfe6e6add3b8f1871ce305a1d41f775c7482de837b50c792223f languageName: node linkType: hard -"node-releases@npm:^2.0.13": - version: 2.0.13 - resolution: "node-releases@npm:2.0.13" - checksum: 17ec8f315dba62710cae71a8dad3cd0288ba943d2ece43504b3b1aa8625bf138637798ab470b1d9035b0545996f63000a8a926e0f6d35d0996424f8b6d36dda3 +"node-releases@npm:^2.0.14": + version: 2.0.14 + resolution: "node-releases@npm:2.0.14" + checksum: 59443a2f77acac854c42d321bf1b43dea0aef55cd544c6a686e9816a697300458d4e82239e2d794ea05f7bbbc8a94500332e2d3ac3f11f52e4b16cbe638b3c41 languageName: node linkType: hard @@ -7655,14 +7815,14 @@ __metadata: languageName: unknown linkType: soft -"nopt@npm:^6.0.0": - version: 6.0.0 - resolution: "nopt@npm:6.0.0" +"nopt@npm:^7.0.0": + version: 7.2.0 + resolution: "nopt@npm:7.2.0" dependencies: - abbrev: ^1.0.0 + abbrev: ^2.0.0 bin: nopt: bin/nopt.js - checksum: 82149371f8be0c4b9ec2f863cc6509a7fd0fa729929c009f3a58e4eb0c9e4cae9920e8f1f8eb46e7d032fec8fb01bede7f0f41a67eb3553b7b8e14fa53de1dac + checksum: a9c0f57fb8cb9cc82ae47192ca2b7ef00e199b9480eed202482c962d61b59a7fbe7541920b2a5839a97b42ee39e288c0aed770e38057a608d7f579389dfde410 languageName: node linkType: hard @@ -7710,18 +7870,6 @@ __metadata: languageName: node linkType: hard -"npmlog@npm:^6.0.0": - version: 6.0.2 - resolution: "npmlog@npm:6.0.2" - dependencies: - are-we-there-yet: ^3.0.0 - console-control-strings: ^1.1.0 - gauge: ^4.0.3 - set-blocking: ^2.0.0 - checksum: ae238cd264a1c3f22091cdd9e2b106f684297d3c184f1146984ecbe18aaa86343953f26b9520dedd1b1372bc0316905b736c1932d778dbeb1fcf5a1001390e2a - languageName: node - linkType: hard - "object-assign@npm:^4.0.1": version: 4.1.1 resolution: "object-assign@npm:4.1.1" @@ -7736,10 +7884,10 @@ __metadata: languageName: node linkType: hard -"object-inspect@npm:^1.12.3, object-inspect@npm:^1.9.0": - version: 1.13.0 - resolution: "object-inspect@npm:1.13.0" - checksum: 21353e910a3079466cb44adca71d8bef15bd8b87e518eb68bb33d82c5c70b83193993edce432cc92268f7dd02c4a8ab338663a011844367d0bd0559f6dde1fed +"object-inspect@npm:^1.13.1, object-inspect@npm:^1.9.0": + version: 1.13.1 + resolution: "object-inspect@npm:1.13.1" + checksum: 7d9fa9221de3311dcb5c7c307ee5dc011cdd31dc43624b7c184b3840514e118e05ef0002be5388304c416c0eb592feb46e983db12577fc47e47d5752fbbfb61f languageName: node linkType: hard @@ -7751,18 +7899,18 @@ __metadata: linkType: hard "object.assign@npm:^4.1.4": - version: 4.1.4 - resolution: "object.assign@npm:4.1.4" + version: 4.1.5 + resolution: "object.assign@npm:4.1.5" dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 + call-bind: ^1.0.5 + define-properties: ^1.2.1 has-symbols: ^1.0.3 object-keys: ^1.1.1 - checksum: 76cab513a5999acbfe0ff355f15a6a125e71805fcf53de4e9d4e082e1989bdb81d1e329291e1e4e0ae7719f0e4ef80e88fb2d367ae60500d79d25a6224ac8864 + checksum: f9aeac0541661370a1fc86e6a8065eb1668d3e771f7dbb33ee54578201336c057b21ee61207a186dd42db0c62201d91aac703d20d12a79fc79c353eed44d4e25 languageName: node linkType: hard -"object.fromentries@npm:^2.0.6": +"object.fromentries@npm:^2.0.7": version: 2.0.7 resolution: "object.fromentries@npm:2.0.7" dependencies: @@ -7773,7 +7921,7 @@ __metadata: languageName: node linkType: hard -"object.groupby@npm:^1.0.0": +"object.groupby@npm:^1.0.1": version: 1.0.1 resolution: "object.groupby@npm:1.0.1" dependencies: @@ -7785,7 +7933,7 @@ __metadata: languageName: node linkType: hard -"object.values@npm:^1.1.6": +"object.values@npm:^1.1.7": version: 1.1.7 resolution: "object.values@npm:1.1.7" dependencies: @@ -8081,14 +8229,7 @@ __metadata: languageName: node linkType: hard -"pathe@npm:^1.1.0, pathe@npm:^1.1.1": - version: 1.1.1 - resolution: "pathe@npm:1.1.1" - checksum: 34ab3da2e5aa832ebc6a330ffe3f73d7ba8aec6e899b53b8ec4f4018de08e40742802deb12cf5add9c73b7bf719b62c0778246bd376ca62b0fb23e0dde44b759 - languageName: node - linkType: hard - -"pathe@npm:^1.1.2": +"pathe@npm:^1.1.0, pathe@npm:^1.1.1, pathe@npm:^1.1.2": version: 1.1.2 resolution: "pathe@npm:1.1.2" checksum: ec5f778d9790e7b9ffc3e4c1df39a5bb1ce94657a4e3ad830c1276491ca9d79f189f47609884671db173400256b005f4955f7952f52a2aeb5834ad5fb4faf134 @@ -8193,11 +8334,11 @@ __metadata: linkType: hard "postcss-load-config@npm:^4.0.1": - version: 4.0.1 - resolution: "postcss-load-config@npm:4.0.1" + version: 4.0.2 + resolution: "postcss-load-config@npm:4.0.2" dependencies: - lilconfig: ^2.0.5 - yaml: ^2.1.1 + lilconfig: ^3.0.0 + yaml: ^2.3.4 peerDependencies: postcss: ">=8.0.9" ts-node: ">=9.0.0" @@ -8206,7 +8347,7 @@ __metadata: optional: true ts-node: optional: true - checksum: b61f890499ed7dcda1e36c20a9582b17d745bad5e2b2c7bc96942465e406bc43ae03f270c08e60d1e29dab1ee50cb26970b5eb20c9aae30e066e20bd607ae4e4 + checksum: 7c27dd3801db4eae207a5116fed2db6b1ebb780b40c3dd62a3e57e087093a8e6a14ee17ada729fee903152d6ef4826c6339eb135bee6208e0f3140d7e8090185 languageName: node linkType: hard @@ -8222,12 +8363,12 @@ __metadata: linkType: hard "postcss-selector-parser@npm:^6.0.11": - version: 6.0.13 - resolution: "postcss-selector-parser@npm:6.0.13" + version: 6.0.15 + resolution: "postcss-selector-parser@npm:6.0.15" dependencies: cssesc: ^3.0.0 util-deprecate: ^1.0.2 - checksum: f89163338a1ce3b8ece8e9055cd5a3165e79a15e1c408e18de5ad8f87796b61ec2d48a2902d179ae0c4b5de10fccd3a325a4e660596549b040bc5ad1b465f096 + checksum: 57decb94152111004f15e27b9c61131eb50ee10a3288e7fcf424cebbb4aba82c2817517ae718f8b5d704ee9e02a638d4a2acff8f47685c295a33ecee4fd31055 languageName: node linkType: hard @@ -8238,7 +8379,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:8.4.31, postcss@npm:^8.4.23, postcss@npm:^8.4.24": +"postcss@npm:8.4.31": version: 8.4.31 resolution: "postcss@npm:8.4.31" dependencies: @@ -8249,7 +8390,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.4.32": +"postcss@npm:^8.4.23, postcss@npm:^8.4.24, postcss@npm:^8.4.32": version: 8.4.33 resolution: "postcss@npm:8.4.33" dependencies: @@ -8330,6 +8471,13 @@ __metadata: languageName: node linkType: hard +"proc-log@npm:^3.0.0": + version: 3.0.0 + resolution: "proc-log@npm:3.0.0" + checksum: 02b64e1b3919e63df06f836b98d3af002b5cd92655cab18b5746e37374bfb73e03b84fe305454614b34c25b485cc687a9eebdccf0242cda8fda2475dd2c97e02 + languageName: node + linkType: hard + "promise-retry@npm:^2.0.1": version: 2.0.1 resolution: "promise-retry@npm:2.0.1" @@ -8341,13 +8489,13 @@ __metadata: linkType: hard "property-information@npm:^6.0.0": - version: 6.3.0 - resolution: "property-information@npm:6.3.0" - checksum: bf0a15dec097fd4324a42163cabd96b90819e48ef0d8d98756ef0420b2c579bf33646fe0b6e04aa9e79f5a2b5b5860ef11655a79cd8969d8eda58df23c4f96c9 + version: 6.4.1 + resolution: "property-information@npm:6.4.1" + checksum: d9eece5f14b6fea9e6a1fa65fba88554956a58825eb9a5c8327bffee06bcc265117eaeae901871e8e8a5caec8d5e05ce39ab6872d5cef3b49a6f07815b6ef285 languageName: node linkType: hard -"protobufjs@npm:^7.2.3": +"protobufjs@npm:^7.2.3, protobufjs@npm:^7.2.4": version: 7.2.6 resolution: "protobufjs@npm:7.2.6" dependencies: @@ -8367,23 +8515,10 @@ __metadata: languageName: node linkType: hard -"protobufjs@npm:^7.2.4": - version: 7.2.5 - resolution: "protobufjs@npm:7.2.5" - dependencies: - "@protobufjs/aspromise": ^1.1.2 - "@protobufjs/base64": ^1.1.2 - "@protobufjs/codegen": ^2.0.4 - "@protobufjs/eventemitter": ^1.1.0 - "@protobufjs/fetch": ^1.1.0 - "@protobufjs/float": ^1.0.2 - "@protobufjs/inquire": ^1.1.0 - "@protobufjs/path": ^1.1.2 - "@protobufjs/pool": ^1.1.0 - "@protobufjs/utf8": ^1.1.0 - "@types/node": ">=13.7.0" - long: ^5.0.0 - checksum: 3770a072114061faebbb17cfd135bc4e187b66bc6f40cd8bac624368b0270871ec0cfb43a02b9fb4f029c8335808a840f1afba3c2e7ede7063b98ae6b98a703f +"proxy-from-env@npm:^1.1.0": + version: 1.1.0 + resolution: "proxy-from-env@npm:1.1.0" + checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4 languageName: node linkType: hard @@ -8405,13 +8540,13 @@ __metadata: linkType: hard "punycode@npm:^2.1.0": - version: 2.3.0 - resolution: "punycode@npm:2.3.0" - checksum: 39f760e09a2a3bbfe8f5287cf733ecdad69d6af2fe6f97ca95f24b8921858b91e9ea3c9eeec6e08cede96181b3bb33f95c6ffd8c77e63986508aa2e8159fa200 + version: 2.3.1 + resolution: "punycode@npm:2.3.1" + checksum: bb0a0ceedca4c3c57a9b981b90601579058903c62be23c5e8e843d2c2d4148a3ecf029d5133486fb0e1822b098ba8bba09e89d6b21742d02fa26bda6441a6fb2 languageName: node linkType: hard -"qs@npm:^6.9.4": +"qs@npm:^6.11.2, qs@npm:^6.9.4": version: 6.11.2 resolution: "qs@npm:6.11.2" dependencies: @@ -8536,7 +8671,7 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0": +"readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0": version: 3.6.2 resolution: "readable-stream@npm:3.6.2" dependencies: @@ -8585,9 +8720,9 @@ __metadata: linkType: hard "regenerator-runtime@npm:^0.14.0": - version: 0.14.0 - resolution: "regenerator-runtime@npm:0.14.0" - checksum: 1c977ad82a82a4412e4f639d65d22be376d3ebdd30da2c003eeafdaaacd03fc00c2320f18120007ee700900979284fc78a9f00da7fb593f6e6eeebc673fba9a3 + version: 0.14.1 + resolution: "regenerator-runtime@npm:0.14.1" + checksum: 9f57c93277b5585d3c83b0cf76be47b473ae8c6d9142a46ce8b0291a04bb2cf902059f0f8445dcabb3fb7378e5fe4bb4ea1e008876343d42e46d3b484534ce38 languageName: node linkType: hard @@ -8686,20 +8821,7 @@ __metadata: languageName: node linkType: hard -"remark-rehype@npm:^11.0.0": - version: 11.0.0 - resolution: "remark-rehype@npm:11.0.0" - dependencies: - "@types/hast": ^3.0.0 - "@types/mdast": ^4.0.0 - mdast-util-to-hast: ^13.0.0 - unified: ^11.0.0 - vfile: ^6.0.0 - checksum: 0ff0fd948759cbde9d507ca1581028d0b89da0b5f610b35a6cb0a511f8d11621449b6eca573b11ddaea77afd37edd4755f3f1eb086ad49a6f7b970b4a4634e13 - languageName: node - linkType: hard - -"remark-rehype@npm:^11.1.0": +"remark-rehype@npm:^11.0.0, remark-rehype@npm:^11.1.0": version: 11.1.0 resolution: "remark-rehype@npm:11.1.0" dependencies: @@ -8809,9 +8931,9 @@ __metadata: linkType: hard "rfdc@npm:^1.3.0": - version: 1.3.0 - resolution: "rfdc@npm:1.3.0" - checksum: fb2ba8512e43519983b4c61bd3fa77c0f410eff6bae68b08614437bc3f35f91362215f7b4a73cbda6f67330b5746ce07db5dd9850ad3edc91271ad6deea0df32 + version: 1.3.1 + resolution: "rfdc@npm:1.3.1" + checksum: d5d1e930aeac7e0e0a485f97db1356e388bdbeff34906d206fe524dd5ada76e95f186944d2e68307183fdc39a54928d4426bbb6734851692cfe9195efba58b79 languageName: node linkType: hard @@ -8906,14 +9028,14 @@ __metadata: linkType: hard "safe-array-concat@npm:^1.0.1": - version: 1.0.1 - resolution: "safe-array-concat@npm:1.0.1" + version: 1.1.0 + resolution: "safe-array-concat@npm:1.1.0" dependencies: - call-bind: ^1.0.2 - get-intrinsic: ^1.2.1 + call-bind: ^1.0.5 + get-intrinsic: ^1.2.2 has-symbols: ^1.0.3 isarray: ^2.0.5 - checksum: 001ecf1d8af398251cbfabaf30ed66e3855127fbceee178179524b24160b49d15442f94ed6c0db0b2e796da76bb05b73bf3cc241490ec9c2b741b41d33058581 + checksum: 5c71eaa999168ee7474929f1cd3aae80f486353a651a094d9968936692cf90aa065224929a6486dcda66334a27dce4250a83612f9e0fef6dced1a925d3ac7296 languageName: node linkType: hard @@ -8925,13 +9047,13 @@ __metadata: linkType: hard "safe-regex-test@npm:^1.0.0": - version: 1.0.0 - resolution: "safe-regex-test@npm:1.0.0" + version: 1.0.2 + resolution: "safe-regex-test@npm:1.0.2" dependencies: - call-bind: ^1.0.2 - get-intrinsic: ^1.1.3 + call-bind: ^1.0.5 + get-intrinsic: ^1.2.2 is-regex: ^1.1.4 - checksum: bc566d8beb8b43c01b94e67de3f070fd2781685e835959bbbaaec91cc53381145ca91f69bd837ce6ec244817afa0a5e974fc4e40a2957f0aca68ac3add1ddd34 + checksum: 4af5ce05a2daa4f6d4bfd5a3c64fc33d6b886f6592122e93c0efad52f7147b9b605e5ffc03c269a1e3d1f8db2a23bc636628a961c9fd65bafdc09503330673fd languageName: node linkType: hard @@ -9002,11 +9124,11 @@ __metadata: linkType: hard "serialize-javascript@npm:^6.0.1": - version: 6.0.1 - resolution: "serialize-javascript@npm:6.0.1" + version: 6.0.2 + resolution: "serialize-javascript@npm:6.0.2" dependencies: randombytes: ^2.1.0 - checksum: 3c4f4cb61d0893b988415bdb67243637333f3f574e9e9cc9a006a2ced0b390b0b3b44aef8d51c951272a9002ec50885eefdc0298891bc27eb2fe7510ea87dc4f + checksum: c4839c6206c1d143c0f80763997a361310305751171dd95e4b57efee69b8f6edd8960a0b7fbfc45042aadff98b206d55428aee0dc276efe54f100899c7fa8ab7 languageName: node linkType: hard @@ -9017,6 +9139,19 @@ __metadata: languageName: node linkType: hard +"set-function-length@npm:^1.1.1": + version: 1.2.0 + resolution: "set-function-length@npm:1.2.0" + dependencies: + define-data-property: ^1.1.1 + function-bind: ^1.1.2 + get-intrinsic: ^1.2.2 + gopd: ^1.0.1 + has-property-descriptors: ^1.0.1 + checksum: 63e34b45a2ff9abb419f52583481bf8ba597d33c0c85e56999085eb6078a0f7fbb4222051981c287feceeb358aa7789e7803cea2c82ac94c0ab37059596aff79 + languageName: node + linkType: hard + "set-function-name@npm:^2.0.0": version: 2.0.1 resolution: "set-function-name@npm:2.0.1" @@ -9028,7 +9163,76 @@ __metadata: languageName: node linkType: hard -"sharp@npm:*, sharp@npm:^0.32.1": +"sharp@npm:*": + version: 0.33.2 + resolution: "sharp@npm:0.33.2" + dependencies: + "@img/sharp-darwin-arm64": 0.33.2 + "@img/sharp-darwin-x64": 0.33.2 + "@img/sharp-libvips-darwin-arm64": 1.0.1 + "@img/sharp-libvips-darwin-x64": 1.0.1 + "@img/sharp-libvips-linux-arm": 1.0.1 + "@img/sharp-libvips-linux-arm64": 1.0.1 + "@img/sharp-libvips-linux-s390x": 1.0.1 + "@img/sharp-libvips-linux-x64": 1.0.1 + "@img/sharp-libvips-linuxmusl-arm64": 1.0.1 + "@img/sharp-libvips-linuxmusl-x64": 1.0.1 + "@img/sharp-linux-arm": 0.33.2 + "@img/sharp-linux-arm64": 0.33.2 + "@img/sharp-linux-s390x": 0.33.2 + "@img/sharp-linux-x64": 0.33.2 + "@img/sharp-linuxmusl-arm64": 0.33.2 + "@img/sharp-linuxmusl-x64": 0.33.2 + "@img/sharp-wasm32": 0.33.2 + "@img/sharp-win32-ia32": 0.33.2 + "@img/sharp-win32-x64": 0.33.2 + color: ^4.2.3 + detect-libc: ^2.0.2 + semver: ^7.5.4 + dependenciesMeta: + "@img/sharp-darwin-arm64": + optional: true + "@img/sharp-darwin-x64": + optional: true + "@img/sharp-libvips-darwin-arm64": + optional: true + "@img/sharp-libvips-darwin-x64": + optional: true + "@img/sharp-libvips-linux-arm": + optional: true + "@img/sharp-libvips-linux-arm64": + optional: true + "@img/sharp-libvips-linux-s390x": + optional: true + "@img/sharp-libvips-linux-x64": + optional: true + "@img/sharp-libvips-linuxmusl-arm64": + optional: true + "@img/sharp-libvips-linuxmusl-x64": + optional: true + "@img/sharp-linux-arm": + optional: true + "@img/sharp-linux-arm64": + optional: true + "@img/sharp-linux-s390x": + optional: true + "@img/sharp-linux-x64": + optional: true + "@img/sharp-linuxmusl-arm64": + optional: true + "@img/sharp-linuxmusl-x64": + optional: true + "@img/sharp-wasm32": + optional: true + "@img/sharp-win32-ia32": + optional: true + "@img/sharp-win32-x64": + optional: true + checksum: 3d294619d7322f292faabd4aea7192c87c59210eb29c5c507d1b092975ff83e48f084f2bf59dd8050182f665fa118f99e4de9df551b757c45c2859b12d8ccb44 + languageName: node + linkType: hard + +"sharp@npm:^0.32.1": version: 0.32.6 resolution: "sharp@npm:0.32.6" dependencies: @@ -9108,7 +9312,7 @@ __metadata: languageName: node linkType: hard -"signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.7": +"signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2": version: 3.0.7 resolution: "signal-exit@npm:3.0.7" checksum: a2f098f247adc367dffc27845853e9959b9e88b01cb301658cfe4194352d8d2bb32e18467c786a7fe15f1d44b233ea35633d076d5e737870b7139949d1ab6318 @@ -9200,18 +9404,18 @@ __metadata: languageName: node linkType: hard -"socks-proxy-agent@npm:^7.0.0": - version: 7.0.0 - resolution: "socks-proxy-agent@npm:7.0.0" +"socks-proxy-agent@npm:^8.0.1": + version: 8.0.2 + resolution: "socks-proxy-agent@npm:8.0.2" dependencies: - agent-base: ^6.0.2 - debug: ^4.3.3 - socks: ^2.6.2 - checksum: 720554370154cbc979e2e9ce6a6ec6ced205d02757d8f5d93fe95adae454fc187a5cbfc6b022afab850a5ce9b4c7d73e0f98e381879cf45f66317a4895953846 + agent-base: ^7.0.2 + debug: ^4.3.4 + socks: ^2.7.1 + checksum: 4fb165df08f1f380881dcd887b3cdfdc1aba3797c76c1e9f51d29048be6e494c5b06d68e7aea2e23df4572428f27a3ec22b3d7c75c570c5346507433899a4b6d languageName: node linkType: hard -"socks@npm:^2.6.2": +"socks@npm:^2.7.1": version: 2.7.1 resolution: "socks@npm:2.7.1" dependencies: @@ -9280,9 +9484,9 @@ __metadata: linkType: hard "spdx-exceptions@npm:^2.1.0": - version: 2.3.0 - resolution: "spdx-exceptions@npm:2.3.0" - checksum: cb69a26fa3b46305637123cd37c85f75610e8c477b6476fa7354eb67c08128d159f1d36715f19be6f9daf4b680337deb8c65acdcae7f2608ba51931540687ac0 + version: 2.4.0 + resolution: "spdx-exceptions@npm:2.4.0" + checksum: b1b650a8d94424473bf9629cf972c86a91c03cccc260f5c901bce0e4b92d831627fec28c9e0a1e9c34c5ebad0a12cf2eab887bec088e0a862abb9d720c2fd0a1 languageName: node linkType: hard @@ -9350,16 +9554,16 @@ __metadata: linkType: hard "streamx@npm:^2.15.0": - version: 2.15.1 - resolution: "streamx@npm:2.15.1" + version: 2.15.7 + resolution: "streamx@npm:2.15.7" dependencies: fast-fifo: ^1.1.0 queue-tick: ^1.0.1 - checksum: 6f2b4fed68caacd28efbd44d4264f5d3c2b81b0a5de14419333dac57f2075c49ae648df8d03db632a33587a6c8ab7cb9cdb4f9a2f8305be0c2cd79af35742b15 + checksum: 5ad414e3602cb47c911712523585c5d918900b393051fbde8e294e21c22ea44b88a52b2196319a239c616fa5e324f70b6be30d6a53182a718613d4ed594f1a44 languageName: node linkType: hard -"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3": +"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3": version: 4.2.3 resolution: "string-width@npm:4.2.3" dependencies: @@ -9565,12 +9769,12 @@ __metadata: linkType: hard "sucrase@npm:^3.32.0": - version: 3.34.0 - resolution: "sucrase@npm:3.34.0" + version: 3.35.0 + resolution: "sucrase@npm:3.35.0" dependencies: "@jridgewell/gen-mapping": ^0.3.2 commander: ^4.0.0 - glob: 7.1.6 + glob: ^10.3.10 lines-and-columns: ^1.1.6 mz: ^2.7.0 pirates: ^4.0.1 @@ -9578,7 +9782,7 @@ __metadata: bin: sucrase: bin/sucrase sucrase-node: bin/sucrase-node - checksum: 61860063bdf6103413698e13247a3074d25843e91170825a9752e4af7668ffadd331b6e99e92fc32ee5b3c484ee134936f926fa9039d5711fafff29d017a2110 + checksum: 9fc5792a9ab8a14dcf9c47dcb704431d35c1cdff1d17d55d382a31c2e8e3063870ad32ce120a80915498486246d612e30cda44f1624d9d9a10423e1a43487ad1 languageName: node linkType: hard @@ -9617,18 +9821,18 @@ __metadata: linkType: hard "tailwindcss@npm:^3.3.2": - version: 3.3.3 - resolution: "tailwindcss@npm:3.3.3" + version: 3.4.1 + resolution: "tailwindcss@npm:3.4.1" dependencies: "@alloc/quick-lru": ^5.2.0 arg: ^5.0.2 chokidar: ^3.5.3 didyoumean: ^1.2.2 dlv: ^1.1.3 - fast-glob: ^3.2.12 + fast-glob: ^3.3.0 glob-parent: ^6.0.2 is-glob: ^4.0.3 - jiti: ^1.18.2 + jiti: ^1.19.1 lilconfig: ^2.1.0 micromatch: ^4.0.5 normalize-path: ^3.0.0 @@ -9645,7 +9849,7 @@ __metadata: bin: tailwind: lib/cli.js tailwindcss: lib/cli.js - checksum: 0195c7a3ebb0de5e391d2a883d777c78a4749f0c532d204ee8aea9129f2ed8e701d8c0c276aa5f7338d07176a3c2a7682c1d0ab9c8a6c2abe6d9325c2954eb50 + checksum: ef5a587dd32bb4e91e1549ead6162f85f0b78d3e6ffd8b4e8eeb15585b7b886cb3af6ae9df5092ed8ccb7e590608d1b3eec79ca08c862b07cd9ff7e72f73104b languageName: node linkType: hard @@ -9693,13 +9897,13 @@ __metadata: linkType: hard "tar-stream@npm:^3.1.5": - version: 3.1.6 - resolution: "tar-stream@npm:3.1.6" + version: 3.1.7 + resolution: "tar-stream@npm:3.1.7" dependencies: b4a: ^1.6.4 fast-fifo: ^1.2.0 streamx: ^2.15.0 - checksum: f3627f918581976e954ff03cb8d370551053796b82564f8c7ca8fac84c48e4d042026d0854fc222171a34ff9c682b72fae91be9c9b0a112d4c54f9e4f443e9c5 + checksum: 6393a6c19082b17b8dcc8e7fd349352bb29b4b8bfe1075912b91b01743ba6bb4298f5ff0b499a3bbaf82121830e96a1a59d4f21a43c0df339e54b01789cb8cc6 languageName: node linkType: hard @@ -9733,15 +9937,15 @@ __metadata: languageName: node linkType: hard -"terser-webpack-plugin@npm:^5.3.7": - version: 5.3.9 - resolution: "terser-webpack-plugin@npm:5.3.9" +"terser-webpack-plugin@npm:^5.3.10": + version: 5.3.10 + resolution: "terser-webpack-plugin@npm:5.3.10" dependencies: - "@jridgewell/trace-mapping": ^0.3.17 + "@jridgewell/trace-mapping": ^0.3.20 jest-worker: ^27.4.5 schema-utils: ^3.1.1 serialize-javascript: ^6.0.1 - terser: ^5.16.8 + terser: ^5.26.0 peerDependencies: webpack: ^5.1.0 peerDependenciesMeta: @@ -9751,13 +9955,13 @@ __metadata: optional: true uglify-js: optional: true - checksum: 41705713d6f9cb83287936b21e27c658891c78c4392159f5148b5623f0e8c48559869779619b058382a4c9758e7820ea034695e57dc7c474b4962b79f553bc5f + checksum: bd6e7596cf815f3353e2a53e79cbdec959a1b0276f5e5d4e63e9d7c3c5bb5306df567729da287d1c7b39d79093e56863c569c42c6c24cc34c76aa313bd2cbcea languageName: node linkType: hard -"terser@npm:^5.16.8": - version: 5.22.0 - resolution: "terser@npm:5.22.0" +"terser@npm:^5.26.0": + version: 5.27.0 + resolution: "terser@npm:5.27.0" dependencies: "@jridgewell/source-map": ^0.3.3 acorn: ^8.8.2 @@ -9765,7 +9969,7 @@ __metadata: source-map-support: ~0.5.20 bin: terser: bin/terser - checksum: ee95981c54ebd381e0b7f5872c646e7a05543e53960f8e0c2f240863c368989d43a3ca80b7e9f691683c92ba199eb4b91d61785fef0b9ca4a887eb55866001f4 + checksum: c165052cfea061e8512e9b9ba42a098c2ff6382886ae122b040fd5b6153443070cc2dcb4862269f1669c09c716763e856125a355ff984aa72be525d6fffd8729 languageName: node linkType: hard @@ -9794,6 +9998,15 @@ __metadata: languageName: node linkType: hard +"thingies@npm:^1.11.1": + version: 1.16.0 + resolution: "thingies@npm:1.16.0" + peerDependencies: + tslib: ^2 + checksum: 9afbe70a9777fc31ac2567d06c9f64511585437298948330c39c076c6bd54bae6a700dee4cf4074486ef26c83f51031241ef4f4309c386555fb016a93be8aa06 + languageName: node + linkType: hard + "through@npm:^2.3.6, through@npm:^2.3.8": version: 2.3.8 resolution: "through@npm:2.3.8" @@ -9883,8 +10096,8 @@ __metadata: linkType: hard "ts-node@npm:^10.9.1": - version: 10.9.1 - resolution: "ts-node@npm:10.9.1" + version: 10.9.2 + resolution: "ts-node@npm:10.9.2" dependencies: "@cspotcode/source-map-support": ^0.8.0 "@tsconfig/node10": ^1.0.7 @@ -9916,7 +10129,7 @@ __metadata: ts-node-script: dist/bin-script.js ts-node-transpile-only: dist/bin-transpile.js ts-script: dist/bin-script-deprecated.js - checksum: 090adff1302ab20bd3486e6b4799e90f97726ed39e02b39e566f8ab674fd5bd5f727f43615debbfc580d33c6d9d1c6b1b3ce7d8e3cca3e20530a145ffa232c35 + checksum: fde256c9073969e234526e2cfead42591b9a2aec5222bac154b0de2fa9e4ceb30efcd717ee8bc785a56f3a119bdd5aa27b333d9dbec94ed254bd26f8944c67ac languageName: node linkType: hard @@ -9946,15 +10159,15 @@ __metadata: languageName: node linkType: hard -"tsconfig-paths@npm:^3.14.2": - version: 3.14.2 - resolution: "tsconfig-paths@npm:3.14.2" +"tsconfig-paths@npm:^3.15.0": + version: 3.15.0 + resolution: "tsconfig-paths@npm:3.15.0" dependencies: "@types/json5": ^0.0.29 json5: ^1.0.2 minimist: ^1.2.6 strip-bom: ^3.0.0 - checksum: a6162eaa1aed680537f93621b82399c7856afd10ec299867b13a0675e981acac4e0ec00896860480efc59fc10fd0b16fdc928c0b885865b52be62cadac692447 + checksum: 59f35407a390d9482b320451f52a411a256a130ff0e7543d18c6f20afab29ac19fbe55c360a93d6476213cc335a4d76ce90f67df54c4e9037f7d240920832201 languageName: node linkType: hard @@ -10073,14 +10286,7 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^2.5.3": - version: 2.19.0 - resolution: "type-fest@npm:2.19.0" - checksum: a4ef07ece297c9fba78fc1bd6d85dff4472fe043ede98bd4710d2615d15776902b595abf62bd78339ed6278f021235fb28a96361f8be86ed754f778973a0d278 - languageName: node - linkType: hard - -"type-fest@npm:^4.10.0": +"type-fest@npm:^4.0.0, type-fest@npm:^4.10.0": version: 4.10.2 resolution: "type-fest@npm:4.10.2" checksum: ef75736d51c10a885f955c07aed8f46103a8c9ae93742a75fbbdf023dd0e7169c524ebef292f37de19806051fb1bdd96c4098a0101c5f869f80db73bcb484bb1 @@ -10145,12 +10351,12 @@ __metadata: linkType: hard "typescript@npm:^5.1.6": - version: 5.2.2 - resolution: "typescript@npm:5.2.2" + version: 5.3.3 + resolution: "typescript@npm:5.3.3" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 7912821dac4d962d315c36800fe387cdc0a6298dba7ec171b350b4a6e988b51d7b8f051317786db1094bd7431d526b648aba7da8236607febb26cf5b871d2d3c + checksum: 2007ccb6e51bbbf6fde0a78099efe04dc1c3dfbdff04ca3b6a8bc717991862b39fd6126c0c3ebf2d2d98ac5e960bcaa873826bb2bb241f14277034148f41f6a2 languageName: node linkType: hard @@ -10165,19 +10371,12 @@ __metadata: linkType: hard "typescript@patch:typescript@^5.1.6#~builtin": - version: 5.2.2 - resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin::version=5.2.2&hash=a1c5e5" + version: 5.3.3 + resolution: "typescript@patch:typescript@npm%3A5.3.3#~builtin::version=5.3.3&hash=a1c5e5" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 07106822b4305de3f22835cbba949a2b35451cad50888759b6818421290ff95d522b38ef7919e70fb381c5fe9c1c643d7dea22c8b31652a717ddbd57b7f4d554 - languageName: node - linkType: hard - -"ufo@npm:^1.3.0": - version: 1.3.1 - resolution: "ufo@npm:1.3.1" - checksum: 2db2f9d24e3f572ddb9b2f4415eda679fd366cbb9eec4c56996651323737f17528b4aab2bb45c5f2effff2304f9b0c46e0981aee3e48f38ac51106a8993dff31 + checksum: f61375590b3162599f0f0d5b8737877ac0a7bc52761dbb585d67e7b8753a3a4c42d9a554c4cc929f591ffcf3a2b0602f65ae3ce74714fd5652623a816862b610 languageName: node linkType: hard @@ -10200,29 +10399,14 @@ __metadata: languageName: node linkType: hard -"undici-types@npm:~5.25.1": - version: 5.25.3 - resolution: "undici-types@npm:5.25.3" - checksum: ec9d2cc36520cbd9fbe3b3b6c682a87fe5be214699e1f57d1e3d9a2cb5be422e62735f06e0067dc325fd3dd7404c697e4d479f9147dc8a804e049e29f357f2ff - languageName: node - linkType: hard - -"unified@npm:^11.0.0": - version: 11.0.3 - resolution: "unified@npm:11.0.3" - dependencies: - "@types/unist": ^3.0.0 - bail: ^2.0.0 - devlop: ^1.0.0 - extend: ^3.0.0 - is-plain-obj: ^4.0.0 - trough: ^2.0.0 - vfile: ^6.0.0 - checksum: 402d6b397b98f8966993faca0e1480f5f1825cc44df6a5236b75ab099f14b10ed808e578155c3f535e60676c12ee3f52346ca08d64343a72181d7a6b4d32011d +"undici-types@npm:~5.26.4": + version: 5.26.5 + resolution: "undici-types@npm:5.26.5" + checksum: 3192ef6f3fd5df652f2dc1cd782b49d6ff14dc98e5dced492aa8a8c65425227da5da6aafe22523c67f035a272c599bb89cfe803c1db6311e44bed3042fc25487 languageName: node linkType: hard -"unified@npm:^11.0.4": +"unified@npm:^11.0.0, unified@npm:^11.0.4": version: 11.0.4 resolution: "unified@npm:11.0.4" dependencies: @@ -10323,9 +10507,9 @@ __metadata: linkType: hard "universal-user-agent@npm:^6.0.0": - version: 6.0.0 - resolution: "universal-user-agent@npm:6.0.0" - checksum: 5092bbc80dd0d583cef0b62c17df0043193b74f425112ea6c1f69bc5eda21eeec7a08d8c4f793a277eb2202ffe9b44bec852fa3faff971234cd209874d1b79ef + version: 6.0.1 + resolution: "universal-user-agent@npm:6.0.1" + checksum: fdc8e1ae48a05decfc7ded09b62071f571c7fe0bd793d700704c80cea316101d4eac15cc27ed2bb64f4ce166d2684777c3198b9ab16034f547abea0d3aa1c93c languageName: node linkType: hard @@ -10337,9 +10521,9 @@ __metadata: linkType: hard "universalify@npm:^2.0.0": - version: 2.0.0 - resolution: "universalify@npm:2.0.0" - checksum: 2406a4edf4a8830aa6813278bab1f953a8e40f2f63a37873ffa9a3bc8f9745d06cc8e88f3572cb899b7e509013f7f6fcc3e37e8a6d914167a5381d8440518c44 + version: 2.0.1 + resolution: "universalify@npm:2.0.1" + checksum: ecd8469fe0db28e7de9e5289d32bd1b6ba8f7183db34f3bfc4ca53c49891c2d6aa05f3fb3936a81285a905cc509fb641a0c3fc131ec786167eff41236ae32e60 languageName: node linkType: hard @@ -10577,17 +10761,17 @@ __metadata: linkType: hard "webpack@npm:^5.88.1": - version: 5.89.0 - resolution: "webpack@npm:5.89.0" + version: 5.90.1 + resolution: "webpack@npm:5.90.1" dependencies: "@types/eslint-scope": ^3.7.3 - "@types/estree": ^1.0.0 + "@types/estree": ^1.0.5 "@webassemblyjs/ast": ^1.11.5 "@webassemblyjs/wasm-edit": ^1.11.5 "@webassemblyjs/wasm-parser": ^1.11.5 acorn: ^8.7.1 acorn-import-assertions: ^1.9.0 - browserslist: ^4.14.5 + browserslist: ^4.21.10 chrome-trace-event: ^1.0.2 enhanced-resolve: ^5.15.0 es-module-lexer: ^1.2.1 @@ -10601,7 +10785,7 @@ __metadata: neo-async: ^2.6.2 schema-utils: ^3.2.0 tapable: ^2.1.1 - terser-webpack-plugin: ^5.3.7 + terser-webpack-plugin: ^5.3.10 watchpack: ^2.4.0 webpack-sources: ^3.2.3 peerDependenciesMeta: @@ -10609,7 +10793,7 @@ __metadata: optional: true bin: webpack: bin/webpack.js - checksum: 43fe0dbc30e168a685ef5a86759d5016a705f6563b39a240aa00826a80637d4a3deeb8062e709d6a4b05c63e796278244c84b04174704dc4a37bedb0f565c5ed + checksum: a7be844d5720a0c6282fec012e6fa34b1137dff953c5d48bf2ef066a6c27c1dbc92a9b9effc05ee61c9fe269499266db9782073f2d82a589d3c5c966ffc56584 languageName: node linkType: hard @@ -10653,16 +10837,16 @@ __metadata: languageName: node linkType: hard -"which-typed-array@npm:^1.1.11": - version: 1.1.11 - resolution: "which-typed-array@npm:1.1.11" +"which-typed-array@npm:^1.1.13, which-typed-array@npm:^1.1.14": + version: 1.1.14 + resolution: "which-typed-array@npm:1.1.14" dependencies: - available-typed-arrays: ^1.0.5 - call-bind: ^1.0.2 + available-typed-arrays: ^1.0.6 + call-bind: ^1.0.5 for-each: ^0.3.3 gopd: ^1.0.1 - has-tostringtag: ^1.0.0 - checksum: 711ffc8ef891ca6597b19539075ec3e08bb9b4c2ca1f78887e3c07a977ab91ac1421940505a197758fb5939aa9524976d0a5bbcac34d07ed6faa75cedbb17206 + has-tostringtag: ^1.0.1 + checksum: efe30c143c58630dde8ab96f9330e20165bacd77ca843c602b510120a415415573bcdef3ccbc30a0e5aaf20f257360cfe24712aea0008f149ce5bb99834c0c0b languageName: node linkType: hard @@ -10677,7 +10861,7 @@ __metadata: languageName: node linkType: hard -"which@npm:^2.0.1, which@npm:^2.0.2": +"which@npm:^2.0.1": version: 2.0.2 resolution: "which@npm:2.0.2" dependencies: @@ -10688,6 +10872,17 @@ __metadata: languageName: node linkType: hard +"which@npm:^4.0.0": + version: 4.0.0 + resolution: "which@npm:4.0.0" + dependencies: + isexe: ^3.1.1 + bin: + node-which: bin/which.js + checksum: f17e84c042592c21e23c8195108cff18c64050b9efb8459589116999ea9da6dd1509e6a1bac3aeebefd137be00fabbb61b5c2bc0aa0f8526f32b58ee2f545651 + languageName: node + linkType: hard + "why-is-node-running@npm:^2.2.2": version: 2.2.2 resolution: "why-is-node-running@npm:2.2.2" @@ -10700,15 +10895,6 @@ __metadata: languageName: node linkType: hard -"wide-align@npm:^1.1.5": - version: 1.1.5 - resolution: "wide-align@npm:1.1.5" - dependencies: - string-width: ^1.0.2 || 2 || 3 || 4 - checksum: d5fc37cd561f9daee3c80e03b92ed3e84d80dde3365a8767263d03dacfc8fa06b065ffe1df00d8c2a09f731482fcacae745abfbb478d4af36d0a891fad4834d3 - languageName: node - linkType: hard - "widest-line@npm:^2.0.0": version: 2.0.1 resolution: "widest-line@npm:2.0.1" @@ -10786,14 +10972,7 @@ __metadata: languageName: node linkType: hard -"yaml@npm:*, yaml@npm:^2.1.1, yaml@npm:^2.3.1": - version: 2.3.3 - resolution: "yaml@npm:2.3.3" - checksum: cdfd132e7e0259f948929efe8835923df05c013c273c02bb7a2de9b46ac3af53c2778a35b32c7c0f877cc355dc9340ed564018c0242bfbb1278c2a3e53a0e99e - languageName: node - linkType: hard - -"yaml@npm:^2.0.0": +"yaml@npm:*, yaml@npm:^2.0.0, yaml@npm:^2.3.1, yaml@npm:^2.3.4": version: 2.3.4 resolution: "yaml@npm:2.3.4" checksum: e6d1dae1c6383bcc8ba11796eef3b8c02d5082911c6723efeeb5ba50fc8e881df18d645e64de68e421b577296000bea9c75d6d9097c2f6699da3ae0406c030d8 From a5989e72707c1a17234992523e674af943bc74d7 Mon Sep 17 00:00:00 2001 From: Timothy Lin Date: Sun, 4 Feb 2024 19:52:02 +0800 Subject: [PATCH 5/9] package versions --- packages/@contentlayer/cli/package.json | 4 +- packages/@contentlayer/client/package.json | 4 +- packages/@contentlayer/core/package.json | 4 +- .../package.json | 4 +- .../source-contentful/package.json | 4 +- .../@contentlayer/source-files/package.json | 2 +- .../source-remote-files/package.json | 2 +- packages/@contentlayer/utils/package.json | 6 +- .../package.json | 2 +- packages/contentlayer/package.json | 2 +- packages/next-contentlayer/package.json | 2 +- yarn.lock | 61 ++++--------------- 12 files changed, 31 insertions(+), 66 deletions(-) diff --git a/packages/@contentlayer/cli/package.json b/packages/@contentlayer/cli/package.json index ec94323e..3943747e 100644 --- a/packages/@contentlayer/cli/package.json +++ b/packages/@contentlayer/cli/package.json @@ -1,6 +1,6 @@ { "name": "@contentlayer-temp/cli", - "version": "0.4.0", + "version": "0.4.1", "type": "module", "exports": "./dist/index.js", "types": "./dist/index.d.ts", @@ -22,4 +22,4 @@ "@types/node": "^20.3.2" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/@contentlayer/client/package.json b/packages/@contentlayer/client/package.json index beb6176f..3742f47f 100644 --- a/packages/@contentlayer/client/package.json +++ b/packages/@contentlayer/client/package.json @@ -1,6 +1,6 @@ { "name": "@contentlayer-temp/client", - "version": "0.4.0", + "version": "0.4.1", "type": "module", "exports": "./dist/index.js", "types": "./dist/index.d.ts", @@ -16,4 +16,4 @@ "@contentlayer-temp/core": "workspace:*" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/@contentlayer/core/package.json b/packages/@contentlayer/core/package.json index 6ba49817..2dfe7e31 100644 --- a/packages/@contentlayer/core/package.json +++ b/packages/@contentlayer/core/package.json @@ -1,6 +1,6 @@ { "name": "@contentlayer-temp/core", - "version": "0.4.0", + "version": "0.4.1", "type": "module", "exports": "./dist/index.js", "types": "./dist/index.d.ts", @@ -44,4 +44,4 @@ "markdown-wasm": "^1.2.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/@contentlayer/experimental-source-files-stackbit/package.json b/packages/@contentlayer/experimental-source-files-stackbit/package.json index 521f2afe..d5c41c04 100644 --- a/packages/@contentlayer/experimental-source-files-stackbit/package.json +++ b/packages/@contentlayer/experimental-source-files-stackbit/package.json @@ -1,6 +1,6 @@ { "name": "@contentlayer-temp/experimental-source-files-stackbit", - "version": "0.4.0", + "version": "0.4.1", "type": "module", "exports": { ".": { @@ -36,4 +36,4 @@ "vitest": "1.2.2" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/@contentlayer/source-contentful/package.json b/packages/@contentlayer/source-contentful/package.json index d97a9526..ecffeb43 100644 --- a/packages/@contentlayer/source-contentful/package.json +++ b/packages/@contentlayer/source-contentful/package.json @@ -1,6 +1,6 @@ { "name": "@contentlayer-temp/source-contentful", - "version": "0.4.0", + "version": "0.4.1", "type": "module", "exports": "./dist/index.js", "types": "./dist/index.d.ts", @@ -21,4 +21,4 @@ "contentful-management": "7.22.4" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/@contentlayer/source-files/package.json b/packages/@contentlayer/source-files/package.json index eaaf677d..4d0aca9e 100644 --- a/packages/@contentlayer/source-files/package.json +++ b/packages/@contentlayer/source-files/package.json @@ -1,6 +1,6 @@ { "name": "@contentlayer-temp/source-files", - "version": "0.4.0", + "version": "0.4.1", "type": "module", "exports": { ".": { diff --git a/packages/@contentlayer/source-remote-files/package.json b/packages/@contentlayer/source-remote-files/package.json index 85bfc65d..bff6d39a 100644 --- a/packages/@contentlayer/source-remote-files/package.json +++ b/packages/@contentlayer/source-remote-files/package.json @@ -1,6 +1,6 @@ { "name": "@contentlayer-temp/source-remote-files", - "version": "0.4.0", + "version": "0.4.1", "type": "module", "exports": { ".": { diff --git a/packages/@contentlayer/utils/package.json b/packages/@contentlayer/utils/package.json index fcebf686..fcd09f37 100644 --- a/packages/@contentlayer/utils/package.json +++ b/packages/@contentlayer/utils/package.json @@ -1,6 +1,6 @@ { "name": "@contentlayer-temp/utils", - "version": "0.3.4", + "version": "0.4.1", "type": "module", "exports": { "./package.json": { @@ -72,7 +72,7 @@ "chokidar": "^3.5.3", "hash-wasm": "^4.11.0", "inflection": "^3.0.0", - "memfs": "^4.6.0", + "memfs": "3.6.0", "oo-ascii-tree": "^1.94.0", "ts-pattern": "^5.0.6", "type-fest": "^4.10.0" @@ -81,4 +81,4 @@ "@types/inflection": "^1.13.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/contentlayer-stackbit-yaml-generator/package.json b/packages/contentlayer-stackbit-yaml-generator/package.json index 618176ec..1b9113b8 100644 --- a/packages/contentlayer-stackbit-yaml-generator/package.json +++ b/packages/contentlayer-stackbit-yaml-generator/package.json @@ -1,6 +1,6 @@ { "name": "contentlayer-stackbit-yaml-generator-temp", - "version": "0.4.1", + "version": "0.4.3", "type": "module", "bin": "./dist/cli/index.js", "exports": "./dist/lib/index.js", diff --git a/packages/contentlayer/package.json b/packages/contentlayer/package.json index c305fb0d..089f30d7 100644 --- a/packages/contentlayer/package.json +++ b/packages/contentlayer/package.json @@ -1,6 +1,6 @@ { "name": "contentlayer-temp", - "version": "0.4.1", + "version": "0.4.3", "bin": "./bin/cli.cjs", "type": "module", "engines": { diff --git a/packages/next-contentlayer/package.json b/packages/next-contentlayer/package.json index 063e45a1..40ddb132 100644 --- a/packages/next-contentlayer/package.json +++ b/packages/next-contentlayer/package.json @@ -1,6 +1,6 @@ { "name": "next-contentlayer-temp", - "version": "0.4.1", + "version": "0.4.3", "type": "module", "main": "./dist/index-cjs.cjs", "sideEffects": false, diff --git a/yarn.lock b/yarn.lock index a91d8369..e0a637f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -451,7 +451,7 @@ __metadata: chokidar: ^3.5.3 hash-wasm: ^4.11.0 inflection: ^3.0.0 - memfs: ^4.6.0 + memfs: 3.6.0 oo-ascii-tree: ^1.94.0 ts-pattern: ^5.0.6 type-fest: ^4.10.0 @@ -4951,6 +4951,13 @@ __metadata: languageName: node linkType: hard +"fs-monkey@npm:^1.0.4": + version: 1.0.5 + resolution: "fs-monkey@npm:1.0.5" + checksum: 424b67f65b37fe66117ae2bb061f790fe6d4b609e1d160487c74b3d69fbf42f262c665ccfba32e8b5f113f96f92e9a58fcdebe42d5f6649bdfc72918093a3119 + languageName: node + linkType: hard + "fs.realpath@npm:^1.0.0": version: 1.0.0 resolution: "fs.realpath@npm:1.0.0" @@ -5511,13 +5518,6 @@ __metadata: languageName: node linkType: hard -"hyperdyperid@npm:^1.2.0": - version: 1.2.0 - resolution: "hyperdyperid@npm:1.2.0" - checksum: 210029d1c86926f09109f6317d143f8b056fc38e8dd11b0c3e3205fc6c6ff8429fb55b4b9c2bce065462719ed9d34366eced387aaa0035d93eb76b306a8547ef - languageName: node - linkType: hard - "iconv-lite@npm:^0.4.24": version: 0.4.24 resolution: "iconv-lite@npm:0.4.24" @@ -6120,29 +6120,6 @@ __metadata: languageName: node linkType: hard -"json-joy@npm:^9.2.0": - version: 9.9.1 - resolution: "json-joy@npm:9.9.1" - dependencies: - arg: ^5.0.2 - hyperdyperid: ^1.2.0 - peerDependencies: - quill-delta: ^5 - rxjs: 7 - tslib: 2 - bin: - jj: bin/jj.js - json-pack: bin/json-pack.js - json-pack-test: bin/json-pack-test.js - json-patch: bin/json-patch.js - json-patch-test: bin/json-patch-test.js - json-pointer: bin/json-pointer.js - json-pointer-test: bin/json-pointer-test.js - json-unpack: bin/json-unpack.js - checksum: d165398682f00019796225faf365cd8d060f3e086af39bb5081c30907b7e52eaf13697d1c0f6ee2b010fe255ae1fd776e05ad7d6ee5fb549e98fe982f560884b - languageName: node - linkType: hard - "json-parse-even-better-errors@npm:^2.3.0, json-parse-even-better-errors@npm:^2.3.1": version: 2.3.1 resolution: "json-parse-even-better-errors@npm:2.3.1" @@ -6799,15 +6776,12 @@ __metadata: languageName: node linkType: hard -"memfs@npm:^4.6.0": - version: 4.6.0 - resolution: "memfs@npm:4.6.0" +"memfs@npm:3.6.0": + version: 3.6.0 + resolution: "memfs@npm:3.6.0" dependencies: - json-joy: ^9.2.0 - thingies: ^1.11.1 - peerDependencies: - tslib: 2 - checksum: b32a35bee9f96dc011605f3bb39e74e6d2a5de51c952a77bb38a0dfabd3381c40ae382d27f385aa290edee8081597fb1a3b41a07bb3f775fd55312dc30ac1d9d + fs-monkey: ^1.0.4 + checksum: 934e79f32aabb10869056815bf369ed63aacb61d13183a3a3826847bbb359d7023fd5b365984ddd73faed463bbb5370ed5cd1e87ecf50ac010c5cac81929ed78 languageName: node linkType: hard @@ -9998,15 +9972,6 @@ __metadata: languageName: node linkType: hard -"thingies@npm:^1.11.1": - version: 1.16.0 - resolution: "thingies@npm:1.16.0" - peerDependencies: - tslib: ^2 - checksum: 9afbe70a9777fc31ac2567d06c9f64511585437298948330c39c076c6bd54bae6a700dee4cf4074486ef26c83f51031241ef4f4309c386555fb016a93be8aa06 - languageName: node - linkType: hard - "through@npm:^2.3.6, through@npm:^2.3.8": version: 2.3.8 resolution: "through@npm:2.3.8" From 2a5b2c5c2611ef5be240f7a0d96a5dacf4389dd4 Mon Sep 17 00:00:00 2001 From: Timothy Lin Date: Sun, 31 Mar 2024 16:14:43 +0800 Subject: [PATCH 6/9] update version --- packages/@contentlayer/cli/package.json | 2 +- packages/@contentlayer/client/package.json | 2 +- packages/@contentlayer/core/package.json | 2 +- .../experimental-source-files-stackbit/package.json | 2 +- packages/@contentlayer/source-contentful/package.json | 2 +- packages/@contentlayer/source-files/package.json | 2 +- packages/@contentlayer/source-remote-files/package.json | 2 +- packages/@contentlayer/utils/package.json | 2 +- packages/contentlayer-stackbit-yaml-generator/package.json | 4 ++-- packages/contentlayer/package.json | 4 ++-- packages/next-contentlayer/package.json | 4 ++-- packages/next-contentlayer/src/check-constraints.ts | 4 ++-- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/@contentlayer/cli/package.json b/packages/@contentlayer/cli/package.json index 3943747e..4dc78a4a 100644 --- a/packages/@contentlayer/cli/package.json +++ b/packages/@contentlayer/cli/package.json @@ -22,4 +22,4 @@ "@types/node": "^20.3.2" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/@contentlayer/client/package.json b/packages/@contentlayer/client/package.json index 3742f47f..5f8b3ba2 100644 --- a/packages/@contentlayer/client/package.json +++ b/packages/@contentlayer/client/package.json @@ -16,4 +16,4 @@ "@contentlayer-temp/core": "workspace:*" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/@contentlayer/core/package.json b/packages/@contentlayer/core/package.json index 2dfe7e31..acdc2db5 100644 --- a/packages/@contentlayer/core/package.json +++ b/packages/@contentlayer/core/package.json @@ -44,4 +44,4 @@ "markdown-wasm": "^1.2.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/@contentlayer/experimental-source-files-stackbit/package.json b/packages/@contentlayer/experimental-source-files-stackbit/package.json index d5c41c04..859d149e 100644 --- a/packages/@contentlayer/experimental-source-files-stackbit/package.json +++ b/packages/@contentlayer/experimental-source-files-stackbit/package.json @@ -36,4 +36,4 @@ "vitest": "1.2.2" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/@contentlayer/source-contentful/package.json b/packages/@contentlayer/source-contentful/package.json index ecffeb43..c0362729 100644 --- a/packages/@contentlayer/source-contentful/package.json +++ b/packages/@contentlayer/source-contentful/package.json @@ -21,4 +21,4 @@ "contentful-management": "7.22.4" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/@contentlayer/source-files/package.json b/packages/@contentlayer/source-files/package.json index 4d0aca9e..2184af71 100644 --- a/packages/@contentlayer/source-files/package.json +++ b/packages/@contentlayer/source-files/package.json @@ -51,4 +51,4 @@ "vitest": "1.2.2" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/@contentlayer/source-remote-files/package.json b/packages/@contentlayer/source-remote-files/package.json index bff6d39a..723879df 100644 --- a/packages/@contentlayer/source-remote-files/package.json +++ b/packages/@contentlayer/source-remote-files/package.json @@ -19,4 +19,4 @@ "@contentlayer-temp/source-files": "workspace:*", "@contentlayer-temp/utils": "workspace:*" } -} \ No newline at end of file +} diff --git a/packages/@contentlayer/utils/package.json b/packages/@contentlayer/utils/package.json index fcd09f37..0218f61f 100644 --- a/packages/@contentlayer/utils/package.json +++ b/packages/@contentlayer/utils/package.json @@ -81,4 +81,4 @@ "@types/inflection": "^1.13.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/contentlayer-stackbit-yaml-generator/package.json b/packages/contentlayer-stackbit-yaml-generator/package.json index 1b9113b8..a6e01e8f 100644 --- a/packages/contentlayer-stackbit-yaml-generator/package.json +++ b/packages/contentlayer-stackbit-yaml-generator/package.json @@ -1,6 +1,6 @@ { "name": "contentlayer-stackbit-yaml-generator-temp", - "version": "0.4.3", + "version": "0.4.4", "type": "module", "bin": "./dist/cli/index.js", "exports": "./dist/lib/index.js", @@ -28,4 +28,4 @@ "vite": "^5.0.12", "vitest": "1.2.2" } -} \ No newline at end of file +} diff --git a/packages/contentlayer/package.json b/packages/contentlayer/package.json index 089f30d7..91c7504e 100644 --- a/packages/contentlayer/package.json +++ b/packages/contentlayer/package.json @@ -1,6 +1,6 @@ { "name": "contentlayer-temp", - "version": "0.4.3", + "version": "0.4.4", "bin": "./bin/cli.cjs", "type": "module", "engines": { @@ -81,4 +81,4 @@ "bug": { "url": "https://github.com/contentlayerdev/contentlayer/issues" } -} \ No newline at end of file +} diff --git a/packages/next-contentlayer/package.json b/packages/next-contentlayer/package.json index 40ddb132..ff6636d9 100644 --- a/packages/next-contentlayer/package.json +++ b/packages/next-contentlayer/package.json @@ -1,6 +1,6 @@ { "name": "next-contentlayer-temp", - "version": "0.4.3", + "version": "0.4.4", "type": "module", "main": "./dist/index-cjs.cjs", "sideEffects": false, @@ -64,4 +64,4 @@ "bug": { "url": "https://github.com/contentlayerdev/contentlayer/issues" } -} \ No newline at end of file +} diff --git a/packages/next-contentlayer/src/check-constraints.ts b/packages/next-contentlayer/src/check-constraints.ts index 485da4e6..8d81c599 100644 --- a/packages/next-contentlayer/src/check-constraints.ts +++ b/packages/next-contentlayer/src/check-constraints.ts @@ -26,8 +26,8 @@ const checkNodeVersion = () => { } const checkContentlayerVersionsMatch = () => { - const contentlayerVersion = getPackageVersion('contentlayer') - const nextContentlayerVersion = getPackageVersion('next-contentlayer') + const contentlayerVersion = getPackageVersion('contentlayer-temp') + const nextContentlayerVersion = getPackageVersion('next-contentlayer-temp') if (contentlayerVersion !== nextContentlayerVersion) { throw new Error( From c1cf7df80cd6e4f08f770602111a5182a63f0fbd Mon Sep 17 00:00:00 2001 From: Timothy Lin Date: Sun, 31 Mar 2024 16:19:01 +0800 Subject: [PATCH 7/9] bump mdx-bundler to 10.0.2 --- packages/@contentlayer/core/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/@contentlayer/core/package.json b/packages/@contentlayer/core/package.json index acdc2db5..61a49cce 100644 --- a/packages/@contentlayer/core/package.json +++ b/packages/@contentlayer/core/package.json @@ -30,7 +30,7 @@ "comment-json": "^4.2.3", "esbuild": "0.17.x || 0.18.x || 0.19.x || 0.20.x", "gray-matter": "^4.0.3", - "mdx-bundler": "^10.0.1", + "mdx-bundler": "^10.0.2", "rehype-stringify": "^10.0.0", "remark-frontmatter": "^5.0.0", "remark-parse": "^11.0.0", diff --git a/yarn.lock b/yarn.lock index e0a637f9..f5e524f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -347,7 +347,7 @@ __metadata: esbuild: 0.17.x || 0.18.x || 0.19.x || 0.20.x gray-matter: ^4.0.3 markdown-wasm: ^1.2.0 - mdx-bundler: ^10.0.1 + mdx-bundler: ^10.0.2 rehype-stringify: ^10.0.0 remark-frontmatter: ^5.0.0 remark-parse: ^11.0.0 @@ -6757,9 +6757,9 @@ __metadata: languageName: node linkType: hard -"mdx-bundler@npm:^10.0.1": - version: 10.0.1 - resolution: "mdx-bundler@npm:10.0.1" +"mdx-bundler@npm:^10.0.2": + version: 10.0.2 + resolution: "mdx-bundler@npm:10.0.2" dependencies: "@babel/runtime": ^7.23.2 "@esbuild-plugins/node-resolve": ^0.2.2 @@ -6772,7 +6772,7 @@ __metadata: vfile: ^6.0.1 peerDependencies: esbuild: 0.* - checksum: ec168a2911845f4c9a23706f66538e9ac7a302a91e7f7cb84d14aeef73595aa1d0a8425815f160a9f5d3b3e4249cd1117ce1b91af918d3a9c32aad0d97c3719d + checksum: 06227050ed160ca77e6667f287eb13eaae7f686bb3a44cbfbcdd869e8eba98439750d2dc6c173165b3c7b8ab59a037a5a383b5feec2eb883d568fc0416b66d8f languageName: node linkType: hard From e77614d0c917cd26655e99fe6587357e47f38526 Mon Sep 17 00:00:00 2001 From: Timothy Lin Date: Sun, 31 Mar 2024 16:39:11 +0800 Subject: [PATCH 8/9] update gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d3d37fd8..4d7de8a2 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ out !tap-snapshots/dist/* .contentlayer +.DS_Store \ No newline at end of file From b39801fa0d6640d00ff9f05f9d5fde42badb9194 Mon Sep 17 00:00:00 2001 From: Timothy Lin Date: Sun, 31 Mar 2024 18:25:09 +0800 Subject: [PATCH 9/9] change from contentlayer-temp to contentlayer2 --- examples/next-images/app/page.tsx | 2 +- .../next-images/app/posts/[slug]/page.tsx | 2 +- examples/next-images/contentlayer.config.ts | 2 +- examples/next-images/next.config.js | 2 +- examples/next-images/package.json | 4 +- .../next-rsc-dynamic/contentlayer.config.ts | 4 +- examples/next-rsc-dynamic/next.config.js | 2 +- examples/next-rsc-dynamic/package.json | 4 +- .../node-script-mdx/contentlayer.config.ts | 2 +- examples/node-script-mdx/package.json | 4 +- .../contentlayer.config.ts | 4 +- .../node-script-remote-content/package.json | 4 +- examples/node-script/contentlayer.config.ts | 2 +- examples/node-script/package.json | 4 +- package.json | 18 +- packages/@contentlayer/cli/package.json | 6 +- .../cli/src/commands/BuildCommand.ts | 6 +- .../cli/src/commands/DefaultCommand.ts | 4 +- .../cli/src/commands/DevCommand.ts | 10 +- .../cli/src/commands/PostInstallCommand.ts | 8 +- .../cli/src/commands/_BaseCommand.ts | 10 +- packages/@contentlayer/cli/src/index.ts | 8 +- packages/@contentlayer/cli/src/lib/utils.ts | 2 +- packages/@contentlayer/client/package.json | 4 +- packages/@contentlayer/client/src/guards.ts | 2 +- packages/@contentlayer/core/package.json | 4 +- packages/@contentlayer/core/src/DataCache.ts | 12 +- .../@contentlayer/core/src/_ArtifactsDir.ts | 14 +- packages/@contentlayer/core/src/cwd.ts | 8 +- .../@contentlayer/core/src/dynamic-build.ts | 12 +- packages/@contentlayer/core/src/errors.ts | 4 +- .../core/src/generation/common.ts | 2 +- .../core/src/generation/generate-dotpkg.ts | 28 ++-- .../core/src/generation/generate-types.ts | 10 +- .../core/src/getConfig/esbuild.ts | 4 +- .../@contentlayer/core/src/getConfig/index.ts | 14 +- .../core/src/markdown/markdown.ts | 8 +- .../@contentlayer/core/src/markdown/mdx.ts | 6 +- packages/@contentlayer/core/src/plugin.ts | 4 +- packages/@contentlayer/core/src/runMain.ts | 16 +- .../core/src/validate-tsconfig.ts | 6 +- .../package.json | 8 +- .../src/__test__/stackbit.spec.ts | 8 +- .../src/index.ts | 14 +- .../src/mapping.ts | 6 +- .../source-contentful/package.json | 6 +- .../source-contentful/src/contentful.ts | 10 +- .../source-contentful/src/errors.ts | 4 +- .../source-contentful/src/fetchData/index.ts | 16 +- .../src/fetchData/mapping.ts | 10 +- .../source-contentful/src/index.ts | 6 +- .../source-contentful/src/provideSchema.ts | 12 +- .../source-contentful/src/schemaOverrides.ts | 2 +- .../@contentlayer/source-files/package.json | 6 +- .../src/__test__/errors/aggregate.spec.ts | 4 +- .../source-files/src/__test__/errors/utils.ts | 6 +- .../makeCacheItemFromFilePath.spec.ts | 2 +- .../src/__test__/fetchData/utils.ts | 16 +- .../mapping/getDataForFieldDef.spec.ts | 16 +- .../__snapshots__/basic.spec.ts.snap | 18 +- .../__test__/type-generation/basic.spec.ts | 6 +- .../source-files/src/errors/aggregate.ts | 10 +- .../source-files/src/errors/index.ts | 8 +- .../src/fetchData/DocumentContext.ts | 12 +- .../src/fetchData/DocumentTypeMap.ts | 6 +- .../src/fetchData/fetchAllDocuments.ts | 14 +- .../source-files/src/fetchData/index.ts | 16 +- .../fetchData/makeCacheItemFromFilePath.ts | 14 +- .../src/fetchData/mapping/field-date.ts | 6 +- .../src/fetchData/mapping/field-image.ts | 8 +- .../src/fetchData/mapping/field-markdown.ts | 8 +- .../src/fetchData/mapping/field-mdx.ts | 10 +- .../src/fetchData/mapping/index.ts | 10 +- .../src/fetchData/mapping/parseFieldData.ts | 4 +- .../src/fetchData/validateDocumentData.ts | 8 +- .../@contentlayer/source-files/src/index.ts | 8 +- .../src/schema/defs/computed-field.ts | 2 +- .../source-files/src/schema/defs/index.ts | 4 +- .../source-files/src/schema/provideSchema.ts | 6 +- .../@contentlayer/source-files/src/types.ts | 2 +- .../source-remote-files/package.json | 8 +- .../source-remote-files/src/index.ts | 10 +- packages/@contentlayer/utils/package.json | 2 +- packages/contentful-generator/package.json | 2 +- .../package.json | 8 +- .../fixtures/azimuth-schema/documents/Blog.ts | 2 +- .../azimuth-schema/documents/Config.ts | 2 +- .../azimuth-schema/documents/Landing.ts | 2 +- .../fixtures/azimuth-schema/documents/Page.ts | 2 +- .../azimuth-schema/documents/Person.ts | 2 +- .../fixtures/azimuth-schema/documents/Post.ts | 2 +- .../fixtures/azimuth-schema/nested/Action.ts | 2 +- .../azimuth-schema/nested/FormField.ts | 2 +- .../fixtures/azimuth-schema/nested/SEO.ts | 2 +- .../__test__/fixtures/azimuth-schema/utils.ts | 2 +- .../__test__/fixtures/blog-schema/index.ts | 2 +- .../src/__test__/fixtures/index.ts | 8 +- .../src/cli/DefaultCommand.ts | 16 +- .../src/cli/convert.ts | 4 +- packages/contentlayer/bin/cli.cjs | 2 +- packages/contentlayer/package.json | 14 +- packages/contentlayer/src/client/index.ts | 2 +- packages/contentlayer/src/core/index.ts | 2 +- .../contentlayer/src/source-files/index.ts | 2 +- .../src/source-files/schema/index.ts | 2 +- .../src/source-remote-files/index.ts | 2 +- packages/contentlayer/src/utils/index.ts | 2 +- packages/contentlayer/src/utils/node/index.ts | 2 +- packages/integration-tests/package.json | 2 +- .../src/empty-content-folder/index.test.ts | 6 +- .../src/image-field/index.test.ts | 6 +- .../src/markdown/index.test.ts | 6 +- .../src/mdx-remark-images/index.test.ts | 6 +- .../src/remark-gfm/index.test.ts | 6 +- packages/next-contentlayer/package.json | 8 +- .../src/check-constraints.ts | 4 +- packages/next-contentlayer/src/plugin.ts | 8 +- tsconfig.base.json | 10 +- yarn.lock | 156 +++++++++--------- 119 files changed, 466 insertions(+), 466 deletions(-) diff --git a/examples/next-images/app/page.tsx b/examples/next-images/app/page.tsx index 5d36dfe8..65806442 100644 --- a/examples/next-images/app/page.tsx +++ b/examples/next-images/app/page.tsx @@ -1,7 +1,7 @@ import Link from 'next/link' import { compareDesc, format, parseISO } from 'date-fns' import { allPosts, Post } from 'contentlayer/generated' -import { getMDXComponent } from 'next-contentlayer-temp/hooks' +import { getMDXComponent } from 'next-contentlayer2/hooks' function PostCard(post: Post) { const Content = getMDXComponent(post.body.code) diff --git a/examples/next-images/app/posts/[slug]/page.tsx b/examples/next-images/app/posts/[slug]/page.tsx index aee01850..a53adb6c 100644 --- a/examples/next-images/app/posts/[slug]/page.tsx +++ b/examples/next-images/app/posts/[slug]/page.tsx @@ -1,6 +1,6 @@ import { format, parseISO } from 'date-fns' import { allPosts } from 'contentlayer/generated' -import { getMDXComponent } from 'next-contentlayer-temp/hooks' +import { getMDXComponent } from 'next-contentlayer2/hooks' import Image from 'next/image' export const generateStaticParams = async () => allPosts.map((post) => ({ slug: post._raw.flattenedPath })) diff --git a/examples/next-images/contentlayer.config.ts b/examples/next-images/contentlayer.config.ts index 25824e12..e9fd222a 100644 --- a/examples/next-images/contentlayer.config.ts +++ b/examples/next-images/contentlayer.config.ts @@ -1,4 +1,4 @@ -import { defineDocumentType, makeSource } from 'contentlayer-temp/source-files' +import { defineDocumentType, makeSource } from 'contentlayer2/source-files' const Post = defineDocumentType(() => ({ name: 'Post', diff --git a/examples/next-images/next.config.js b/examples/next-images/next.config.js index 0124c42f..a921e1be 100644 --- a/examples/next-images/next.config.js +++ b/examples/next-images/next.config.js @@ -1,4 +1,4 @@ -const { withContentlayer } = require("next-contentlayer-temp"); +const { withContentlayer } = require("next-contentlayer2"); /** @type {import('next').NextConfig} */ const nextConfig = {} diff --git a/examples/next-images/package.json b/examples/next-images/package.json index 82ac119e..e55738eb 100644 --- a/examples/next-images/package.json +++ b/examples/next-images/package.json @@ -8,10 +8,10 @@ "start": "next start" }, "dependencies": { - "contentlayer-temp": "latest", + "contentlayer2": "latest", "date-fns": "2.30.0", "next": "14.1.0", - "next-contentlayer-temp": "latest", + "next-contentlayer2": "latest", "react": "18.2.0", "react-dom": "18.2.0" }, diff --git a/examples/next-rsc-dynamic/contentlayer.config.ts b/examples/next-rsc-dynamic/contentlayer.config.ts index e7c7bdaf..b5c70a7c 100644 --- a/examples/next-rsc-dynamic/contentlayer.config.ts +++ b/examples/next-rsc-dynamic/contentlayer.config.ts @@ -1,6 +1,6 @@ -import { defineDocumentType } from 'contentlayer-temp/source-files' +import { defineDocumentType } from 'contentlayer2/source-files' import { spawn } from 'node:child_process' -import { makeSource } from 'contentlayer-temp/source-remote-files' +import { makeSource } from 'contentlayer2/source-remote-files' const Post = defineDocumentType(() => ({ name: 'Post', diff --git a/examples/next-rsc-dynamic/next.config.js b/examples/next-rsc-dynamic/next.config.js index fb12cdca..104ffe4a 100644 --- a/examples/next-rsc-dynamic/next.config.js +++ b/examples/next-rsc-dynamic/next.config.js @@ -1,3 +1,3 @@ -const { withContentlayer } = require('next-contentlayer-temp') +const { withContentlayer } = require('next-contentlayer2') module.exports = withContentlayer({}) \ No newline at end of file diff --git a/examples/next-rsc-dynamic/package.json b/examples/next-rsc-dynamic/package.json index c6de191a..4b7c3711 100644 --- a/examples/next-rsc-dynamic/package.json +++ b/examples/next-rsc-dynamic/package.json @@ -8,10 +8,10 @@ "start": "next start" }, "dependencies": { - "contentlayer-temp": "latest", + "contentlayer2": "latest", "date-fns": "2.30.0", "next": "14.1.0", - "next-contentlayer-temp": "latest", + "next-contentlayer2": "latest", "react": "18.2.0", "react-dom": "18.2.0" }, diff --git a/examples/node-script-mdx/contentlayer.config.ts b/examples/node-script-mdx/contentlayer.config.ts index 4e5d05ca..aec5daf6 100644 --- a/examples/node-script-mdx/contentlayer.config.ts +++ b/examples/node-script-mdx/contentlayer.config.ts @@ -1,4 +1,4 @@ -import { defineDocumentType, makeSource } from 'contentlayer-temp/source-files' +import { defineDocumentType, makeSource } from 'contentlayer2/source-files' import { bundleMDX } from 'mdx-bundler' import * as ReactDOMServer from 'react-dom/server' import { getMDXComponent } from 'mdx-bundler/client/index.js' diff --git a/examples/node-script-mdx/package.json b/examples/node-script-mdx/package.json index 60672455..197ddcc4 100644 --- a/examples/node-script-mdx/package.json +++ b/examples/node-script-mdx/package.json @@ -2,9 +2,9 @@ "name": "node-script-mdx-example", "private": true, "scripts": { - "start": "contentlayer-temp build && node --experimental-json-modules my-script.mjs" + "start": "contentlayer2 build && node --experimental-json-modules my-script.mjs" }, "dependencies": { - "contentlayer-temp": "latest" + "contentlayer2": "latest" } } diff --git a/examples/node-script-remote-content/contentlayer.config.ts b/examples/node-script-remote-content/contentlayer.config.ts index 7c7ea40f..99963b10 100644 --- a/examples/node-script-remote-content/contentlayer.config.ts +++ b/examples/node-script-remote-content/contentlayer.config.ts @@ -1,6 +1,6 @@ -import { defineDocumentType } from 'contentlayer-temp/source-files' +import { defineDocumentType } from 'contentlayer2/source-files' import { spawn } from 'node:child_process' -import { makeSource } from 'contentlayer-temp/source-remote-files' +import { makeSource } from 'contentlayer2/source-remote-files' const Post = defineDocumentType(() => ({ name: 'Post', diff --git a/examples/node-script-remote-content/package.json b/examples/node-script-remote-content/package.json index 11f08166..b7c450f3 100644 --- a/examples/node-script-remote-content/package.json +++ b/examples/node-script-remote-content/package.json @@ -2,9 +2,9 @@ "name": "node-script-remote-content-example", "private": true, "scripts": { - "start": "contentlayer-temp build && node --experimental-json-modules my-script.mjs" + "start": "contentlayer2 build && node --experimental-json-modules my-script.mjs" }, "dependencies": { - "contentlayer-temp": "latest" + "contentlayer2": "latest" } } diff --git a/examples/node-script/contentlayer.config.ts b/examples/node-script/contentlayer.config.ts index 962238ea..e624ebc2 100644 --- a/examples/node-script/contentlayer.config.ts +++ b/examples/node-script/contentlayer.config.ts @@ -1,4 +1,4 @@ -import { defineDocumentType, makeSource } from 'contentlayer-temp/source-files' +import { defineDocumentType, makeSource } from 'contentlayer2/source-files' const Post = defineDocumentType(() => ({ name: 'Post', diff --git a/examples/node-script/package.json b/examples/node-script/package.json index 046d4f75..c220726d 100644 --- a/examples/node-script/package.json +++ b/examples/node-script/package.json @@ -2,9 +2,9 @@ "name": "node-script-example", "private": true, "scripts": { - "start": "contentlayer-temp build && node --experimental-json-modules my-script.mjs" + "start": "contentlayer2 build && node --experimental-json-modules my-script.mjs" }, "dependencies": { - "contentlayer-temp": "latest" + "contentlayer2": "latest" } } diff --git a/package.json b/package.json index 233cdaf0..08a4907d 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "contentlayer-monorepo", + "name": "contentlayer2-monorepo", "private": true, "workspaces": [ "./packages/@contentlayer/*", @@ -10,11 +10,11 @@ "postinstall": "ts-patch install", "prepare": "ts-patch install -s", "test": "CI=true VITEST_SEGFAULT_RETRY=3 yarn workspaces foreach --parallel run test", - "build": "run build:clean && run build:ts && yarn workspace next-contentlayer-temp run prepack", + "build": "run build:clean && run build:ts && yarn workspace next-contentlayer2 run prepack", "build:ts": "tsc --build tsconfig.all.json", "dev:ts": "run build:ts --watch", - "build:clean": "bash -c 'rm -rf packages/*/dist packages/@contentlayer-temp/*/dist'", - "examples:postinstall": "yarn workspaces foreach --verbose --include \"examples-*\" exec yarn contentlayer-temp postinstall", + "build:clean": "bash -c 'rm -rf packages/*/dist packages/@contentlayer/*/dist'", + "examples:postinstall": "yarn workspaces foreach --verbose --include \"examples-*\" exec yarn contentlayer2 postinstall", "release:prerelease": "yarn build && yarn workspaces foreach --verbose --topological-dev --parallel --no-private npm publish --tolerate-republish --tag=dev", "release:patch": "yarn build && yarn workspaces foreach --verbose --topological-dev --parallel --no-private npm publish --tolerate-republish", "release:minor": "yarn build && yarn workspaces foreach --verbose --topological-dev --parallel --no-private npm publish --tolerate-republish", @@ -42,11 +42,11 @@ }, "resolutions": { "esbuild": "0.18.0", - "contentlayer-temp": "workspace:*", - "@contentlayer-temp/*": "workspace:*", - "contentlayer-stackbit-yaml-generator-temp": "workspace:*", - "next-contentlayer-temp": "workspace:*", + "contentlayer2": "workspace:*", + "@contentlayer2/*": "workspace:*", + "contentlayer-stackbit-yaml-generator2": "workspace:*", + "next-contentlayer2": "workspace:*", "rxjs": "^7.1.0" }, "packageManager": "yarn@3.2.3" -} +} \ No newline at end of file diff --git a/packages/@contentlayer/cli/package.json b/packages/@contentlayer/cli/package.json index 4dc78a4a..7b2a8c2c 100644 --- a/packages/@contentlayer/cli/package.json +++ b/packages/@contentlayer/cli/package.json @@ -1,5 +1,5 @@ { - "name": "@contentlayer-temp/cli", + "name": "@contentlayer2/cli", "version": "0.4.1", "type": "module", "exports": "./dist/index.js", @@ -13,8 +13,8 @@ "test": "echo No tests yet" }, "dependencies": { - "@contentlayer-temp/core": "workspace:*", - "@contentlayer-temp/utils": "workspace:*", + "@contentlayer2/core": "workspace:*", + "@contentlayer2/utils": "workspace:*", "clipanion": "^3.2.1", "typanion": "^3.12.1" }, diff --git a/packages/@contentlayer/cli/src/commands/BuildCommand.ts b/packages/@contentlayer/cli/src/commands/BuildCommand.ts index 1d356c66..48d489ff 100644 --- a/packages/@contentlayer/cli/src/commands/BuildCommand.ts +++ b/packages/@contentlayer/cli/src/commands/BuildCommand.ts @@ -1,5 +1,5 @@ -import * as core from '@contentlayer-temp/core' -import { OT, pipe, T } from '@contentlayer-temp/utils/effect' +import * as core from '@contentlayer2/core' +import { OT, pipe, T } from '@contentlayer2/utils/effect' import type { Usage } from 'clipanion' import { BaseCommand } from './_BaseCommand.js' @@ -25,6 +25,6 @@ export class BuildCommand extends BaseCommand { T.tap((config) => (config.source.options.disableImportAliasWarning ? T.unit : T.fork(core.validateTsconfig))), T.chain((config) => core.generateDotpkg({ config, verbose: this.verbose })), T.tap(core.logGenerateInfo), - OT.withSpan('@contentlayer-temp/cli/commands/BuildCommand:executeSafe'), + OT.withSpan('@contentlayer2/cli/commands/BuildCommand:executeSafe'), ) } diff --git a/packages/@contentlayer/cli/src/commands/DefaultCommand.ts b/packages/@contentlayer/cli/src/commands/DefaultCommand.ts index 30240249..dc39752a 100644 --- a/packages/@contentlayer/cli/src/commands/DefaultCommand.ts +++ b/packages/@contentlayer/cli/src/commands/DefaultCommand.ts @@ -1,4 +1,4 @@ -import { OT, pipe, T } from '@contentlayer-temp/utils/effect' +import { OT, pipe, T } from '@contentlayer2/utils/effect' import { Command } from 'clipanion' import { BaseCommand } from './_BaseCommand.js' @@ -9,6 +9,6 @@ export class DefaultCommand extends BaseCommand { executeSafe = () => pipe( T.succeedWith(() => console.log(this.cli.usage())), - OT.withSpan('@contentlayer-temp/cli/commands/DefaultCommand:executeSafe', { attributes: { cwd: process.cwd() } }), + OT.withSpan('@contentlayer2/cli/commands/DefaultCommand:executeSafe', { attributes: { cwd: process.cwd() } }), ) } diff --git a/packages/@contentlayer/cli/src/commands/DevCommand.ts b/packages/@contentlayer/cli/src/commands/DevCommand.ts index 80bab58f..c6fc17ad 100644 --- a/packages/@contentlayer/cli/src/commands/DevCommand.ts +++ b/packages/@contentlayer/cli/src/commands/DevCommand.ts @@ -1,6 +1,6 @@ -import * as core from '@contentlayer-temp/core' -import { errorToString } from '@contentlayer-temp/utils' -import { E, OT, pipe, S, T } from '@contentlayer-temp/utils/effect' +import * as core from '@contentlayer2/core' +import { errorToString } from '@contentlayer2/utils' +import { E, OT, pipe, S, T } from '@contentlayer2/utils/effect' import type { Usage } from 'clipanion' import { BaseCommand } from './_BaseCommand.js' @@ -31,8 +31,8 @@ export class DevCommand extends BaseCommand { core.generateDotpkgStream({ config, verbose: this.verbose, isDev: true }), ), S.tap(E.fold((error) => T.log(errorToString(error)), core.logGenerateInfo)), - OT.withStreamSpan('@contentlayer-temp/cli/commands/DevCommand:stream'), + OT.withStreamSpan('@contentlayer2/cli/commands/DevCommand:stream'), S.runDrain, - OT.withSpan('@contentlayer-temp/cli/commands/DevCommand:executeSafe'), + OT.withSpan('@contentlayer2/cli/commands/DevCommand:executeSafe'), ) } diff --git a/packages/@contentlayer/cli/src/commands/PostInstallCommand.ts b/packages/@contentlayer/cli/src/commands/PostInstallCommand.ts index 6b04e6e6..4d63b8c6 100644 --- a/packages/@contentlayer/cli/src/commands/PostInstallCommand.ts +++ b/packages/@contentlayer/cli/src/commands/PostInstallCommand.ts @@ -1,8 +1,8 @@ import * as path from 'node:path' -import * as core from '@contentlayer-temp/core' -import { fs } from '@contentlayer-temp/utils' -import { OT, pipe, T } from '@contentlayer-temp/utils/effect' +import * as core from '@contentlayer2/core' +import { fs } from '@contentlayer2/utils' +import { OT, pipe, T } from '@contentlayer2/utils/effect' import { BaseCommand } from './_BaseCommand.js' @@ -19,7 +19,7 @@ export class PostInstallCommand extends BaseCommand { yield* $(addToplevelDotpkgToGitignore()) }), - OT.withSpan('@contentlayer-temp/cli/commands/PostInstallCommand:executeSafe', { + OT.withSpan('@contentlayer2/cli/commands/PostInstallCommand:executeSafe', { attributes: { cwd: process.cwd() }, }), ) diff --git a/packages/@contentlayer/cli/src/commands/_BaseCommand.ts b/packages/@contentlayer/cli/src/commands/_BaseCommand.ts index 19715306..13c69687 100644 --- a/packages/@contentlayer/cli/src/commands/_BaseCommand.ts +++ b/packages/@contentlayer/cli/src/commands/_BaseCommand.ts @@ -1,8 +1,8 @@ -import type { HasCwd } from '@contentlayer-temp/core' -import * as core from '@contentlayer-temp/core' -import { fs } from '@contentlayer-temp/utils' -import type { HasClock, HasConsole, OT } from '@contentlayer-temp/utils/effect' -import { pipe, T } from '@contentlayer-temp/utils/effect' +import type { HasCwd } from '@contentlayer2/core' +import * as core from '@contentlayer2/core' +import { fs } from '@contentlayer2/utils' +import type { HasClock, HasConsole, OT } from '@contentlayer2/utils/effect' +import { pipe, T } from '@contentlayer2/utils/effect' import { Command, Option } from 'clipanion' import * as t from 'typanion' diff --git a/packages/@contentlayer/cli/src/index.ts b/packages/@contentlayer/cli/src/index.ts index b76a8a2a..c3e185ea 100644 --- a/packages/@contentlayer/cli/src/index.ts +++ b/packages/@contentlayer/cli/src/index.ts @@ -1,10 +1,10 @@ -import '@contentlayer-temp/utils/effect/Tracing/Enable' +import '@contentlayer2/utils/effect/Tracing/Enable' import process from 'node:process' -import { provideDummyTracing } from '@contentlayer-temp/utils' -import { pipe, T } from '@contentlayer-temp/utils/effect' -import { getContentlayerVersion, NodeFsLive } from '@contentlayer-temp/utils/node' +import { provideDummyTracing } from '@contentlayer2/utils' +import { pipe, T } from '@contentlayer2/utils/effect' +import { getContentlayerVersion, NodeFsLive } from '@contentlayer2/utils/node' import { Builtins, Cli } from 'clipanion' import { BuildCommand } from './commands/BuildCommand.js' diff --git a/packages/@contentlayer/cli/src/lib/utils.ts b/packages/@contentlayer/cli/src/lib/utils.ts index 489d1cfd..f7077271 100644 --- a/packages/@contentlayer/cli/src/lib/utils.ts +++ b/packages/@contentlayer/cli/src/lib/utils.ts @@ -1,5 +1,5 @@ // TODO Note this seems to be unused and should be deleted soon -import type { DocumentTypeDef, DocumentTypeDefMap, NestedTypeDef, NestedTypeDefMap } from '@contentlayer-temp/core' +import type { DocumentTypeDef, DocumentTypeDefMap, NestedTypeDef, NestedTypeDefMap } from '@contentlayer2/core' export const derefDocumentOrThrow = (documentDefMap: DocumentTypeDefMap, documentDefName: string): DocumentTypeDef => { if (!(documentDefName in documentDefMap)) { diff --git a/packages/@contentlayer/client/package.json b/packages/@contentlayer/client/package.json index 5f8b3ba2..fc7fded8 100644 --- a/packages/@contentlayer/client/package.json +++ b/packages/@contentlayer/client/package.json @@ -1,5 +1,5 @@ { - "name": "@contentlayer-temp/client", + "name": "@contentlayer2/client", "version": "0.4.1", "type": "module", "exports": "./dist/index.js", @@ -13,7 +13,7 @@ "test": "echo No tests yet" }, "dependencies": { - "@contentlayer-temp/core": "workspace:*" + "@contentlayer2/core": "workspace:*" }, "license": "MIT" } diff --git a/packages/@contentlayer/client/src/guards.ts b/packages/@contentlayer/client/src/guards.ts index 0c2c9d5a..d2dfde32 100644 --- a/packages/@contentlayer/client/src/guards.ts +++ b/packages/@contentlayer/client/src/guards.ts @@ -1,4 +1,4 @@ -import type { Document, GetDocumentTypeMapGen, GetDocumentTypeNamesGen } from '@contentlayer-temp/core' +import type { Document, GetDocumentTypeMapGen, GetDocumentTypeNamesGen } from '@contentlayer2/core' // type Guards = { // isType: TypeGuards diff --git a/packages/@contentlayer/core/package.json b/packages/@contentlayer/core/package.json index 61a49cce..bac9d9ad 100644 --- a/packages/@contentlayer/core/package.json +++ b/packages/@contentlayer/core/package.json @@ -1,5 +1,5 @@ { - "name": "@contentlayer-temp/core", + "name": "@contentlayer2/core", "version": "0.4.1", "type": "module", "exports": "./dist/index.js", @@ -25,7 +25,7 @@ } }, "dependencies": { - "@contentlayer-temp/utils": "workspace:*", + "@contentlayer2/utils": "workspace:*", "camel-case": "^4.1.2", "comment-json": "^4.2.3", "esbuild": "0.17.x || 0.18.x || 0.19.x || 0.20.x", diff --git a/packages/@contentlayer/core/src/DataCache.ts b/packages/@contentlayer/core/src/DataCache.ts index d771d1ab..863959ec 100644 --- a/packages/@contentlayer/core/src/DataCache.ts +++ b/packages/@contentlayer/core/src/DataCache.ts @@ -1,9 +1,9 @@ import * as path from 'node:path' -import { fs } from '@contentlayer-temp/utils' -import type { E } from '@contentlayer-temp/utils/effect' -import { OT, pipe, T } from '@contentlayer-temp/utils/effect' -import type { GetContentlayerVersionError } from '@contentlayer-temp/utils/node' +import { fs } from '@contentlayer2/utils' +import type { E } from '@contentlayer2/utils/effect' +import { OT, pipe, T } from '@contentlayer2/utils/effect' +import type { GetContentlayerVersionError } from '@contentlayer2/utils/node' import { ArtifactsDir } from './ArtifactsDir.js' import type { HasCwd } from './cwd.js' @@ -52,7 +52,7 @@ export namespace DataCache { return cache }), - OT.withSpan('@contentlayer-temp/core/cache:loadPreviousCacheFromDisk', { attributes: { schemaHash } }), + OT.withSpan('@contentlayer2/core/cache:loadPreviousCacheFromDisk', { attributes: { schemaHash } }), ) export const writeCacheToDisk = ({ @@ -76,7 +76,7 @@ export namespace DataCache { yield* $(fs.writeFileJson({ filePath, content: cache })) }), T.either, - OT.withSpan('@contentlayer-temp/core/cache:writeCacheToDisk', { attributes: { schemaHash } }), + OT.withSpan('@contentlayer2/core/cache:writeCacheToDisk', { attributes: { schemaHash } }), ) const dataCacheFileName = (schemaHash: string) => `data-${schemaHash}.json` diff --git a/packages/@contentlayer/core/src/_ArtifactsDir.ts b/packages/@contentlayer/core/src/_ArtifactsDir.ts index bf56a7fa..eb535a30 100644 --- a/packages/@contentlayer/core/src/_ArtifactsDir.ts +++ b/packages/@contentlayer/core/src/_ArtifactsDir.ts @@ -1,13 +1,13 @@ -import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer-temp/utils' -import { filePathJoin, fs } from '@contentlayer-temp/utils' -import type { OT } from '@contentlayer-temp/utils/effect' -import { pipe, T } from '@contentlayer-temp/utils/effect' -import type { GetContentlayerVersionError } from '@contentlayer-temp/utils/node' -import { getContentlayerVersion } from '@contentlayer-temp/utils/node' +import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer2/utils' +import { filePathJoin, fs } from '@contentlayer2/utils' +import type { OT } from '@contentlayer2/utils/effect' +import { pipe, T } from '@contentlayer2/utils/effect' +import type { GetContentlayerVersionError } from '@contentlayer2/utils/node' +import { getContentlayerVersion } from '@contentlayer2/utils/node' import type { HasCwd } from './cwd.js' import { getCwd } from './cwd.js' -// import utilsPkg from '@contentlayer-temp/utils/package.json' +// import utilsPkg from '@contentlayer2/utils/package.json' export const getDirPath = ({ cwd }: { cwd: AbsolutePosixFilePath }): AbsolutePosixFilePath => filePathJoin(cwd, '.contentlayer' as AbsolutePosixFilePath) diff --git a/packages/@contentlayer/core/src/cwd.ts b/packages/@contentlayer/core/src/cwd.ts index 29838c7b..8a389bc3 100644 --- a/packages/@contentlayer/core/src/cwd.ts +++ b/packages/@contentlayer/core/src/cwd.ts @@ -1,7 +1,7 @@ -import type { AbsolutePosixFilePath } from '@contentlayer-temp/utils' -import { unknownToAbsolutePosixFilePath } from '@contentlayer-temp/utils' -import type { Has } from '@contentlayer-temp/utils/effect' -import { T, tag } from '@contentlayer-temp/utils/effect' +import type { AbsolutePosixFilePath } from '@contentlayer2/utils' +import { unknownToAbsolutePosixFilePath } from '@contentlayer2/utils' +import type { Has } from '@contentlayer2/utils/effect' +import { T, tag } from '@contentlayer2/utils/effect' export const makeCwd = T.gen(function* (_) { const cwd = yield* _( diff --git a/packages/@contentlayer/core/src/dynamic-build.ts b/packages/@contentlayer/core/src/dynamic-build.ts index 22e8113e..72cf965e 100644 --- a/packages/@contentlayer/core/src/dynamic-build.ts +++ b/packages/@contentlayer/core/src/dynamic-build.ts @@ -1,7 +1,7 @@ -import type { AbsolutePosixFilePath } from '@contentlayer-temp/utils' -import { provideTracing } from '@contentlayer-temp/utils' -import { O, OT, pipe, provideConsole, S, T } from '@contentlayer-temp/utils/effect' -import { NodeFsLive } from '@contentlayer-temp/utils/node' +import type { AbsolutePosixFilePath } from '@contentlayer2/utils' +import { provideTracing } from '@contentlayer2/utils' +import { O, OT, pipe, provideConsole, S, T } from '@contentlayer2/utils/effect' +import { NodeFsLive } from '@contentlayer2/utils/node' import { provideCwdCustom } from './cwd.js' import type { DataCache } from './DataCache.js' @@ -56,7 +56,7 @@ export const dynamicBuildFromCompiledConfig = ({ }), ), T.chain((config) => dynamicBuild({ config, verbose })), - OT.withSpan('@contentlayer-temp/core/dynamicBuildFromCompiledConfig', { attributes: { compiledConfigPath } }), + OT.withSpan('@contentlayer2/core/dynamicBuildFromCompiledConfig', { attributes: { compiledConfigPath } }), ) type RuntimeDeps = { @@ -112,7 +112,7 @@ export const dynamicBuild = ({ config, verbose }: { config: Config; verbose: boo return makeDataExportsFromCache({ cache, schemaDef, options: config.source.options }) }), - OT.withSpan('@contentlayer-temp/core/dynamicBuild'), + OT.withSpan('@contentlayer2/core/dynamicBuild'), ) export type DataExports = { diff --git a/packages/@contentlayer/core/src/errors.ts b/packages/@contentlayer/core/src/errors.ts index ad8ef944..0faf0f00 100644 --- a/packages/@contentlayer/core/src/errors.ts +++ b/packages/@contentlayer/core/src/errors.ts @@ -1,5 +1,5 @@ -import { errorToString } from '@contentlayer-temp/utils' -import { Tagged } from '@contentlayer-temp/utils/effect' +import { errorToString } from '@contentlayer2/utils' +import { Tagged } from '@contentlayer2/utils/effect' export class NoConfigFoundError extends Tagged('NoConfigFoundError')<{ readonly configPath?: string diff --git a/packages/@contentlayer/core/src/generation/common.ts b/packages/@contentlayer/core/src/generation/common.ts index b482b528..b9094fd8 100644 --- a/packages/@contentlayer/core/src/generation/common.ts +++ b/packages/@contentlayer/core/src/generation/common.ts @@ -1,4 +1,4 @@ -import * as utils from '@contentlayer-temp/utils' +import * as utils from '@contentlayer2/utils' import type { DocumentTypeDef } from '../schema/index.js' diff --git a/packages/@contentlayer/core/src/generation/generate-dotpkg.ts b/packages/@contentlayer/core/src/generation/generate-dotpkg.ts index b146f42a..847f8790 100644 --- a/packages/@contentlayer/core/src/generation/generate-dotpkg.ts +++ b/packages/@contentlayer/core/src/generation/generate-dotpkg.ts @@ -1,9 +1,9 @@ -import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer-temp/utils' -import { filePathJoin, fs, relative } from '@contentlayer-temp/utils' -import type { E, HasClock, HasConsole } from '@contentlayer-temp/utils/effect' -import { Array, Chunk, Either, OT, pipe, S, T } from '@contentlayer-temp/utils/effect' -import type { GetContentlayerVersionError } from '@contentlayer-temp/utils/node' -import { getContentlayerVersion } from '@contentlayer-temp/utils/node' +import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer2/utils' +import { filePathJoin, fs, relative } from '@contentlayer2/utils' +import type { E, HasClock, HasConsole } from '@contentlayer2/utils/effect' +import { Array, Chunk, Either, OT, pipe, S, T } from '@contentlayer2/utils/effect' +import type { GetContentlayerVersionError } from '@contentlayer2/utils/node' +import { getContentlayerVersion } from '@contentlayer2/utils/node' import { camelCase } from 'camel-case' import type { PackageJson } from 'type-fest' @@ -65,7 +65,7 @@ export const generateDotpkg = ({ S.runCollect, T.map(Chunk.unsafeHead), T.rightOrFail, - OT.withSpan('@contentlayer-temp/core/generation:generateDotpkg', { attributes: { verbose } }), + OT.withSpan('@contentlayer2/core/generation:generateDotpkg', { attributes: { verbose } }), ) // TODO make sure unused old generated files are removed @@ -135,7 +135,7 @@ const successCallback = (onSuccess: SuccessCallback | undefined) => { (error) => new SuccessCallbackError({ error }), ), ), - OT.withSpan('@contentlayer-temp/core/generation:successCallback'), + OT.withSpan('@contentlayer2/core/generation:successCallback'), ) } @@ -268,7 +268,7 @@ const writeFilesForCache = ({ ), ) }), - OT.withSpan('@contentlayer-temp/core/generation/generate-dotpkg:writeFilesForCache', { + OT.withSpan('@contentlayer2/core/generation/generate-dotpkg:writeFilesForCache', { attributes: { targetPath, cacheKeys: Object.keys(cache.cacheItemsMap), @@ -451,7 +451,7 @@ export const fetchContent = async (sourceKey) => { return `\ // ${autogeneratedNote} -export { isType } from 'contentlayer-temp/client' +export { isType } from 'contentlayer2/client' // NOTE During development Contentlayer imports from \`.mjs\` files to improve HMR speeds. // During (production) builds Contentlayer it imports from \`.json\` files to improve build performance. @@ -496,7 +496,7 @@ export declare const fetchContent: (sourceKey?: string) => Promise { @@ -608,7 +608,7 @@ const __dirname = '__SET_BY_ESBUILD__'; const deduplicateContentlayerImportsPlugin = (): esbuild.Plugin => ({ name: 'deduplicate-contentlayer-imports', setup: (build) => { - const filter = /\@contentlayer-temp\/[a-z-]+/ + const filter = /\@contentlayer2\/[a-z-]+/ const namespace = 'deduplicate-contentlayer-imports-ns' build.onResolve({ filter: /.+/ }, async ({ path, ...args }) => { if (args.namespace === namespace) return @@ -616,7 +616,7 @@ const deduplicateContentlayerImportsPlugin = (): esbuild.Plugin => ({ if (path.match(filter)) { const result = await build.resolve(path, { ...args, namespace }) - if (result.path.match(/\@contentlayer-temp\/[a-z-]+\/src\//)) { + if (result.path.match(/\@contentlayer2\/[a-z-]+\/src\//)) { result.path = result.path.replace('/src/', '/dist/') result.path = result.path.replace(/\.ts$/, '.js') } diff --git a/packages/@contentlayer/core/src/generation/generate-types.ts b/packages/@contentlayer/core/src/generation/generate-types.ts index 54e42e2b..e2faae9b 100644 --- a/packages/@contentlayer/core/src/generation/generate-types.ts +++ b/packages/@contentlayer/core/src/generation/generate-types.ts @@ -1,4 +1,4 @@ -import { casesHandled, pattern } from '@contentlayer-temp/utils' +import { casesHandled, pattern } from '@contentlayer2/utils' import type { SourcePluginType } from '../plugin.js' import type { DocumentTypeDef, FieldDef, ListFieldDefItem, NestedTypeDef, SchemaDef } from '../schema/index.js' @@ -40,8 +40,8 @@ export const renderTypes = ({ const importsForRawTypes = pattern .match(generationOptions.sourcePluginType) - .with('local', () => `import * as Local from 'contentlayer-temp/source-files'`) - .with('contentful', () => `import * as Contentful from '@contentlayer-temp/source-contentful'`) + .with('local', () => `import * as Local from 'contentlayer2/source-files'`) + .with('contentful', () => `import * as Contentful from '@contentlayer2/source-contentful'`) .otherwise(() => ``) const documentTypeNames = documentTypes.map(prop('typeName')) @@ -63,10 +63,10 @@ export const renderTypes = ({ return `\ // ${autogeneratedNote} -import type { Markdown, MDX, ImageFieldData, IsoDateTimeString } from 'contentlayer-temp/core' +import type { Markdown, MDX, ImageFieldData, IsoDateTimeString } from 'contentlayer2/core' ${importsForRawTypes} -export { isType } from 'contentlayer-temp/client' +export { isType } from 'contentlayer2/client' export type { Markdown, MDX, ImageFieldData, IsoDateTimeString } diff --git a/packages/@contentlayer/core/src/getConfig/esbuild.ts b/packages/@contentlayer/core/src/getConfig/esbuild.ts index beccb998..30545071 100644 --- a/packages/@contentlayer/core/src/getConfig/esbuild.ts +++ b/packages/@contentlayer/core/src/getConfig/esbuild.ts @@ -1,5 +1,5 @@ -import { errorToString } from '@contentlayer-temp/utils' -import { E, Ex, H, M, O, OT, pipe, Q, Ref, S, T, Tagged } from '@contentlayer-temp/utils/effect' +import { errorToString } from '@contentlayer2/utils' +import { E, Ex, H, M, O, OT, pipe, Q, Ref, S, T, Tagged } from '@contentlayer2/utils/effect' import * as esbuild from 'esbuild' export const EsbuildWatcherTypeId = Symbol() diff --git a/packages/@contentlayer/core/src/getConfig/index.ts b/packages/@contentlayer/core/src/getConfig/index.ts index f2a63914..f0921ecf 100644 --- a/packages/@contentlayer/core/src/getConfig/index.ts +++ b/packages/@contentlayer/core/src/getConfig/index.ts @@ -1,10 +1,10 @@ import * as path from 'node:path' -import type { AbsolutePosixFilePath } from '@contentlayer-temp/utils' -import { fs, unknownToAbsolutePosixFilePath } from '@contentlayer-temp/utils' -import type { E } from '@contentlayer-temp/utils/effect' -import { Array, Chunk, O, OT, pipe, S, T } from '@contentlayer-temp/utils/effect' -import type { GetContentlayerVersionError } from '@contentlayer-temp/utils/node' +import type { AbsolutePosixFilePath } from '@contentlayer2/utils' +import { fs, unknownToAbsolutePosixFilePath } from '@contentlayer2/utils' +import type { E } from '@contentlayer2/utils/effect' +import { Array, Chunk, O, OT, pipe, S, T } from '@contentlayer2/utils/effect' +import type { GetContentlayerVersionError } from '@contentlayer2/utils/node' import type { HasCwd } from '../cwd.js' import { getCwd } from '../cwd.js' @@ -44,7 +44,7 @@ export const getConfig = ({ S.runCollect, T.map(Chunk.unsafeHead), T.rightOrFail, - OT.withSpan('@contentlayer-temp/core/getConfig:getConfig', { attributes: { configPath } }), + OT.withSpan('@contentlayer2/core/getConfig:getConfig', { attributes: { configPath } }), ) export const getConfigWatch = ({ @@ -202,7 +202,7 @@ const getConfigFromResult = ({ return { source, esbuildHash, filePath: outfilePath } }), - OT.withSpan('@contentlayer-temp/core/getConfig:getConfigFromResult', { attributes: { configPath } }), + OT.withSpan('@contentlayer2/core/getConfig:getConfigFromResult', { attributes: { configPath } }), T.either, ) diff --git a/packages/@contentlayer/core/src/markdown/markdown.ts b/packages/@contentlayer/core/src/markdown/markdown.ts index 06b4c157..c34cbd31 100644 --- a/packages/@contentlayer/core/src/markdown/markdown.ts +++ b/packages/@contentlayer/core/src/markdown/markdown.ts @@ -1,6 +1,6 @@ -import { errorToString } from '@contentlayer-temp/utils' -import type { HasConsole } from '@contentlayer-temp/utils/effect' -import { OT, pipe, T, Tagged } from '@contentlayer-temp/utils/effect' +import { errorToString } from '@contentlayer2/utils' +import type { HasConsole } from '@contentlayer2/utils/effect' +import { OT, pipe, T, Tagged } from '@contentlayer2/utils/effect' import rehypeStringify from 'rehype-stringify' import remarkFrontmatter from 'remark-frontmatter' import remarkParse from 'remark-parse' @@ -71,7 +71,7 @@ export const markdownToHtml = ({ }), T.catchAllDefect(T.fail), T.mapError((error) => new UnexpectedMarkdownError({ error })), - OT.withSpan('@contentlayer-temp/core/markdown:markdownToHtml'), + OT.withSpan('@contentlayer2/core/markdown:markdownToHtml'), ) export class UnexpectedMarkdownError extends Tagged('UnexpectedMarkdownError')<{ readonly error: unknown }> { diff --git a/packages/@contentlayer/core/src/markdown/mdx.ts b/packages/@contentlayer/core/src/markdown/mdx.ts index 9e5a7d3f..19fe0546 100644 --- a/packages/@contentlayer/core/src/markdown/mdx.ts +++ b/packages/@contentlayer/core/src/markdown/mdx.ts @@ -1,7 +1,7 @@ import * as path from 'node:path' -import { errorToString } from '@contentlayer-temp/utils' -import { OT, pipe, T, Tagged } from '@contentlayer-temp/utils/effect' +import { errorToString } from '@contentlayer2/utils' +import { OT, pipe, T, Tagged } from '@contentlayer2/utils/effect' import * as mdxBundler from 'mdx-bundler' import type { BundleMDXOptions } from 'mdx-bundler/dist/types' @@ -80,7 +80,7 @@ export const bundleMDX = ({ }), T.mapError((error) => new UnexpectedMDXError({ error })), T.tapError(() => OT.addAttribute('mdxString', mdxString)), - OT.withSpan('@contentlayer-temp/core/markdown:bundleMDX'), + OT.withSpan('@contentlayer2/core/markdown:bundleMDX'), ) export class UnexpectedMDXError extends Tagged('UnexpectedMDXError')<{ readonly error: unknown }> { diff --git a/packages/@contentlayer/core/src/plugin.ts b/packages/@contentlayer/core/src/plugin.ts index 6cf81065..ac7e99a7 100644 --- a/packages/@contentlayer/core/src/plugin.ts +++ b/packages/@contentlayer/core/src/plugin.ts @@ -1,5 +1,5 @@ -import type { fs } from '@contentlayer-temp/utils' -import type { E, HasClock, HasConsole, OT, S, T } from '@contentlayer-temp/utils/effect' +import type { fs } from '@contentlayer2/utils' +import type { E, HasClock, HasConsole, OT, S, T } from '@contentlayer2/utils/effect' import type * as mdxEsbuild from '@mdx-js/esbuild/lib' import type * as mdxBundler from 'mdx-bundler/dist/types' import type { LiteralUnion } from 'type-fest' diff --git a/packages/@contentlayer/core/src/runMain.ts b/packages/@contentlayer/core/src/runMain.ts index 91a67b60..f9de6634 100644 --- a/packages/@contentlayer/core/src/runMain.ts +++ b/packages/@contentlayer/core/src/runMain.ts @@ -1,13 +1,13 @@ import * as os from 'node:os' -import type { HasCwd } from '@contentlayer-temp/core' -import { provideCwd, provideCwdCustom } from '@contentlayer-temp/core' -import * as core from '@contentlayer-temp/core' -import type { AbsolutePosixFilePath, fs } from '@contentlayer-temp/utils' -import { DummyTracing, InMemoryFsLive, provideTracing } from '@contentlayer-temp/utils' -import type { HasClock, HasConsole, OT } from '@contentlayer-temp/utils/effect' -import { Cause, pipe, pretty, provideConsole, T } from '@contentlayer-temp/utils/effect' -import { getContentlayerVersion, NodeFsLive } from '@contentlayer-temp/utils/node' +import type { HasCwd } from '@contentlayer2/core' +import { provideCwd, provideCwdCustom } from '@contentlayer2/core' +import * as core from '@contentlayer2/core' +import type { AbsolutePosixFilePath, fs } from '@contentlayer2/utils' +import { DummyTracing, InMemoryFsLive, provideTracing } from '@contentlayer2/utils' +import type { HasClock, HasConsole, OT } from '@contentlayer2/utils/effect' +import { Cause, pipe, pretty, provideConsole, T } from '@contentlayer2/utils/effect' +import { getContentlayerVersion, NodeFsLive } from '@contentlayer2/utils/node' export const runMain = ({ diff --git a/packages/@contentlayer/core/src/validate-tsconfig.ts b/packages/@contentlayer/core/src/validate-tsconfig.ts index 9f07c3bb..b0d6decf 100644 --- a/packages/@contentlayer/core/src/validate-tsconfig.ts +++ b/packages/@contentlayer/core/src/validate-tsconfig.ts @@ -1,8 +1,8 @@ import path from 'node:path' -import type { AbsolutePosixFilePath } from '@contentlayer-temp/utils' -import { filePathJoin, fs } from '@contentlayer-temp/utils' -import { Chunk, O, OT, pipe, T, Tagged } from '@contentlayer-temp/utils/effect' +import type { AbsolutePosixFilePath } from '@contentlayer2/utils' +import { filePathJoin, fs } from '@contentlayer2/utils' +import { Chunk, O, OT, pipe, T, Tagged } from '@contentlayer2/utils/effect' import { parse as parseJsonc } from 'comment-json' import { getCwd } from './cwd.js' diff --git a/packages/@contentlayer/experimental-source-files-stackbit/package.json b/packages/@contentlayer/experimental-source-files-stackbit/package.json index 859d149e..e7d8d229 100644 --- a/packages/@contentlayer/experimental-source-files-stackbit/package.json +++ b/packages/@contentlayer/experimental-source-files-stackbit/package.json @@ -1,5 +1,5 @@ { - "name": "@contentlayer-temp/experimental-source-files-stackbit", + "name": "@contentlayer2/experimental-source-files-stackbit", "version": "0.4.1", "type": "module", "exports": { @@ -26,9 +26,9 @@ } }, "dependencies": { - "@contentlayer-temp/core": "workspace:*", - "@contentlayer-temp/source-files": "workspace:*", - "@contentlayer-temp/utils": "workspace:*", + "@contentlayer2/core": "workspace:*", + "@contentlayer2/source-files": "workspace:*", + "@contentlayer2/utils": "workspace:*", "@stackbit/sdk": "~0.3.25" }, "devDependencies": { diff --git a/packages/@contentlayer/experimental-source-files-stackbit/src/__test__/stackbit.spec.ts b/packages/@contentlayer/experimental-source-files-stackbit/src/__test__/stackbit.spec.ts index f3f9e550..cb1802be 100644 --- a/packages/@contentlayer/experimental-source-files-stackbit/src/__test__/stackbit.spec.ts +++ b/packages/@contentlayer/experimental-source-files-stackbit/src/__test__/stackbit.spec.ts @@ -1,10 +1,10 @@ import path from 'node:path' import { fileURLToPath } from 'node:url' -import * as SourceFiles from '@contentlayer-temp/source-files' -import { provideDummyTracing } from '@contentlayer-temp/utils' -import type { HasClock, HasConsole, OT } from '@contentlayer-temp/utils/effect' -import { pipe, provideTestConsole, T } from '@contentlayer-temp/utils/effect' +import * as SourceFiles from '@contentlayer2/source-files' +import { provideDummyTracing } from '@contentlayer2/utils' +import type { HasClock, HasConsole, OT } from '@contentlayer2/utils/effect' +import { pipe, provideTestConsole, T } from '@contentlayer2/utils/effect' import * as Stackbit from '@stackbit/sdk' import { expect, test } from 'vitest' diff --git a/packages/@contentlayer/experimental-source-files-stackbit/src/index.ts b/packages/@contentlayer/experimental-source-files-stackbit/src/index.ts index 5233f5a6..ce10b9fd 100644 --- a/packages/@contentlayer/experimental-source-files-stackbit/src/index.ts +++ b/packages/@contentlayer/experimental-source-files-stackbit/src/index.ts @@ -1,8 +1,8 @@ -import type * as core from '@contentlayer-temp/core' -import type * as SourceFiles from '@contentlayer-temp/source-files' -import { defineDocumentType, defineNestedType } from '@contentlayer-temp/source-files' -import type { PartialDeep } from '@contentlayer-temp/utils' -import { mergeDeep, not, partition, pick } from '@contentlayer-temp/utils' +import type * as core from '@contentlayer2/core' +import type * as SourceFiles from '@contentlayer2/source-files' +import { defineDocumentType, defineNestedType } from '@contentlayer2/source-files' +import type { PartialDeep } from '@contentlayer2/utils' +import { mergeDeep, not, partition, pick } from '@contentlayer2/utils' import * as Stackbit from '@stackbit/sdk' import { validateAndNormalizeConfig } from '@stackbit/sdk/dist/config/config-loader.js' @@ -34,7 +34,7 @@ export type ContentlayerOverrideNestedType = { * ```ts * // contentlayer.config.ts * import { makeSource } from 'contentlayer/source-files' - * import { loadStackbitConfigAsDocumentTypes } from '@contentlayer-temp/experimental-source-files-stackbit' + * import { loadStackbitConfigAsDocumentTypes } from '@contentlayer2/experimental-source-files-stackbit' * * // Looks for `stackbit.yaml` in the current directory * export default loadStackbitConfigAsDocumentTypes().then((documentTypes) => { @@ -60,7 +60,7 @@ export const loadStackbitConfigAsDocumentTypes = diff --git a/packages/@contentlayer/source-contentful/package.json b/packages/@contentlayer/source-contentful/package.json index c0362729..10d8acdf 100644 --- a/packages/@contentlayer/source-contentful/package.json +++ b/packages/@contentlayer/source-contentful/package.json @@ -1,5 +1,5 @@ { - "name": "@contentlayer-temp/source-contentful", + "name": "@contentlayer2/source-contentful", "version": "0.4.1", "type": "module", "exports": "./dist/index.js", @@ -16,8 +16,8 @@ "@types/node": "^20.3.2" }, "dependencies": { - "@contentlayer-temp/core": "workspace:*", - "@contentlayer-temp/utils": "workspace:*", + "@contentlayer2/core": "workspace:*", + "@contentlayer2/utils": "workspace:*", "contentful-management": "7.22.4" }, "license": "MIT" diff --git a/packages/@contentlayer/source-contentful/src/contentful.ts b/packages/@contentlayer/source-contentful/src/contentful.ts index 8c6418b8..6f342110 100644 --- a/packages/@contentlayer/source-contentful/src/contentful.ts +++ b/packages/@contentlayer/source-contentful/src/contentful.ts @@ -1,4 +1,4 @@ -import { OT, pipe, T } from '@contentlayer-temp/utils/effect' +import { OT, pipe, T } from '@contentlayer2/utils/effect' import { createClient } from 'contentful-management' import { UnknownContentfulError } from './errors.js' @@ -12,7 +12,7 @@ export const environmentGetContentTypes = ( () => environment.getContentTypes().then((_) => _.items), (error) => new UnknownContentfulError({ error }), ), - OT.withSpan('@contentlayer-temp/source-contentlayer/contentful:environmentGetContentTypes'), + OT.withSpan('@contentlayer2/source-contentlayer/contentful:environmentGetContentTypes'), ) export const environmentGetEntries = ({ @@ -29,7 +29,7 @@ export const environmentGetEntries = ({ () => environment.getEntries({ limit, skip }), (error) => new UnknownContentfulError({ error }), ), - OT.withSpan('@contentlayer-temp/source-contentlayer/contentful:environmentGetEntries'), + OT.withSpan('@contentlayer2/source-contentlayer/contentful:environmentGetEntries'), ) export const environmentGetAssets = ({ @@ -46,7 +46,7 @@ export const environmentGetAssets = ({ () => environment.getAssets({ limit, skip }), (error) => new UnknownContentfulError({ error }), ), - OT.withSpan('@contentlayer-temp/source-contentlayer/contentful:environmentGetAssets'), + OT.withSpan('@contentlayer2/source-contentlayer/contentful:environmentGetAssets'), ) export const getEnvironment = ({ @@ -62,7 +62,7 @@ export const getEnvironment = ({ return pipe( T.tryPromise(() => client.getSpace(spaceId)), T.chain((space) => T.tryPromise(() => space.getEnvironment(environmentId))), - OT.withSpan('@contentlayer-temp/source-contentlayer/contentful:getEnvironment'), + OT.withSpan('@contentlayer2/source-contentlayer/contentful:getEnvironment'), T.mapError((error) => new UnknownContentfulError({ error })), ) } diff --git a/packages/@contentlayer/source-contentful/src/errors.ts b/packages/@contentlayer/source-contentful/src/errors.ts index 8d7959e9..f0972ae6 100644 --- a/packages/@contentlayer/source-contentful/src/errors.ts +++ b/packages/@contentlayer/source-contentful/src/errors.ts @@ -1,5 +1,5 @@ -import { errorToString } from '@contentlayer-temp/utils' -import { Tagged } from '@contentlayer-temp/utils/effect' +import { errorToString } from '@contentlayer2/utils' +import { Tagged } from '@contentlayer2/utils/effect' export class UnknownContentfulError extends Tagged('UnknownContentfulError')<{ readonly error: unknown }> { toString = () => `UnknownContentfulError: ${errorToString(this.error)}` diff --git a/packages/@contentlayer/source-contentful/src/fetchData/index.ts b/packages/@contentlayer/source-contentful/src/fetchData/index.ts index 0510ce2d..4a28225c 100644 --- a/packages/@contentlayer/source-contentful/src/fetchData/index.ts +++ b/packages/@contentlayer/source-contentful/src/fetchData/index.ts @@ -1,9 +1,9 @@ import * as os from 'node:os' -import * as core from '@contentlayer-temp/core' -import { fs } from '@contentlayer-temp/utils' -import type { HasConsole } from '@contentlayer-temp/utils/effect' -import { Chunk, OT, pipe, T } from '@contentlayer-temp/utils/effect' +import * as core from '@contentlayer2/core' +import { fs } from '@contentlayer2/utils' +import type { HasConsole } from '@contentlayer2/utils/effect' +import { Chunk, OT, pipe, T } from '@contentlayer2/utils/effect' import { environmentGetAssets, @@ -83,7 +83,7 @@ export const fetchAllDocuments = ({ options, }), ), - OT.withSpan('@contentlayer-temp/source-contentlayer/fetchData:makeCacheItems', { + OT.withSpan('@contentlayer2/source-contentlayer/fetchData:makeCacheItems', { attributes: { count: documentEntriesWithDocumentTypeDef.length }, }), ), @@ -93,7 +93,7 @@ export const fetchAllDocuments = ({ return { cacheItemsMap } }), - OT.withSpan('@contentlayer-temp/source-contentlayer/fetchData:fetchAllDocuments', { + OT.withSpan('@contentlayer2/source-contentlayer/fetchData:fetchAllDocuments', { attributes: { schemaDef: JSON.stringify(schemaDef), schemaOverrides_: JSON.stringify(schemaOverrides_) }, }), T.mapError((error) => new core.SourceFetchDataError({ error, alreadyHandled: false })), @@ -116,7 +116,7 @@ const getAllEntries = ( return entries }), - OT.withSpan('@contentlayer-temp/source-contentlayer/fetchData:getAllEntries'), + OT.withSpan('@contentlayer2/source-contentlayer/fetchData:getAllEntries'), ) const getAllAssets = ( @@ -136,5 +136,5 @@ const getAllAssets = ( return entries }), - OT.withSpan('@contentlayer-temp/source-contentlayer/fetchData:getAllAssets'), + OT.withSpan('@contentlayer2/source-contentlayer/fetchData:getAllAssets'), ) diff --git a/packages/@contentlayer/source-contentful/src/fetchData/mapping.ts b/packages/@contentlayer/source-contentful/src/fetchData/mapping.ts index a0e41411..208fde7b 100644 --- a/packages/@contentlayer/source-contentful/src/fetchData/mapping.ts +++ b/packages/@contentlayer/source-contentful/src/fetchData/mapping.ts @@ -1,8 +1,8 @@ -import * as core from '@contentlayer-temp/core' -import type { HashError } from '@contentlayer-temp/utils' -import { casesHandled, hashObject } from '@contentlayer-temp/utils' -import type { HasConsole, OT } from '@contentlayer-temp/utils/effect' -import { T } from '@contentlayer-temp/utils/effect' +import * as core from '@contentlayer2/core' +import type { HashError } from '@contentlayer2/utils' +import { casesHandled, hashObject } from '@contentlayer2/utils' +import type { HasConsole, OT } from '@contentlayer2/utils/effect' +import { T } from '@contentlayer2/utils/effect' import type * as SchemaOverrides from '../schemaOverrides.js' import type { Contentful } from '../types.js' diff --git a/packages/@contentlayer/source-contentful/src/index.ts b/packages/@contentlayer/source-contentful/src/index.ts index 24a4be64..cc8f1db6 100644 --- a/packages/@contentlayer/source-contentful/src/index.ts +++ b/packages/@contentlayer/source-contentful/src/index.ts @@ -1,6 +1,6 @@ -import type * as core from '@contentlayer-temp/core' -import { processArgs } from '@contentlayer-temp/core' -import { pipe, S, SC, T } from '@contentlayer-temp/utils/effect' +import type * as core from '@contentlayer2/core' +import { processArgs } from '@contentlayer2/core' +import { pipe, S, SC, T } from '@contentlayer2/utils/effect' import { fetchAllDocuments } from './fetchData/index.js' import { provideSchema } from './provideSchema.js' diff --git a/packages/@contentlayer/source-contentful/src/provideSchema.ts b/packages/@contentlayer/source-contentful/src/provideSchema.ts index 7a1fa9ec..d48d0186 100644 --- a/packages/@contentlayer/source-contentful/src/provideSchema.ts +++ b/packages/@contentlayer/source-contentful/src/provideSchema.ts @@ -1,8 +1,8 @@ -import * as core from '@contentlayer-temp/core' -import { SourceProvideSchemaError } from '@contentlayer-temp/core' -import * as utils from '@contentlayer-temp/utils' -import { casesHandled, partition } from '@contentlayer-temp/utils' -import { OT, pipe, T } from '@contentlayer-temp/utils/effect' +import * as core from '@contentlayer2/core' +import { SourceProvideSchemaError } from '@contentlayer2/core' +import * as utils from '@contentlayer2/utils' +import { casesHandled, partition } from '@contentlayer2/utils' +import { OT, pipe, T } from '@contentlayer2/utils/effect' import { environmentGetContentTypes, getEnvironment } from './contentful.js' import type * as SchemaOverrides from './schemaOverrides.js' @@ -64,7 +64,7 @@ export const provideSchema = ({ return coreSchemaDef }), - OT.withSpan('@contentlayer-temp/source-contentlayer/fetchData:provideSchema', { + OT.withSpan('@contentlayer2/source-contentlayer/fetchData:provideSchema', { attributes: { spaceId, environmentId }, }), T.mapError((error) => new SourceProvideSchemaError({ error })), diff --git a/packages/@contentlayer/source-contentful/src/schemaOverrides.ts b/packages/@contentlayer/source-contentful/src/schemaOverrides.ts index 4ffd8e75..83179d78 100644 --- a/packages/@contentlayer/source-contentful/src/schemaOverrides.ts +++ b/packages/@contentlayer/source-contentful/src/schemaOverrides.ts @@ -1,4 +1,4 @@ -import { mapObjectValues } from '@contentlayer-temp/utils' +import { mapObjectValues } from '@contentlayer2/utils' import type { Contentful } from './types.js' diff --git a/packages/@contentlayer/source-files/package.json b/packages/@contentlayer/source-files/package.json index 2184af71..2b64b40d 100644 --- a/packages/@contentlayer/source-files/package.json +++ b/packages/@contentlayer/source-files/package.json @@ -1,5 +1,5 @@ { - "name": "@contentlayer-temp/source-files", + "name": "@contentlayer2/source-files", "version": "0.4.1", "type": "module", "exports": { @@ -28,8 +28,8 @@ "test": "TZ='GMT' FORCE_COLOR=1 vitest" }, "dependencies": { - "@contentlayer-temp/core": "workspace:*", - "@contentlayer-temp/utils": "workspace:*", + "@contentlayer2/core": "workspace:*", + "@contentlayer2/utils": "workspace:*", "chokidar": "^3.5.3", "fast-glob": "^3.2.12", "gray-matter": "^4.0.3", diff --git a/packages/@contentlayer/source-files/src/__test__/errors/aggregate.spec.ts b/packages/@contentlayer/source-files/src/__test__/errors/aggregate.spec.ts index 6bff9ca8..6e85cf9b 100644 --- a/packages/@contentlayer/source-files/src/__test__/errors/aggregate.spec.ts +++ b/packages/@contentlayer/source-files/src/__test__/errors/aggregate.spec.ts @@ -1,5 +1,5 @@ -import type * as core from '@contentlayer-temp/core' -import { unknownToAbsolutePosixFilePath } from '@contentlayer-temp/utils' +import type * as core from '@contentlayer2/core' +import { unknownToAbsolutePosixFilePath } from '@contentlayer2/utils' import { expect, test } from 'vitest' import { testOnly_aggregateFetchDataErrors as aggregateFetchDataErrors } from '../../errors/aggregate.js' diff --git a/packages/@contentlayer/source-files/src/__test__/errors/utils.ts b/packages/@contentlayer/source-files/src/__test__/errors/utils.ts index 51aabdac..4f03bd0c 100644 --- a/packages/@contentlayer/source-files/src/__test__/errors/utils.ts +++ b/packages/@contentlayer/source-files/src/__test__/errors/utils.ts @@ -1,8 +1,8 @@ import * as path from 'node:path' -import type * as core from '@contentlayer-temp/core' -import type { RelativePosixFilePath } from '@contentlayer-temp/utils' -import { singleItem, unknownToRelativePosixFilePath } from '@contentlayer-temp/utils' +import type * as core from '@contentlayer2/core' +import type { RelativePosixFilePath } from '@contentlayer2/utils' +import { singleItem, unknownToRelativePosixFilePath } from '@contentlayer2/utils' import { faker } from '@faker-js/faker' import { FetchDataError } from '../../errors/index.js' diff --git a/packages/@contentlayer/source-files/src/__test__/fetchData/makeCacheItemFromFilePath.spec.ts b/packages/@contentlayer/source-files/src/__test__/fetchData/makeCacheItemFromFilePath.spec.ts index a31a028c..27302249 100644 --- a/packages/@contentlayer/source-files/src/__test__/fetchData/makeCacheItemFromFilePath.spec.ts +++ b/packages/@contentlayer/source-files/src/__test__/fetchData/makeCacheItemFromFilePath.spec.ts @@ -1,6 +1,6 @@ import path from 'node:path' -import { E } from '@contentlayer-temp/utils/effect' +import { E } from '@contentlayer2/utils/effect' import { fileURLToPath } from 'url' import { describe, expect, test } from 'vitest' diff --git a/packages/@contentlayer/source-files/src/__test__/fetchData/utils.ts b/packages/@contentlayer/source-files/src/__test__/fetchData/utils.ts index c9edc8b4..fed9188f 100644 --- a/packages/@contentlayer/source-files/src/__test__/fetchData/utils.ts +++ b/packages/@contentlayer/source-files/src/__test__/fetchData/utils.ts @@ -1,15 +1,15 @@ -import type { HasCwd } from '@contentlayer-temp/core' -import * as core from '@contentlayer-temp/core' -import { provideCwd } from '@contentlayer-temp/core' -import type { fs } from '@contentlayer-temp/utils' +import type { HasCwd } from '@contentlayer2/core' +import * as core from '@contentlayer2/core' +import { provideCwd } from '@contentlayer2/core' +import type { fs } from '@contentlayer2/utils' import { provideDummyTracing, unknownToAbsolutePosixFilePath, unknownToRelativePosixFilePath, -} from '@contentlayer-temp/utils' -import type { HasClock, HasConsole, OT } from '@contentlayer-temp/utils/effect' -import { pipe, provideTestConsole, T, These } from '@contentlayer-temp/utils/effect' -import { NodeFsLive } from '@contentlayer-temp/utils/node' +} from '@contentlayer2/utils' +import type { HasClock, HasConsole, OT } from '@contentlayer2/utils/effect' +import { pipe, provideTestConsole, T, These } from '@contentlayer2/utils/effect' +import { NodeFsLive } from '@contentlayer2/utils/node' import type { HasDocumentTypeMapState } from '../../fetchData/DocumentTypeMap.js' import { provideDocumentTypeMapState } from '../../fetchData/DocumentTypeMap.js' diff --git a/packages/@contentlayer/source-files/src/__test__/mapping/getDataForFieldDef.spec.ts b/packages/@contentlayer/source-files/src/__test__/mapping/getDataForFieldDef.spec.ts index 4d4fae69..09257a68 100644 --- a/packages/@contentlayer/source-files/src/__test__/mapping/getDataForFieldDef.spec.ts +++ b/packages/@contentlayer/source-files/src/__test__/mapping/getDataForFieldDef.spec.ts @@ -1,11 +1,11 @@ -import type { HasCwd } from '@contentlayer-temp/core' -import * as core from '@contentlayer-temp/core' -import { provideCwd } from '@contentlayer-temp/core' -import type { fs } from '@contentlayer-temp/utils' -import { provideTracing, unknownToRelativePosixFilePath } from '@contentlayer-temp/utils' -import type { HasClock, HasConsole } from '@contentlayer-temp/utils/effect' -import { OT, pipe, provideConsole, T } from '@contentlayer-temp/utils/effect' -import { NodeFsLive } from '@contentlayer-temp/utils/node' +import type { HasCwd } from '@contentlayer2/core' +import * as core from '@contentlayer2/core' +import { provideCwd } from '@contentlayer2/core' +import type { fs } from '@contentlayer2/utils' +import { provideTracing, unknownToRelativePosixFilePath } from '@contentlayer2/utils' +import type { HasClock, HasConsole } from '@contentlayer2/utils/effect' +import { OT, pipe, provideConsole, T } from '@contentlayer2/utils/effect' +import { NodeFsLive } from '@contentlayer2/utils/node' import { describe, expect, test } from 'vitest' import { provideDocumentContext } from '../../fetchData/DocumentContext.js' diff --git a/packages/@contentlayer/source-files/src/__test__/type-generation/__snapshots__/basic.spec.ts.snap b/packages/@contentlayer/source-files/src/__test__/type-generation/__snapshots__/basic.spec.ts.snap index 8d9238ff..4105d163 100644 --- a/packages/@contentlayer/source-files/src/__test__/type-generation/__snapshots__/basic.spec.ts.snap +++ b/packages/@contentlayer/source-files/src/__test__/type-generation/__snapshots__/basic.spec.ts.snap @@ -3,10 +3,10 @@ exports[`generate-types: references with embedded schema 1`] = ` "// NOTE This file is auto-generated by Contentlayer -import type { Markdown, MDX, ImageFieldData, IsoDateTimeString } from 'contentlayer-temp/core' -import * as Local from 'contentlayer-temp/source-files' +import type { Markdown, MDX, ImageFieldData, IsoDateTimeString } from 'contentlayer2/core' +import * as Local from 'contentlayer2/source-files' -export { isType } from 'contentlayer-temp/client' +export { isType } from 'contentlayer2/client' export type { Markdown, MDX, ImageFieldData, IsoDateTimeString } @@ -85,10 +85,10 @@ export type NestedTypeMap = { exports[`generate-types: simple schema 1`] = ` "// NOTE This file is auto-generated by Contentlayer -import type { Markdown, MDX, ImageFieldData, IsoDateTimeString } from 'contentlayer-temp/core' -import * as Local from 'contentlayer-temp/source-files' +import type { Markdown, MDX, ImageFieldData, IsoDateTimeString } from 'contentlayer2/core' +import * as Local from 'contentlayer2/source-files' -export { isType } from 'contentlayer-temp/client' +export { isType } from 'contentlayer2/client' export type { Markdown, MDX, ImageFieldData, IsoDateTimeString } @@ -156,10 +156,10 @@ export type NestedTypeMap = { exports[`generate-types: simple schema with optional fields 1`] = ` "// NOTE This file is auto-generated by Contentlayer -import type { Markdown, MDX, ImageFieldData, IsoDateTimeString } from 'contentlayer-temp/core' -import * as Local from 'contentlayer-temp/source-files' +import type { Markdown, MDX, ImageFieldData, IsoDateTimeString } from 'contentlayer2/core' +import * as Local from 'contentlayer2/source-files' -export { isType } from 'contentlayer-temp/client' +export { isType } from 'contentlayer2/client' export type { Markdown, MDX, ImageFieldData, IsoDateTimeString } diff --git a/packages/@contentlayer/source-files/src/__test__/type-generation/basic.spec.ts b/packages/@contentlayer/source-files/src/__test__/type-generation/basic.spec.ts index 0168a323..4bd761a0 100644 --- a/packages/@contentlayer/source-files/src/__test__/type-generation/basic.spec.ts +++ b/packages/@contentlayer/source-files/src/__test__/type-generation/basic.spec.ts @@ -1,6 +1,6 @@ -import { renderTypes } from '@contentlayer-temp/core' -import { provideJaegerTracing } from '@contentlayer-temp/utils' -import { pipe, provideConsole, T } from '@contentlayer-temp/utils/effect' +import { renderTypes } from '@contentlayer2/core' +import { provideJaegerTracing } from '@contentlayer2/utils' +import { pipe, provideConsole, T } from '@contentlayer2/utils/effect' import { expect, test } from 'vitest' import type { DocumentTypes } from '../../index.js' diff --git a/packages/@contentlayer/source-files/src/errors/aggregate.ts b/packages/@contentlayer/source-files/src/errors/aggregate.ts index 4b4bec4d..ddca98bf 100644 --- a/packages/@contentlayer/source-files/src/errors/aggregate.ts +++ b/packages/@contentlayer/source-files/src/errors/aggregate.ts @@ -1,8 +1,8 @@ -import * as core from '@contentlayer-temp/core' -import type { AbsolutePosixFilePath } from '@contentlayer-temp/utils' -import { AsciiTree } from '@contentlayer-temp/utils' -import type { HasConsole } from '@contentlayer-temp/utils/effect' -import { T } from '@contentlayer-temp/utils/effect' +import * as core from '@contentlayer2/core' +import type { AbsolutePosixFilePath } from '@contentlayer2/utils' +import { AsciiTree } from '@contentlayer2/utils' +import type { HasConsole } from '@contentlayer2/utils/effect' +import { T } from '@contentlayer2/utils/effect' import type { Flags } from '../types.js' import type { FetchDataError } from './index.js' diff --git a/packages/@contentlayer/source-files/src/errors/index.ts b/packages/@contentlayer/source-files/src/errors/index.ts index 59eaa352..0ba1a0e9 100644 --- a/packages/@contentlayer/source-files/src/errors/index.ts +++ b/packages/@contentlayer/source-files/src/errors/index.ts @@ -1,7 +1,7 @@ -import type * as core from '@contentlayer-temp/core' -import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer-temp/utils' -import { errorToString, pattern } from '@contentlayer-temp/utils' -import { pipe, T, Tagged } from '@contentlayer-temp/utils/effect' +import type * as core from '@contentlayer2/core' +import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer2/utils' +import { errorToString, pattern } from '@contentlayer2/utils' +import { pipe, T, Tagged } from '@contentlayer2/utils/effect' import { getDocumentContext } from '../fetchData/DocumentContext.js' import type { DocumentContentType } from '../index.js' diff --git a/packages/@contentlayer/source-files/src/fetchData/DocumentContext.ts b/packages/@contentlayer/source-files/src/fetchData/DocumentContext.ts index 7883d8d1..5c3c361d 100644 --- a/packages/@contentlayer/source-files/src/fetchData/DocumentContext.ts +++ b/packages/@contentlayer/source-files/src/fetchData/DocumentContext.ts @@ -1,10 +1,10 @@ import * as path from 'node:path' -import type * as core from '@contentlayer-temp/core' -import type { RelativePosixFilePath } from '@contentlayer-temp/utils' -import * as utils from '@contentlayer-temp/utils' -import type { Has } from '@contentlayer-temp/utils/effect' -import { T, tag } from '@contentlayer-temp/utils/effect' +import type * as core from '@contentlayer2/core' +import type { RelativePosixFilePath } from '@contentlayer2/utils' +import * as utils from '@contentlayer2/utils' +import type { Has } from '@contentlayer2/utils/effect' +import { T, tag } from '@contentlayer2/utils/effect' import type { DocumentContentType } from '../schema/defs/index.js' import type { RawDocumentData } from '../types.js' @@ -19,7 +19,7 @@ export interface DocumentContext { readonly documentTypeDef: core.DocumentTypeDef } -export const DocumentContext = tag(Symbol.for('@contentlayer-temp/source-files/DocumentContext')) +export const DocumentContext = tag(Symbol.for('@contentlayer2/source-files/DocumentContext')) export const provideDocumentContext = (_: DocumentContext) => T.provideService(DocumentContext)(_) export const makeAndProvideDocumentContext = ({ diff --git a/packages/@contentlayer/source-files/src/fetchData/DocumentTypeMap.ts b/packages/@contentlayer/source-files/src/fetchData/DocumentTypeMap.ts index 3f28ec26..00ea7036 100644 --- a/packages/@contentlayer/source-files/src/fetchData/DocumentTypeMap.ts +++ b/packages/@contentlayer/source-files/src/fetchData/DocumentTypeMap.ts @@ -1,6 +1,6 @@ -import type { RelativePosixFilePath } from '@contentlayer-temp/utils' -import type { Has } from '@contentlayer-temp/utils/effect' -import { HashMap, O, pipe, State, T, Tagged } from '@contentlayer-temp/utils/effect' +import type { RelativePosixFilePath } from '@contentlayer2/utils' +import type { Has } from '@contentlayer2/utils/effect' +import { HashMap, O, pipe, State, T, Tagged } from '@contentlayer2/utils/effect' type DocumentTypeName = string diff --git a/packages/@contentlayer/source-files/src/fetchData/fetchAllDocuments.ts b/packages/@contentlayer/source-files/src/fetchData/fetchAllDocuments.ts index 28aed69f..26724ecf 100644 --- a/packages/@contentlayer/source-files/src/fetchData/fetchAllDocuments.ts +++ b/packages/@contentlayer/source-files/src/fetchData/fetchAllDocuments.ts @@ -1,10 +1,10 @@ import * as os from 'node:os' -import type * as core from '@contentlayer-temp/core' -import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer-temp/utils' -import { asMutableArray, fs, relativePosixFilePath } from '@contentlayer-temp/utils' -import type { HasConsole } from '@contentlayer-temp/utils/effect' -import { Chunk, O, OT, pipe, T } from '@contentlayer-temp/utils/effect' +import type * as core from '@contentlayer2/core' +import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer2/utils' +import { asMutableArray, fs, relativePosixFilePath } from '@contentlayer2/utils' +import type { HasConsole } from '@contentlayer2/utils/effect' +import { Chunk, O, OT, pipe, T } from '@contentlayer2/utils/effect' import glob from 'fast-glob' import { FetchDataError } from '../errors/index.js' @@ -87,7 +87,7 @@ export const fetchAllDocuments = ({ return { cacheItemsMap } }), provideDocumentTypeMapState, - OT.withSpan('@contentlayer-temp/source-local/fetchData:fetchAllDocuments', { attributes: { contentDirPath } }), + OT.withSpan('@contentlayer2/source-local/fetchData:fetchAllDocuments', { attributes: { contentDirPath } }), ) const getAllRelativeFilePaths = ({ @@ -119,7 +119,7 @@ const getAllRelativeFilePaths = ({ (error) => new fs.UnknownFSError({ error }), ), T.map((_) => _.map(relativePosixFilePath)), - OT.withSpan('@contentlayer-temp/source-local/fetchData:getAllRelativeFilePaths'), + OT.withSpan('@contentlayer2/source-local/fetchData:getAllRelativeFilePaths'), ) } diff --git a/packages/@contentlayer/source-files/src/fetchData/index.ts b/packages/@contentlayer/source-files/src/fetchData/index.ts index 7e8be5ac..2fbefc92 100644 --- a/packages/@contentlayer/source-files/src/fetchData/index.ts +++ b/packages/@contentlayer/source-files/src/fetchData/index.ts @@ -1,11 +1,11 @@ -import type { HasCwd } from '@contentlayer-temp/core' -import * as core from '@contentlayer-temp/core' -import type { AbsolutePosixFilePath, fs, RelativePosixFilePath } from '@contentlayer-temp/utils' -import * as utils from '@contentlayer-temp/utils' -import { unknownToRelativePosixFilePath } from '@contentlayer-temp/utils' -import type { E, HasConsole, OT } from '@contentlayer-temp/utils/effect' -import { pipe, S, T, These } from '@contentlayer-temp/utils/effect' -import { FSWatch } from '@contentlayer-temp/utils/node' +import type { HasCwd } from '@contentlayer2/core' +import * as core from '@contentlayer2/core' +import type { AbsolutePosixFilePath, fs, RelativePosixFilePath } from '@contentlayer2/utils' +import * as utils from '@contentlayer2/utils' +import { unknownToRelativePosixFilePath } from '@contentlayer2/utils' +import type { E, HasConsole, OT } from '@contentlayer2/utils/effect' +import { pipe, S, T, These } from '@contentlayer2/utils/effect' +import { FSWatch } from '@contentlayer2/utils/node' import { FetchDataError } from '../errors/index.js' import type * as LocalSchema from '../schema/defs/index.js' diff --git a/packages/@contentlayer/source-files/src/fetchData/makeCacheItemFromFilePath.ts b/packages/@contentlayer/source-files/src/fetchData/makeCacheItemFromFilePath.ts index ab4dd4f5..8190827d 100644 --- a/packages/@contentlayer/source-files/src/fetchData/makeCacheItemFromFilePath.ts +++ b/packages/@contentlayer/source-files/src/fetchData/makeCacheItemFromFilePath.ts @@ -1,8 +1,8 @@ -import type * as core from '@contentlayer-temp/core' -import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer-temp/utils' -import { filePathJoin, fs } from '@contentlayer-temp/utils' -import type { HasConsole } from '@contentlayer-temp/utils/effect' -import { identity, O, OT, pipe, T, These } from '@contentlayer-temp/utils/effect' +import type * as core from '@contentlayer2/core' +import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer2/utils' +import { filePathJoin, fs } from '@contentlayer2/utils' +import type { HasConsole } from '@contentlayer2/utils/effect' +import { identity, O, OT, pipe, T, These } from '@contentlayer2/utils/effect' import matter from 'gray-matter' import yaml from 'yaml' @@ -106,7 +106,7 @@ export const makeCacheItemFromFilePath = ({ warnings, ) }), - OT.withSpan('@contentlayer-temp/source-local/fetchData:makeCacheItemFromFilePath', { + OT.withSpan('@contentlayer2/source-local/fetchData:makeCacheItemFromFilePath', { attributes: { relativeFilePath }, }), T.mapError((error) => { @@ -180,7 +180,7 @@ const processRawContent = ({ ) } }), - OT.withSpan('@contentlayer-temp/source-local/fetchData:getRawContent'), + OT.withSpan('@contentlayer2/source-local/fetchData:getRawContent'), ) const getComputedValues = ({ diff --git a/packages/@contentlayer/source-files/src/fetchData/mapping/field-date.ts b/packages/@contentlayer/source-files/src/fetchData/mapping/field-date.ts index 915426db..e6bb46f4 100644 --- a/packages/@contentlayer/source-files/src/fetchData/mapping/field-date.ts +++ b/packages/@contentlayer/source-files/src/fetchData/mapping/field-date.ts @@ -1,6 +1,6 @@ -import type * as core from '@contentlayer-temp/core' -import { Temporal } from '@contentlayer-temp/utils' -import { pipe, T } from '@contentlayer-temp/utils/effect' +import type * as core from '@contentlayer2/core' +import { Temporal } from '@contentlayer2/utils' +import { pipe, T } from '@contentlayer2/utils/effect' import { FetchDataError } from '../../errors/index.js' diff --git a/packages/@contentlayer/source-files/src/fetchData/mapping/field-image.ts b/packages/@contentlayer/source-files/src/fetchData/mapping/field-image.ts index c82b69cd..b961f280 100644 --- a/packages/@contentlayer/source-files/src/fetchData/mapping/field-image.ts +++ b/packages/@contentlayer/source-files/src/fetchData/mapping/field-image.ts @@ -1,7 +1,7 @@ -import * as core from '@contentlayer-temp/core' -import * as utils from '@contentlayer-temp/utils' -import { fs, unknownToRelativePosixFilePath } from '@contentlayer-temp/utils' -import { identity, OT, pipe, T } from '@contentlayer-temp/utils/effect' +import * as core from '@contentlayer2/core' +import * as utils from '@contentlayer2/utils' +import { fs, unknownToRelativePosixFilePath } from '@contentlayer2/utils' +import { identity, OT, pipe, T } from '@contentlayer2/utils/effect' import type * as ImageScript from 'imagescript' import type sharp from 'sharp' diff --git a/packages/@contentlayer/source-files/src/fetchData/mapping/field-markdown.ts b/packages/@contentlayer/source-files/src/fetchData/mapping/field-markdown.ts index fa07934f..772a58f5 100644 --- a/packages/@contentlayer/source-files/src/fetchData/mapping/field-markdown.ts +++ b/packages/@contentlayer/source-files/src/fetchData/mapping/field-markdown.ts @@ -1,7 +1,7 @@ -import * as core from '@contentlayer-temp/core' -import * as utils from '@contentlayer-temp/utils' -import type { HasConsole, OT } from '@contentlayer-temp/utils/effect' -import { T } from '@contentlayer-temp/utils/effect' +import * as core from '@contentlayer2/core' +import * as utils from '@contentlayer2/utils' +import type { HasConsole, OT } from '@contentlayer2/utils/effect' +import { T } from '@contentlayer2/utils/effect' import type { HasDocumentContext } from '../DocumentContext.js' import { getFromDocumentContext } from '../DocumentContext.js' diff --git a/packages/@contentlayer/source-files/src/fetchData/mapping/field-mdx.ts b/packages/@contentlayer/source-files/src/fetchData/mapping/field-mdx.ts index d2a8b84e..36ad493c 100644 --- a/packages/@contentlayer/source-files/src/fetchData/mapping/field-mdx.ts +++ b/packages/@contentlayer/source-files/src/fetchData/mapping/field-mdx.ts @@ -1,8 +1,8 @@ -import * as core from '@contentlayer-temp/core' -import type { AbsolutePosixFilePath } from '@contentlayer-temp/utils' -import * as utils from '@contentlayer-temp/utils' -import type { OT } from '@contentlayer-temp/utils/effect' -import { T } from '@contentlayer-temp/utils/effect' +import * as core from '@contentlayer2/core' +import type { AbsolutePosixFilePath } from '@contentlayer2/utils' +import * as utils from '@contentlayer2/utils' +import type { OT } from '@contentlayer2/utils/effect' +import { T } from '@contentlayer2/utils/effect' import type { HasDocumentContext } from '../DocumentContext.js' import { getFromDocumentContext } from '../DocumentContext.js' diff --git a/packages/@contentlayer/source-files/src/fetchData/mapping/index.ts b/packages/@contentlayer/source-files/src/fetchData/mapping/index.ts index 432dabd5..1e4e1ec2 100644 --- a/packages/@contentlayer/source-files/src/fetchData/mapping/index.ts +++ b/packages/@contentlayer/source-files/src/fetchData/mapping/index.ts @@ -1,8 +1,8 @@ -import type * as core from '@contentlayer-temp/core' -import type { AbsolutePosixFilePath, fs, RelativePosixFilePath } from '@contentlayer-temp/utils' -import * as utils from '@contentlayer-temp/utils' -import type { HasConsole, OT } from '@contentlayer-temp/utils/effect' -import { identity, pipe, T } from '@contentlayer-temp/utils/effect' +import type * as core from '@contentlayer2/core' +import type { AbsolutePosixFilePath, fs, RelativePosixFilePath } from '@contentlayer2/utils' +import * as utils from '@contentlayer2/utils' +import type { HasConsole, OT } from '@contentlayer2/utils/effect' +import { identity, pipe, T } from '@contentlayer2/utils/effect' import { FetchDataError } from '../../errors/index.js' import type { HasDocumentContext } from '../DocumentContext.js' diff --git a/packages/@contentlayer/source-files/src/fetchData/mapping/parseFieldData.ts b/packages/@contentlayer/source-files/src/fetchData/mapping/parseFieldData.ts index 50c3d4d3..c7e1d7ac 100644 --- a/packages/@contentlayer/source-files/src/fetchData/mapping/parseFieldData.ts +++ b/packages/@contentlayer/source-files/src/fetchData/mapping/parseFieldData.ts @@ -1,5 +1,5 @@ -import type * as core from '@contentlayer-temp/core' -import { T } from '@contentlayer-temp/utils/effect' +import type * as core from '@contentlayer2/core' +import { T } from '@contentlayer2/utils/effect' import * as zod from 'zod' import { FetchDataError } from '../../errors/index.js' diff --git a/packages/@contentlayer/source-files/src/fetchData/validateDocumentData.ts b/packages/@contentlayer/source-files/src/fetchData/validateDocumentData.ts index c60fbaa4..8a99da44 100644 --- a/packages/@contentlayer/source-files/src/fetchData/validateDocumentData.ts +++ b/packages/@contentlayer/source-files/src/fetchData/validateDocumentData.ts @@ -1,7 +1,7 @@ -import type * as core from '@contentlayer-temp/core' -import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer-temp/utils' -import { filePathJoin, fs } from '@contentlayer-temp/utils' -import { O, OT, pipe, T, These } from '@contentlayer-temp/utils/effect' +import type * as core from '@contentlayer2/core' +import type { AbsolutePosixFilePath, RelativePosixFilePath } from '@contentlayer2/utils' +import { filePathJoin, fs } from '@contentlayer2/utils' +import { O, OT, pipe, T, These } from '@contentlayer2/utils/effect' import micromatch from 'micromatch' import { FetchDataError } from '../errors/index.js' diff --git a/packages/@contentlayer/source-files/src/index.ts b/packages/@contentlayer/source-files/src/index.ts index 686f6a49..48dd1e44 100644 --- a/packages/@contentlayer/source-files/src/index.ts +++ b/packages/@contentlayer/source-files/src/index.ts @@ -1,7 +1,7 @@ -import * as core from '@contentlayer-temp/core' -import { processArgs, SourceProvideSchemaError } from '@contentlayer-temp/core' -import { unknownToAbsolutePosixFilePath, unknownToRelativePosixFilePath } from '@contentlayer-temp/utils' -import { pipe, S, T } from '@contentlayer-temp/utils/effect' +import * as core from '@contentlayer2/core' +import { processArgs, SourceProvideSchemaError } from '@contentlayer2/core' +import { unknownToAbsolutePosixFilePath, unknownToRelativePosixFilePath } from '@contentlayer2/utils' +import { pipe, S, T } from '@contentlayer2/utils/effect' import { fetchData } from './fetchData/index.js' import type * as LocalSchema from './schema/defs/index.js' diff --git a/packages/@contentlayer/source-files/src/schema/defs/computed-field.ts b/packages/@contentlayer/source-files/src/schema/defs/computed-field.ts index 3a6fe74a..65765b21 100644 --- a/packages/@contentlayer/source-files/src/schema/defs/computed-field.ts +++ b/packages/@contentlayer/source-files/src/schema/defs/computed-field.ts @@ -1,4 +1,4 @@ -import type { GetDocumentTypeMapGen } from '@contentlayer-temp/core' +import type { GetDocumentTypeMapGen } from '@contentlayer2/core' import type { LocalDocument } from '../../types.js' import type { FieldDefType } from './index.js' diff --git a/packages/@contentlayer/source-files/src/schema/defs/index.ts b/packages/@contentlayer/source-files/src/schema/defs/index.ts index fcb742d0..30631dfa 100644 --- a/packages/@contentlayer/source-files/src/schema/defs/index.ts +++ b/packages/@contentlayer/source-files/src/schema/defs/index.ts @@ -1,5 +1,5 @@ -import type * as core from '@contentlayer-temp/core' -import type { Thunk } from '@contentlayer-temp/utils' +import type * as core from '@contentlayer2/core' +import type { Thunk } from '@contentlayer2/utils' import type { ComputedField } from './computed-field.js' import type { FieldDef, FieldDefWithName } from './field.js' diff --git a/packages/@contentlayer/source-files/src/schema/provideSchema.ts b/packages/@contentlayer/source-files/src/schema/provideSchema.ts index 618e8b45..b9b69fa3 100644 --- a/packages/@contentlayer/source-files/src/schema/provideSchema.ts +++ b/packages/@contentlayer/source-files/src/schema/provideSchema.ts @@ -1,6 +1,6 @@ -import * as core from '@contentlayer-temp/core' -import * as utils from '@contentlayer-temp/utils' -import { identity, T } from '@contentlayer-temp/utils/effect' +import * as core from '@contentlayer2/core' +import * as utils from '@contentlayer2/utils' +import { identity, T } from '@contentlayer2/utils/effect' import type { SchemaError } from '../errors/index.js' import { DuplicateBodyFieldError } from '../errors/index.js' diff --git a/packages/@contentlayer/source-files/src/types.ts b/packages/@contentlayer/source-files/src/types.ts index e83dd148..b156385e 100644 --- a/packages/@contentlayer/source-files/src/types.ts +++ b/packages/@contentlayer/source-files/src/types.ts @@ -1,4 +1,4 @@ -import type { DateOptions, MarkdownOptions, MarkdownUnifiedBuilderCallback, MDXOptions } from '@contentlayer-temp/core' +import type { DateOptions, MarkdownOptions, MarkdownUnifiedBuilderCallback, MDXOptions } from '@contentlayer2/core' import type { DocumentContentType } from './schema/defs/index.js' diff --git a/packages/@contentlayer/source-remote-files/package.json b/packages/@contentlayer/source-remote-files/package.json index 723879df..dedbace9 100644 --- a/packages/@contentlayer/source-remote-files/package.json +++ b/packages/@contentlayer/source-remote-files/package.json @@ -1,5 +1,5 @@ { - "name": "@contentlayer-temp/source-remote-files", + "name": "@contentlayer2/source-remote-files", "version": "0.4.1", "type": "module", "exports": { @@ -15,8 +15,8 @@ "./package.json" ], "dependencies": { - "@contentlayer-temp/core": "workspace:*", - "@contentlayer-temp/source-files": "workspace:*", - "@contentlayer-temp/utils": "workspace:*" + "@contentlayer2/core": "workspace:*", + "@contentlayer2/source-files": "workspace:*", + "@contentlayer2/utils": "workspace:*" } } diff --git a/packages/@contentlayer/source-remote-files/src/index.ts b/packages/@contentlayer/source-remote-files/src/index.ts index 16f83aca..03e33a23 100644 --- a/packages/@contentlayer/source-remote-files/src/index.ts +++ b/packages/@contentlayer/source-remote-files/src/index.ts @@ -1,8 +1,8 @@ -import * as core from '@contentlayer-temp/core' -import type { Args as SourceFilesArgs } from '@contentlayer-temp/source-files' -import { makeSource as makeSourceFromSourceFiles } from '@contentlayer-temp/source-files' -import { unknownToAbsolutePosixFilePath } from '@contentlayer-temp/utils' -import { M, OT, pipe, S, T } from '@contentlayer-temp/utils/effect' +import * as core from '@contentlayer2/core' +import type { Args as SourceFilesArgs } from '@contentlayer2/source-files' +import { makeSource as makeSourceFromSourceFiles } from '@contentlayer2/source-files' +import { unknownToAbsolutePosixFilePath } from '@contentlayer2/utils' +import { M, OT, pipe, S, T } from '@contentlayer2/utils/effect' type CancelFn = () => void diff --git a/packages/@contentlayer/utils/package.json b/packages/@contentlayer/utils/package.json index 0218f61f..22bf4037 100644 --- a/packages/@contentlayer/utils/package.json +++ b/packages/@contentlayer/utils/package.json @@ -1,5 +1,5 @@ { - "name": "@contentlayer-temp/utils", + "name": "@contentlayer2/utils", "version": "0.4.1", "type": "module", "exports": { diff --git a/packages/contentful-generator/package.json b/packages/contentful-generator/package.json index 6f87fb05..6f1c5c83 100644 --- a/packages/contentful-generator/package.json +++ b/packages/contentful-generator/package.json @@ -1,5 +1,5 @@ { - "name": "contentful-generator-temp", + "name": "contentful-generator2", "private": true, "scripts": { "dev": "ts-node --transpile-only --compiler-options '{\"module\":\"CommonJS\"}' ./src/index.ts" diff --git a/packages/contentlayer-stackbit-yaml-generator/package.json b/packages/contentlayer-stackbit-yaml-generator/package.json index a6e01e8f..56410db0 100644 --- a/packages/contentlayer-stackbit-yaml-generator/package.json +++ b/packages/contentlayer-stackbit-yaml-generator/package.json @@ -1,5 +1,5 @@ { - "name": "contentlayer-stackbit-yaml-generator-temp", + "name": "contentlayer-stackbit-yaml-generator2", "version": "0.4.4", "type": "module", "bin": "./dist/cli/index.js", @@ -15,15 +15,15 @@ "test": "FORCE_COLOR=1 vitest" }, "dependencies": { - "@contentlayer-temp/core": "workspace:*", - "@contentlayer-temp/utils": "workspace:*", + "@contentlayer2/core": "workspace:*", + "@contentlayer2/utils": "workspace:*", "@stackbit/sdk": "^0.3.25", "clipanion": "^3.2.1", "typanion": "3.12.1", "yaml": "^2.3.1" }, "devDependencies": { - "contentlayer-temp": "workspace:*", + "contentlayer2": "workspace:*", "typescript": "^5.1.6", "vite": "^5.0.12", "vitest": "1.2.2" diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Blog.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Blog.ts index 7eb6f299..acf97736 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Blog.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Blog.ts @@ -1,4 +1,4 @@ -import { defineDocumentType } from 'contentlayer-temp/source-files' +import { defineDocumentType } from 'contentlayer2/source-files' import { SEO } from '../nested/SEO.js' import { urlFromFilePath } from '../utils.js' diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Config.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Config.ts index ee5c8292..acf28406 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Config.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Config.ts @@ -1,4 +1,4 @@ -import { defineDocumentType, defineFields, defineNestedType } from 'contentlayer-temp/source-files' +import { defineDocumentType, defineFields, defineNestedType } from 'contentlayer2/source-files' import { Action } from '../nested/Action.js' import { FormField } from '../nested/FormField.js' diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Landing.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Landing.ts index cf3356eb..0afade9a 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Landing.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Landing.ts @@ -1,4 +1,4 @@ -import { defineDocumentType, defineFields, defineNestedType } from 'contentlayer-temp/source-files' +import { defineDocumentType, defineFields, defineNestedType } from 'contentlayer2/source-files' import { Action } from '../nested/Action.js' import { FormField } from '../nested/FormField.js' diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Page.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Page.ts index 4f14edcb..efd3738d 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Page.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Page.ts @@ -1,4 +1,4 @@ -import { defineDocumentType } from 'contentlayer-temp/source-files' +import { defineDocumentType } from 'contentlayer2/source-files' import { SEO } from '../nested/SEO.js' import { urlFromFilePath } from '../utils.js' diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Person.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Person.ts index 0ee49774..c5300b53 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Person.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Person.ts @@ -1,4 +1,4 @@ -import { defineDocumentType } from 'contentlayer-temp/source-files' +import { defineDocumentType } from 'contentlayer2/source-files' export const Person = defineDocumentType(() => ({ name: 'Person', diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Post.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Post.ts index 0541fe65..3ee525d7 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Post.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/documents/Post.ts @@ -1,4 +1,4 @@ -import { defineDocumentType } from 'contentlayer-temp/source-files' +import { defineDocumentType } from 'contentlayer2/source-files' import { SEO } from '../nested/SEO.js' import { urlFromFilePath } from '../utils.js' diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/Action.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/Action.ts index bb72e568..79ee3a90 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/Action.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/Action.ts @@ -1,4 +1,4 @@ -import { defineNestedType } from 'contentlayer-temp/source-files' +import { defineNestedType } from 'contentlayer2/source-files' export const Action = defineNestedType(() => ({ name: 'Action', diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/FormField.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/FormField.ts index 83a70e8d..23f36099 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/FormField.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/FormField.ts @@ -1,4 +1,4 @@ -import { defineNestedType } from 'contentlayer-temp/source-files' +import { defineNestedType } from 'contentlayer2/source-files' export const FormField = defineNestedType(() => ({ name: 'FormField', diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/SEO.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/SEO.ts index 905bab4c..c275688a 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/SEO.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/nested/SEO.ts @@ -1,4 +1,4 @@ -import { defineNestedType } from 'contentlayer-temp/source-files' +import { defineNestedType } from 'contentlayer2/source-files' export const SEO = defineNestedType(() => ({ name: 'SEO', diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/utils.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/utils.ts index 54e0637b..694d9cbf 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/utils.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/azimuth-schema/utils.ts @@ -1,3 +1,3 @@ -import type { DocumentGen } from 'contentlayer-temp/core' +import type { DocumentGen } from 'contentlayer2/core' export const urlFromFilePath = (doc: DocumentGen): string => doc._raw.flattenedPath.replace(/pages\/?/, '') diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/blog-schema/index.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/blog-schema/index.ts index 9ffb50aa..66b6f36e 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/blog-schema/index.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/blog-schema/index.ts @@ -1,4 +1,4 @@ -import { defineDocumentType } from 'contentlayer-temp/source-files' +import { defineDocumentType } from 'contentlayer2/source-files' export const post = defineDocumentType(() => ({ name: 'Post', diff --git a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/index.ts b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/index.ts index 9bb1903b..8029782e 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/index.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/__test__/fixtures/index.ts @@ -1,7 +1,7 @@ -import { provideJaegerTracing } from '@contentlayer-temp/utils' -import { pipe, provideConsole, T } from '@contentlayer-temp/utils/effect' -import type { DocumentType } from 'contentlayer-temp/source-files' -import { makeSource } from 'contentlayer-temp/source-files' +import { provideJaegerTracing } from '@contentlayer2/utils' +import { pipe, provideConsole, T } from '@contentlayer2/utils/effect' +import type { DocumentType } from 'contentlayer2/source-files' +import { makeSource } from 'contentlayer2/source-files' import * as azimuth from './azimuth-schema/index.js' import * as blog from './blog-schema/index.js' diff --git a/packages/contentlayer-stackbit-yaml-generator/src/cli/DefaultCommand.ts b/packages/contentlayer-stackbit-yaml-generator/src/cli/DefaultCommand.ts index 61b37602..66a3dd24 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/cli/DefaultCommand.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/cli/DefaultCommand.ts @@ -1,13 +1,13 @@ import { promises as fsp } from 'node:fs' import * as path from 'node:path' -import type { HasCwd } from '@contentlayer-temp/core' -import { getConfig, provideCwd } from '@contentlayer-temp/core' -import type { fs } from '@contentlayer-temp/utils' -import { provideJaegerTracing, recRemoveUndefinedValues } from '@contentlayer-temp/utils' -import type { HasConsole } from '@contentlayer-temp/utils/effect' -import { OT, pipe, pretty, provideConsole, T } from '@contentlayer-temp/utils/effect' -import { NodeFsLive } from '@contentlayer-temp/utils/node' +import type { HasCwd } from '@contentlayer2/core' +import { getConfig, provideCwd } from '@contentlayer2/core' +import type { fs } from '@contentlayer2/utils' +import { provideJaegerTracing, recRemoveUndefinedValues } from '@contentlayer2/utils' +import type { HasConsole } from '@contentlayer2/utils/effect' +import { OT, pipe, pretty, provideConsole, T } from '@contentlayer2/utils/effect' +import { NodeFsLive } from '@contentlayer2/utils/node' import { Command, Option } from 'clipanion' import * as t from 'typanion' @@ -35,7 +35,7 @@ export class DefaultCommand extends Command { validator: t.isString(), }) - // TODO refactor similar to `@contentlayer-temp/cli` + // TODO refactor similar to `@contentlayer2/cli` async execute() { try { await pipe( diff --git a/packages/contentlayer-stackbit-yaml-generator/src/cli/convert.ts b/packages/contentlayer-stackbit-yaml-generator/src/cli/convert.ts index 2e098198..38efaf38 100644 --- a/packages/contentlayer-stackbit-yaml-generator/src/cli/convert.ts +++ b/packages/contentlayer-stackbit-yaml-generator/src/cli/convert.ts @@ -1,5 +1,5 @@ -import type * as core from '@contentlayer-temp/core' -import * as utils from '@contentlayer-temp/utils' +import type * as core from '@contentlayer2/core' +import * as utils from '@contentlayer2/utils' import type * as Stackbit from '@stackbit/sdk' import type * as StackbitTypes from '@stackbit/types' diff --git a/packages/contentlayer/bin/cli.cjs b/packages/contentlayer/bin/cli.cjs index 5c26269c..113a3c4b 100755 --- a/packages/contentlayer/bin/cli.cjs +++ b/packages/contentlayer/bin/cli.cjs @@ -1,7 +1,7 @@ #!/usr/bin/env node const main = async () => { - const { run } = await import('@contentlayer-temp/cli') + const { run } = await import('@contentlayer2/cli') await run() } diff --git a/packages/contentlayer/package.json b/packages/contentlayer/package.json index 91c7504e..f4a81130 100644 --- a/packages/contentlayer/package.json +++ b/packages/contentlayer/package.json @@ -1,5 +1,5 @@ { - "name": "contentlayer-temp", + "name": "contentlayer2", "version": "0.4.4", "bin": "./bin/cli.cjs", "type": "module", @@ -61,12 +61,12 @@ "_bundle-cli": "esbuild ./dist/cli/index.js --bundle --platform=node --format=esm --external:esbuild --external:@esbuild-plugins/node-resolve --outfile=dist/cli/bundle.js --main-fields=module,main --metafile=meta.json --banner:js=\"import { createRequire as topLevelCreateRequire } from 'module'; const require = topLevelCreateRequire(import.meta.url); const __dirname = '__SET_BY_ESBUILD__';\"" }, "dependencies": { - "@contentlayer-temp/cli": "workspace:*", - "@contentlayer-temp/client": "workspace:*", - "@contentlayer-temp/core": "workspace:*", - "@contentlayer-temp/source-files": "workspace:*", - "@contentlayer-temp/source-remote-files": "workspace:*", - "@contentlayer-temp/utils": "workspace:*" + "@contentlayer2/cli": "workspace:*", + "@contentlayer2/client": "workspace:*", + "@contentlayer2/core": "workspace:*", + "@contentlayer2/source-files": "workspace:*", + "@contentlayer2/source-remote-files": "workspace:*", + "@contentlayer2/utils": "workspace:*" }, "devDependencies": { "typescript": "^5.1.6" diff --git a/packages/contentlayer/src/client/index.ts b/packages/contentlayer/src/client/index.ts index fa4c3a1c..c5bbb4d0 100644 --- a/packages/contentlayer/src/client/index.ts +++ b/packages/contentlayer/src/client/index.ts @@ -1 +1 @@ -export * from '@contentlayer-temp/client' +export * from '@contentlayer2/client' diff --git a/packages/contentlayer/src/core/index.ts b/packages/contentlayer/src/core/index.ts index 76846d42..030be3d9 100644 --- a/packages/contentlayer/src/core/index.ts +++ b/packages/contentlayer/src/core/index.ts @@ -1 +1 @@ -export * from '@contentlayer-temp/core' +export * from '@contentlayer2/core' diff --git a/packages/contentlayer/src/source-files/index.ts b/packages/contentlayer/src/source-files/index.ts index 1f59bb41..a487d359 100644 --- a/packages/contentlayer/src/source-files/index.ts +++ b/packages/contentlayer/src/source-files/index.ts @@ -1 +1 @@ -export * from '@contentlayer-temp/source-files' +export * from '@contentlayer2/source-files' diff --git a/packages/contentlayer/src/source-files/schema/index.ts b/packages/contentlayer/src/source-files/schema/index.ts index 60c9a20c..7062db0a 100644 --- a/packages/contentlayer/src/source-files/schema/index.ts +++ b/packages/contentlayer/src/source-files/schema/index.ts @@ -1 +1 @@ -export * from '@contentlayer-temp/source-files/schema/defs' +export * from '@contentlayer2/source-files/schema/defs' diff --git a/packages/contentlayer/src/source-remote-files/index.ts b/packages/contentlayer/src/source-remote-files/index.ts index dd9848f3..3cf43117 100644 --- a/packages/contentlayer/src/source-remote-files/index.ts +++ b/packages/contentlayer/src/source-remote-files/index.ts @@ -1 +1 @@ -export * from '@contentlayer-temp/source-remote-files' +export * from '@contentlayer2/source-remote-files' diff --git a/packages/contentlayer/src/utils/index.ts b/packages/contentlayer/src/utils/index.ts index 4d6cab23..29f56bae 100644 --- a/packages/contentlayer/src/utils/index.ts +++ b/packages/contentlayer/src/utils/index.ts @@ -1 +1 @@ -export * from '@contentlayer-temp/utils' +export * from '@contentlayer2/utils' diff --git a/packages/contentlayer/src/utils/node/index.ts b/packages/contentlayer/src/utils/node/index.ts index 43db4f17..c6c11aea 100644 --- a/packages/contentlayer/src/utils/node/index.ts +++ b/packages/contentlayer/src/utils/node/index.ts @@ -1 +1 @@ -export * from '@contentlayer-temp/utils/node' +export * from '@contentlayer2/utils/node' diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json index 7cdd41fa..4b9297dd 100644 --- a/packages/integration-tests/package.json +++ b/packages/integration-tests/package.json @@ -6,7 +6,7 @@ "test": "FORCE_COLOR=1 vitest" }, "devDependencies": { - "contentlayer-temp": "workspace:*", + "contentlayer2": "workspace:*", "remark-gfm": "^4.0.0", "remark-mdx-images": "^3.0.0", "typescript": "^5.1.6", diff --git a/packages/integration-tests/src/empty-content-folder/index.test.ts b/packages/integration-tests/src/empty-content-folder/index.test.ts index 7b05f25e..00af88dc 100644 --- a/packages/integration-tests/src/empty-content-folder/index.test.ts +++ b/packages/integration-tests/src/empty-content-folder/index.test.ts @@ -2,9 +2,9 @@ import * as fs from 'node:fs/promises' import path from 'node:path' import { fileURLToPath } from 'node:url' -import { absolutePosixFilePath } from '@contentlayer-temp/utils' -import * as core from 'contentlayer-temp/core' -import { defineDocumentType, makeSource } from 'contentlayer-temp/source-files' +import { absolutePosixFilePath } from '@contentlayer2/utils' +import * as core from 'contentlayer2/core' +import { defineDocumentType, makeSource } from 'contentlayer2/source-files' import { expect, test } from 'vitest' test('empty content folder', async () => { diff --git a/packages/integration-tests/src/image-field/index.test.ts b/packages/integration-tests/src/image-field/index.test.ts index 7fb8d68f..003656ae 100644 --- a/packages/integration-tests/src/image-field/index.test.ts +++ b/packages/integration-tests/src/image-field/index.test.ts @@ -3,9 +3,9 @@ import * as fs from 'node:fs/promises' import path from 'node:path' import { fileURLToPath } from 'node:url' -import { absolutePosixFilePath } from '@contentlayer-temp/utils' -import * as core from 'contentlayer-temp/core' -import { defineDocumentType, makeSource } from 'contentlayer-temp/source-files' +import { absolutePosixFilePath } from '@contentlayer2/utils' +import * as core from 'contentlayer2/core' +import { defineDocumentType, makeSource } from 'contentlayer2/source-files' import { expect, test } from 'vitest' test('mdx-image-field ', async () => { diff --git a/packages/integration-tests/src/markdown/index.test.ts b/packages/integration-tests/src/markdown/index.test.ts index 7ec961ac..d006bd86 100644 --- a/packages/integration-tests/src/markdown/index.test.ts +++ b/packages/integration-tests/src/markdown/index.test.ts @@ -3,9 +3,9 @@ import * as fs from 'node:fs/promises' import path from 'node:path' import { fileURLToPath } from 'node:url' -import { absolutePosixFilePath } from '@contentlayer-temp/utils' -import * as core from 'contentlayer-temp/core' -import { defineDocumentType, makeSource } from 'contentlayer-temp/source-files' +import { absolutePosixFilePath } from '@contentlayer2/utils' +import * as core from 'contentlayer2/core' +import { defineDocumentType, makeSource } from 'contentlayer2/source-files' import rehypeStringify from 'rehype-stringify' import remarkFrontmatter from 'remark-frontmatter' import remarkParse from 'remark-parse' diff --git a/packages/integration-tests/src/mdx-remark-images/index.test.ts b/packages/integration-tests/src/mdx-remark-images/index.test.ts index 51d2ce1d..9de2dddb 100644 --- a/packages/integration-tests/src/mdx-remark-images/index.test.ts +++ b/packages/integration-tests/src/mdx-remark-images/index.test.ts @@ -3,9 +3,9 @@ import * as fs from 'node:fs/promises' import path from 'node:path' import { fileURLToPath } from 'node:url' -import { absolutePosixFilePath } from '@contentlayer-temp/utils' -import * as core from 'contentlayer-temp/core' -import { defineDocumentType, makeSource } from 'contentlayer-temp/source-files' +import { absolutePosixFilePath } from '@contentlayer2/utils' +import * as core from 'contentlayer2/core' +import { defineDocumentType, makeSource } from 'contentlayer2/source-files' import remarkMdxImages from 'remark-mdx-images' import { expect, test } from 'vitest' diff --git a/packages/integration-tests/src/remark-gfm/index.test.ts b/packages/integration-tests/src/remark-gfm/index.test.ts index bc50fd80..e5f6b8e6 100644 --- a/packages/integration-tests/src/remark-gfm/index.test.ts +++ b/packages/integration-tests/src/remark-gfm/index.test.ts @@ -3,9 +3,9 @@ import * as fs from 'node:fs/promises' import path from 'node:path' import { fileURLToPath } from 'node:url' -import { absolutePosixFilePath } from '@contentlayer-temp/utils' -import * as core from 'contentlayer-temp/core' -import { defineDocumentType, makeSource } from 'contentlayer-temp/source-files' +import { absolutePosixFilePath } from '@contentlayer2/utils' +import * as core from 'contentlayer2/core' +import { defineDocumentType, makeSource } from 'contentlayer2/source-files' import remarkGfm from 'remark-gfm' import { expect, test } from 'vitest' diff --git a/packages/next-contentlayer/package.json b/packages/next-contentlayer/package.json index ff6636d9..5801c699 100644 --- a/packages/next-contentlayer/package.json +++ b/packages/next-contentlayer/package.json @@ -1,5 +1,5 @@ { - "name": "next-contentlayer-temp", + "name": "next-contentlayer2", "version": "0.4.4", "type": "module", "main": "./dist/index-cjs.cjs", @@ -38,11 +38,11 @@ "prepack": "awk '!/^export|^import/' dist/index-cjs.js > dist/index-cjs.cjs; cp src/hooks/jsx-runtime.cjs dist/hooks/jsx-runtime.cjs" }, "dependencies": { - "@contentlayer-temp/core": "workspace:*", - "@contentlayer-temp/utils": "workspace:*" + "@contentlayer2/core": "workspace:*", + "@contentlayer2/utils": "workspace:*" }, "peerDependencies": { - "contentlayer-temp": "workspace:*", + "contentlayer2": "workspace:*", "next": "^12 || ^13 || ^14", "react": "*", "react-dom": "*" diff --git a/packages/next-contentlayer/src/check-constraints.ts b/packages/next-contentlayer/src/check-constraints.ts index 8d81c599..97e3045d 100644 --- a/packages/next-contentlayer/src/check-constraints.ts +++ b/packages/next-contentlayer/src/check-constraints.ts @@ -26,8 +26,8 @@ const checkNodeVersion = () => { } const checkContentlayerVersionsMatch = () => { - const contentlayerVersion = getPackageVersion('contentlayer-temp') - const nextContentlayerVersion = getPackageVersion('next-contentlayer-temp') + const contentlayerVersion = getPackageVersion('contentlayer2') + const nextContentlayerVersion = getPackageVersion('next-contentlayer2') if (contentlayerVersion !== nextContentlayerVersion) { throw new Error( diff --git a/packages/next-contentlayer/src/plugin.ts b/packages/next-contentlayer/src/plugin.ts index 8b6b4b94..81f29458 100644 --- a/packages/next-contentlayer/src/plugin.ts +++ b/packages/next-contentlayer/src/plugin.ts @@ -1,8 +1,8 @@ -import '@contentlayer-temp/utils/effect/Tracing/Enable' +import '@contentlayer2/utils/effect/Tracing/Enable' -import * as core from '@contentlayer-temp/core' -import { errorToString } from '@contentlayer-temp/utils' -import { E, OT, pipe, S, T } from '@contentlayer-temp/utils/effect' +import * as core from '@contentlayer2/core' +import { errorToString } from '@contentlayer2/utils' +import { E, OT, pipe, S, T } from '@contentlayer2/utils/effect' import type { WebpackOptionsNormalized } from 'webpack' import { checkConstraints } from './check-constraints.js' diff --git a/tsconfig.base.json b/tsconfig.base.json index 37ee792e..e09b7adf 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -18,11 +18,11 @@ "target": "ES2020", "plugins": [{ "transform": "@effect-ts/tracing-plugin" }], "paths": { - "@contentlayer-temp/utils/*": ["./packages/@contentlayer/utils/src/*"], - "@contentlayer-temp/source-files/*": ["./packages/@contentlayer/source-files/src/*"], - "@contentlayer-temp/*": ["./packages/@contentlayer/*/src"], - "contentlayer-temp/*": ["./packages/contentlayer/src/*"], - "contentlayer-temp": ["./pacakges/contentlayer/src"] + "@contentlayer2/utils/*": ["./packages/@contentlayer/utils/src/*"], + "@contentlayer2/source-files/*": ["./packages/@contentlayer/source-files/src/*"], + "@contentlayer2/*": ["./packages/@contentlayer/*/src"], + "contentlayer2/*": ["./packages/contentlayer/src/*"], + "contentlayer2": ["./pacakges/contentlayer/src"] } } } diff --git a/yarn.lock b/yarn.lock index e0270525..24d6f6df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -317,31 +317,31 @@ __metadata: languageName: node linkType: hard -"@contentlayer-temp/cli@workspace:*, @contentlayer-temp/cli@workspace:packages/@contentlayer/cli": +"@contentlayer2/cli@workspace:*, @contentlayer2/cli@workspace:packages/@contentlayer/cli": version: 0.0.0-use.local - resolution: "@contentlayer-temp/cli@workspace:packages/@contentlayer/cli" + resolution: "@contentlayer2/cli@workspace:packages/@contentlayer/cli" dependencies: - "@contentlayer-temp/core": "workspace:*" - "@contentlayer-temp/utils": "workspace:*" + "@contentlayer2/core": "workspace:*" + "@contentlayer2/utils": "workspace:*" "@types/node": ^20.3.2 clipanion: ^3.2.1 typanion: ^3.12.1 languageName: unknown linkType: soft -"@contentlayer-temp/client@workspace:*, @contentlayer-temp/client@workspace:packages/@contentlayer/client": +"@contentlayer2/client@workspace:*, @contentlayer2/client@workspace:packages/@contentlayer/client": version: 0.0.0-use.local - resolution: "@contentlayer-temp/client@workspace:packages/@contentlayer/client" + resolution: "@contentlayer2/client@workspace:packages/@contentlayer/client" dependencies: - "@contentlayer-temp/core": "workspace:*" + "@contentlayer2/core": "workspace:*" languageName: unknown linkType: soft -"@contentlayer-temp/core@workspace:*, @contentlayer-temp/core@workspace:packages/@contentlayer/core": +"@contentlayer2/core@workspace:*, @contentlayer2/core@workspace:packages/@contentlayer/core": version: 0.0.0-use.local - resolution: "@contentlayer-temp/core@workspace:packages/@contentlayer/core" + resolution: "@contentlayer2/core@workspace:packages/@contentlayer/core" dependencies: - "@contentlayer-temp/utils": "workspace:*" + "@contentlayer2/utils": "workspace:*" "@types/source-map-support": ^0.5.6 camel-case: ^4.1.2 comment-json: ^4.2.3 @@ -367,13 +367,13 @@ __metadata: languageName: unknown linkType: soft -"@contentlayer-temp/experimental-source-files-stackbit@workspace:packages/@contentlayer/experimental-source-files-stackbit": +"@contentlayer2/experimental-source-files-stackbit@workspace:packages/@contentlayer/experimental-source-files-stackbit": version: 0.0.0-use.local - resolution: "@contentlayer-temp/experimental-source-files-stackbit@workspace:packages/@contentlayer/experimental-source-files-stackbit" + resolution: "@contentlayer2/experimental-source-files-stackbit@workspace:packages/@contentlayer/experimental-source-files-stackbit" dependencies: - "@contentlayer-temp/core": "workspace:*" - "@contentlayer-temp/source-files": "workspace:*" - "@contentlayer-temp/utils": "workspace:*" + "@contentlayer2/core": "workspace:*" + "@contentlayer2/source-files": "workspace:*" + "@contentlayer2/utils": "workspace:*" "@stackbit/sdk": ~0.3.25 vite: ^5.0.12 vitest: 1.2.2 @@ -385,23 +385,23 @@ __metadata: languageName: unknown linkType: soft -"@contentlayer-temp/source-contentful@workspace:packages/@contentlayer/source-contentful": +"@contentlayer2/source-contentful@workspace:packages/@contentlayer/source-contentful": version: 0.0.0-use.local - resolution: "@contentlayer-temp/source-contentful@workspace:packages/@contentlayer/source-contentful" + resolution: "@contentlayer2/source-contentful@workspace:packages/@contentlayer/source-contentful" dependencies: - "@contentlayer-temp/core": "workspace:*" - "@contentlayer-temp/utils": "workspace:*" + "@contentlayer2/core": "workspace:*" + "@contentlayer2/utils": "workspace:*" "@types/node": ^20.3.2 contentful-management: 7.22.4 languageName: unknown linkType: soft -"@contentlayer-temp/source-files@workspace:*, @contentlayer-temp/source-files@workspace:packages/@contentlayer/source-files": +"@contentlayer2/source-files@workspace:*, @contentlayer2/source-files@workspace:packages/@contentlayer/source-files": version: 0.0.0-use.local - resolution: "@contentlayer-temp/source-files@workspace:packages/@contentlayer/source-files" + resolution: "@contentlayer2/source-files@workspace:packages/@contentlayer/source-files" dependencies: - "@contentlayer-temp/core": "workspace:*" - "@contentlayer-temp/utils": "workspace:*" + "@contentlayer2/core": "workspace:*" + "@contentlayer2/utils": "workspace:*" "@faker-js/faker": ^8.0.2 "@types/micromatch": ^4.0.2 "@types/node": ^20.3.2 @@ -422,19 +422,19 @@ __metadata: languageName: unknown linkType: soft -"@contentlayer-temp/source-remote-files@workspace:*, @contentlayer-temp/source-remote-files@workspace:packages/@contentlayer/source-remote-files": +"@contentlayer2/source-remote-files@workspace:*, @contentlayer2/source-remote-files@workspace:packages/@contentlayer/source-remote-files": version: 0.0.0-use.local - resolution: "@contentlayer-temp/source-remote-files@workspace:packages/@contentlayer/source-remote-files" + resolution: "@contentlayer2/source-remote-files@workspace:packages/@contentlayer/source-remote-files" dependencies: - "@contentlayer-temp/core": "workspace:*" - "@contentlayer-temp/source-files": "workspace:*" - "@contentlayer-temp/utils": "workspace:*" + "@contentlayer2/core": "workspace:*" + "@contentlayer2/source-files": "workspace:*" + "@contentlayer2/utils": "workspace:*" languageName: unknown linkType: soft -"@contentlayer-temp/utils@workspace:*, @contentlayer-temp/utils@workspace:packages/@contentlayer/utils": +"@contentlayer2/utils@workspace:*, @contentlayer2/utils@workspace:packages/@contentlayer/utils": version: 0.0.0-use.local - resolution: "@contentlayer-temp/utils@workspace:packages/@contentlayer/utils" + resolution: "@contentlayer2/utils@workspace:packages/@contentlayer/utils" dependencies: "@effect-ts/core": ^0.60.5 "@effect-ts/otel": ^0.15.1 @@ -3735,9 +3735,9 @@ __metadata: languageName: node linkType: hard -"contentful-generator-temp@workspace:packages/contentful-generator": +"contentful-generator2@workspace:packages/contentful-generator": version: 0.0.0-use.local - resolution: "contentful-generator-temp@workspace:packages/contentful-generator" + resolution: "contentful-generator2@workspace:packages/contentful-generator" dependencies: contentful-management: 7.22.4 contentful-migration: ^4.2.3 @@ -3828,9 +3828,28 @@ __metadata: languageName: node linkType: hard -"contentlayer-monorepo@workspace:.": +"contentlayer-stackbit-yaml-generator2@workspace:packages/contentlayer-stackbit-yaml-generator": version: 0.0.0-use.local - resolution: "contentlayer-monorepo@workspace:." + resolution: "contentlayer-stackbit-yaml-generator2@workspace:packages/contentlayer-stackbit-yaml-generator" + dependencies: + "@contentlayer2/core": "workspace:*" + "@contentlayer2/utils": "workspace:*" + "@stackbit/sdk": ^0.3.25 + clipanion: ^3.2.1 + contentlayer2: "workspace:*" + typanion: 3.12.1 + typescript: ^5.1.6 + vite: ^5.0.12 + vitest: 1.2.2 + yaml: ^2.3.1 + bin: + contentlayer-stackbit-yaml-generator2: ./dist/cli/index.js + languageName: unknown + linkType: soft + +"contentlayer2-monorepo@workspace:.": + version: 0.0.0-use.local + resolution: "contentlayer2-monorepo@workspace:." dependencies: "@changesets/cli": 2.19.0-temp.0 "@effect-ts/tracing-plugin": ^0.20.0 @@ -3848,38 +3867,19 @@ __metadata: languageName: unknown linkType: soft -"contentlayer-stackbit-yaml-generator-temp@workspace:packages/contentlayer-stackbit-yaml-generator": - version: 0.0.0-use.local - resolution: "contentlayer-stackbit-yaml-generator-temp@workspace:packages/contentlayer-stackbit-yaml-generator" - dependencies: - "@contentlayer-temp/core": "workspace:*" - "@contentlayer-temp/utils": "workspace:*" - "@stackbit/sdk": ^0.3.25 - clipanion: ^3.2.1 - contentlayer-temp: "workspace:*" - typanion: 3.12.1 - typescript: ^5.1.6 - vite: ^5.0.12 - vitest: 1.2.2 - yaml: ^2.3.1 - bin: - contentlayer-stackbit-yaml-generator-temp: ./dist/cli/index.js - languageName: unknown - linkType: soft - -"contentlayer-temp@workspace:*, contentlayer-temp@workspace:packages/contentlayer": +"contentlayer2@workspace:*, contentlayer2@workspace:packages/contentlayer": version: 0.0.0-use.local - resolution: "contentlayer-temp@workspace:packages/contentlayer" - dependencies: - "@contentlayer-temp/cli": "workspace:*" - "@contentlayer-temp/client": "workspace:*" - "@contentlayer-temp/core": "workspace:*" - "@contentlayer-temp/source-files": "workspace:*" - "@contentlayer-temp/source-remote-files": "workspace:*" - "@contentlayer-temp/utils": "workspace:*" + resolution: "contentlayer2@workspace:packages/contentlayer" + dependencies: + "@contentlayer2/cli": "workspace:*" + "@contentlayer2/client": "workspace:*" + "@contentlayer2/core": "workspace:*" + "@contentlayer2/source-files": "workspace:*" + "@contentlayer2/source-remote-files": "workspace:*" + "@contentlayer2/utils": "workspace:*" typescript: ^5.1.6 bin: - contentlayer-temp: ./bin/cli.cjs + contentlayer2: ./bin/cli.cjs languageName: unknown linkType: soft @@ -5888,7 +5888,7 @@ __metadata: version: 0.0.0-use.local resolution: "integration-tests@workspace:packages/integration-tests" dependencies: - contentlayer-temp: "workspace:*" + contentlayer2: "workspace:*" remark-gfm: ^4.0.0 remark-mdx-images: ^3.0.0 typescript: ^5.1.6 @@ -7828,10 +7828,10 @@ __metadata: dependencies: "@types/react": 18.2.14 autoprefixer: ^10.4.14 - contentlayer-temp: latest + contentlayer2: latest date-fns: 2.30.0 next: 14.1.0 - next-contentlayer-temp: latest + next-contentlayer2: latest postcss: ^8.4.24 react: 18.2.0 react-dom: 18.2.0 @@ -7840,19 +7840,19 @@ __metadata: languageName: unknown linkType: soft -"next-contentlayer-temp@workspace:*, next-contentlayer-temp@workspace:packages/next-contentlayer": +"next-contentlayer2@workspace:*, next-contentlayer2@workspace:packages/next-contentlayer": version: 0.0.0-use.local - resolution: "next-contentlayer-temp@workspace:packages/next-contentlayer" + resolution: "next-contentlayer2@workspace:packages/next-contentlayer" dependencies: - "@contentlayer-temp/core": "workspace:*" - "@contentlayer-temp/utils": "workspace:*" + "@contentlayer2/core": "workspace:*" + "@contentlayer2/utils": "workspace:*" "@types/react": ^18.2.14 "@types/react-dom": ^18.2.6 next: ^14.1.0 typescript: ^5.1.6 webpack: ^5.88.1 peerDependencies: - contentlayer-temp: "workspace:*" + contentlayer2: "workspace:*" next: ^12 || ^13 || ^14 react: "*" react-dom: "*" @@ -7865,10 +7865,10 @@ __metadata: dependencies: "@types/react": 18.2.14 autoprefixer: ^10.4.14 - contentlayer-temp: latest + contentlayer2: latest date-fns: 2.30.0 next: 14.1.0 - next-contentlayer-temp: latest + next-contentlayer2: latest postcss: ^8.4.24 react: 18.2.0 react-dom: 18.2.0 @@ -7883,10 +7883,10 @@ __metadata: dependencies: "@types/react": 18.2.14 autoprefixer: ^10.4.14 - contentlayer-temp: latest + contentlayer2: latest date-fns: 2.30.0 next: 14.1.0 - next-contentlayer-temp: latest + next-contentlayer2: latest postcss: ^8.4.24 react: 18.2.0 react-dom: 18.2.0 @@ -8078,7 +8078,7 @@ __metadata: version: 0.0.0-use.local resolution: "node-script-example@workspace:examples/node-script" dependencies: - contentlayer-temp: latest + contentlayer2: latest languageName: unknown linkType: soft @@ -8086,7 +8086,7 @@ __metadata: version: 0.0.0-use.local resolution: "node-script-mdx-example@workspace:examples/node-script-mdx" dependencies: - contentlayer-temp: latest + contentlayer2: latest languageName: unknown linkType: soft @@ -8094,7 +8094,7 @@ __metadata: version: 0.0.0-use.local resolution: "node-script-remote-content-example@workspace:examples/node-script-remote-content" dependencies: - contentlayer-temp: latest + contentlayer2: latest languageName: unknown linkType: soft