Release 0.2.5

contentlayerdev · May 11, 2022 · fdac478 · fdac478
1 parent 081e03e
commit fdac478
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 20 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -15,7 +15,6 @@
     "**/.DS_Store": true,
     "**/Thumbs.db": true,
     "**/dist": true,
-    "**/*.lock": true,
     "**/vercel.json": true,
     "**/.yarn": true,
     "**/.direnv": true

diff --git a/packages/@contentlayer/cli/package.json b/packages/@contentlayer/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentlayer/cli",
-  "version": "0.2.5-dev.7",
+  "version": "0.2.5",
   "type": "module",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/packages/@contentlayer/client/package.json b/packages/@contentlayer/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentlayer/client",
-  "version": "0.2.5-dev.7",
+  "version": "0.2.5",
   "type": "module",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/packages/@contentlayer/core/package.json b/packages/@contentlayer/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentlayer/core",
-  "version": "0.2.5-dev.7",
+  "version": "0.2.5",
   "type": "module",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/packages/@contentlayer/core/src/ArtifactsDir.ts b/packages/@contentlayer/core/src/ArtifactsDir.ts
@@ -16,6 +16,7 @@ export namespace ArtifactsDir {
   export const mkdir: T.Effect<OT.HasTracer & HasCwd, fs.MkdirError, PosixFilePath> = T.gen(function* ($) {
     const cwd = yield* $(getCwd)
     const dirPath = getDirPath({ cwd })
+
     yield* $(fs.mkdirp(dirPath))
 
     return dirPath

diff --git a/packages/@contentlayer/core/src/getConfig/index.ts b/packages/@contentlayer/core/src/getConfig/index.ts
@@ -1,5 +1,5 @@
 import type { E } from '@contentlayer/utils/effect'
-import { Chunk, OT, pipe, S, T } from '@contentlayer/utils/effect'
+import { Array, Chunk, O, OT, pipe, S, T } from '@contentlayer/utils/effect'
 import type { GetContentlayerVersionError } from '@contentlayer/utils/node'
 import { fs } from '@contentlayer/utils/node'
 import * as path from 'node:path'
@@ -48,14 +48,14 @@ export const getConfigWatch = ({
   configPath?: string
 }): S.Stream<OT.HasTracer & HasCwd, never, E.Either<GetConfigError, Config>> => {
   const resolveParams = pipe(
-    T.structPar({ configPath: resolveConfigPath({ configPath: configPath_ }) }),
+    T.structPar({ configPath: resolveConfigPath({ configPath: configPath_ }), cwd: getCwd }),
     T.chainMergeObject(() => makeTmpDirAndResolveEntryPoint),
     T.either,
   )
 
   return pipe(
     S.fromEffect(resolveParams),
-    S.chainMapEitherRight(({ configPath, outfilePath }) =>
+    S.chainMapEitherRight(({ configPath, outfilePath, cwd }) =>
       pipe(
         esbuild.makeAndSubscribe({
           entryPoints: [configPath],
@@ -70,6 +70,7 @@ export const getConfigWatch = ({
           bundle: true,
           logLevel: 'silent',
           metafile: true,
+          absWorkingDir: cwd,
           plugins: [contentlayerGenPlugin(), makeAllPackagesExternalPlugin(configPath)],
         }),
         S.mapEffectEitherRight((result) => getConfigFromResult({ result, configPath })),
@@ -133,11 +134,15 @@ const getConfigFromResult = ({
 
       const cwd = yield* $(getCwd)
 
-      const outfilePath = Object.keys(result.metafile!.outputs)
+      // Deriving the exact outfilePath here since it's suffixed with a hash
+      const outfilePath = pipe(
+        Object.keys(result.metafile!.outputs),
         // Will look like `path.join(cacheDir, 'compiled-contentlayer-config-[SOME_HASH].mjs')
-        .filter((_) => _.match(/compiled-contentlayer-config-.+.mjs$/))
+        Array.find((_) => _.match(/compiled-contentlayer-config-.+.mjs$/) !== null),
         // Needs to be absolute path for ESM import to work
-        .map((_) => path.join(cwd, _))[0]!
+        O.map((_) => path.join(cwd, _)),
+        O.getUnsafe,
+      )
 
       const esbuildHash = outfilePath.match(/compiled-contentlayer-config-(.+).mjs$/)![1]!
 

diff --git a/packages/@contentlayer/source-contentful/package.json b/packages/@contentlayer/source-contentful/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentlayer/source-contentful",
-  "version": "0.2.5-dev.7",
+  "version": "0.2.5",
   "type": "module",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/packages/@contentlayer/source-files/package.json b/packages/@contentlayer/source-files/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentlayer/source-files",
-  "version": "0.2.5-dev.7",
+  "version": "0.2.5",
   "type": "module",
   "exports": {
     ".": {

diff --git a/packages/@contentlayer/source-sanity/package.json b/packages/@contentlayer/source-sanity/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentlayer/source-sanity",
-  "version": "0.2.5-dev.7",
+  "version": "0.2.5",
   "type": "module",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/packages/@contentlayer/utils/package.json b/packages/@contentlayer/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentlayer/utils",
-  "version": "0.2.5-dev.7",
+  "version": "0.2.5",
   "type": "module",
   "exports": {
     "./package.json": {

diff --git a/packages/@contentlayer/utils/src/effect/Array.ts b/packages/@contentlayer/utils/src/effect/Array.ts
@@ -0,0 +1,7 @@
+import { Array, pipe } from '@effect-ts/core'
+
+import * as O from './Option.js'
+
+export * from '@effect-ts/core/Collections/Immutable/Array'
+
+export const headUnsafe = <A>(array: Array.Array<A>): A => pipe(array, Array.head, O.getUnsafe)
diff --git a/packages/@contentlayer/utils/src/effect/Option.ts b/packages/@contentlayer/utils/src/effect/Option.ts
@@ -0,0 +1,11 @@
+import { Option } from '@effect-ts/core'
+
+export * from '@effect-ts/core/Option'
+
+export const getUnsafe = <A>(option: Option.Option<A>): A => {
+  if (Option.isSome(option)) {
+    return option.value
+  }
+
+  throw new Error('Option.getUnsafe: Option is None')
+}
diff --git a/packages/@contentlayer/utils/src/effect/index.ts b/packages/@contentlayer/utils/src/effect/index.ts
@@ -28,7 +28,7 @@ export * as Tp from '@effect-ts/core/Collections/Immutable/Tuple'
 export * as HashMap from '@effect-ts/core/Collections/Immutable/HashMap'
 export * as HashSet from '@effect-ts/core/Collections/Immutable/HashSet'
 
-export * as Array from '@effect-ts/core/Collections/Immutable/Array'
+export * as Array from './Array.js'
 
 export * as These from './These.js'
 
@@ -48,8 +48,8 @@ export * as SC from '@effect-ts/core/Effect/Schedule'
 export * as Either from '@effect-ts/core/Either'
 export * as E from '@effect-ts/core/Either'
 
-export * as Option from '@effect-ts/core/Option'
-export * as O from '@effect-ts/core/Option'
+export * as Option from './Option.js'
+export * as O from './Option.js'
 
 export * as Ex from '@effect-ts/core/Effect/Exit'
 

diff --git 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",
-  "version": "0.2.5-dev.7",
+  "version": "0.2.5",
   "type": "module",
   "bin": "./dist/cli/index.js",
   "exports": "./dist/lib/index.js",

diff --git a/packages/contentlayer/package.json b/packages/contentlayer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "contentlayer",
-  "version": "0.2.5-dev.7",
+  "version": "0.2.5",
   "bin": "./bin/cli.cjs",
   "type": "module",
   "engines": {

diff --git a/packages/next-contentlayer/package.json b/packages/next-contentlayer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next-contentlayer",
-  "version": "0.2.5-dev.7",
+  "version": "0.2.5",
   "type": "module",
   "main": "./dist/index-cjs.cjs",
   "sideEffects": false,