Skip to content

Commit cb5e792

Browse files
committed
fix: core compatibility
1 parent f04b644 commit cb5e792

File tree

10 files changed

+298
-2143
lines changed

10 files changed

+298
-2143
lines changed

build.config.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
export default {
2+
entries: ['./src/module'],
3+
declaration: true,
4+
externals: ['@docus/core', '@docus/core/node', '@nuxt/types']
5+
}

example/nuxt.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ export default withDocus(themePath, {
1414
}
1515
}
1616
},
17-
buildModules: ['../src']
17+
buildModules: ['../src/module']
1818
})

example/pages/index.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
<script lang="ts">
1212
export default {
1313
async asyncData({ $docus }) {
14-
const { releases } = await $docus.data('github-releases')
14+
const {
15+
body: { releases }
16+
} = await $docus.data('github-releases')
1517
1618
return {
1719
releases

package.json

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@
1818
},
1919
"main": "dist/index.js",
2020
"module": "dist/index.mjs",
21-
"types": "dist/index.d.ts",
21+
"types": "dist/types.d.ts",
2222
"files": [
23-
"dist",
24-
"templates"
23+
"dist"
2524
],
2625
"scripts": {
27-
"build": "siroc build",
26+
"build": "unbuild",
2827
"dev": "nuxt dev example",
2928
"lint": "eslint --ext .js,.ts,.vue .",
3029
"test": "yarn lint && jest",
@@ -40,27 +39,26 @@
4039
},
4140
"dependencies": {
4241
"@nuxt/kit": "^0.6.4",
43-
"@types/jest": "^26.0.24",
4442
"defu": "^5.0.0",
45-
"jest": "^27.0.6",
4643
"ohmyfetch": "^0.1.8",
47-
"remark-github": "^10.1.0"
44+
"remark-github": "^10.1.0",
45+
"unbuild": "^0.3.2"
4846
},
4947
"devDependencies": {
50-
"@docus/app": "^1.0.9",
48+
"@docus/app": "^1.0.21",
5149
"@nuxt/test-utils": "latest",
5250
"@nuxt/types": "^2.15.7",
5351
"@nuxt/typescript-runtime": "latest",
5452
"@nuxtjs/eslint-config-typescript": "latest",
55-
"@siroc/jest-preset": "latest",
53+
"@types/jest": "^26.0.24",
5654
"babel-eslint": "latest",
5755
"eslint": "^7.30.0",
5856
"eslint-config-prettier": "^8.3.0",
5957
"eslint-plugin-nuxt": "^2.0.0",
6058
"eslint-plugin-prettier": "^3.4.0",
59+
"jest": "^27.0.6",
6160
"playwright": "^1.12.3",
6261
"prettier": "^2.3.2",
63-
"siroc": "^0.9.3",
6462
"ts-jest": "^27.0.3"
6563
},
6664
"publishConfig": {

scripts/bump-edge.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ async function main() {
3131
}
3232

3333
main().catch(err => {
34+
// eslint-disable-next-line no-console
3435
console.error(err)
3536
process.exit(1)
3637
})

src/github.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { $fetch, FetchOptions } from 'ohmyfetch/node'
2-
import { getTransformer } from '@docus/core'
2+
import { getTransformer } from '@docus/core/node'
33
import { normalizeReleaseName } from './utils'
44
import { GithubRawRelease, GithubRelease, GithubReleaseOptions } from './types'
55
let cachedReleases: GithubRelease[] = []
@@ -11,7 +11,7 @@ export function get(): GithubRelease[] {
1111
const getMajorVersion = (r: GithubRelease): number => (r.name ? Number(r.name.substring(1, 2)) : 0)
1212

1313
export async function fetch(settings: GithubReleaseOptions) {
14-
const key = 'github-releases.md'
14+
const key = 'content:github-releases.md'
1515
let releases: GithubRelease[] = []
1616

1717
const transform = getTransformer(key)
@@ -27,7 +27,7 @@ export async function fetch(settings: GithubReleaseOptions) {
2727
girhubReleases.map(async r => {
2828
return {
2929
...r,
30-
...(await transform(key, r.body)).body
30+
...(await transform(key, r.body))
3131
}
3232
})
3333
)

src/index.ts renamed to src/module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Module } from '@nuxt/types'
22
import defu from 'defu'
3-
import { useStorage, DocusContext } from '@docus/core'
3+
import { useStorage, DocusContext } from '@docus/core/node'
44
import { fetch } from './github'
55
import githubDefaults from './settings'
66

@@ -26,7 +26,7 @@ export default <Module>function docusGithubModule() {
2626
fetch(settings.github).then(releases => {
2727
const storage = useStorage()
2828

29-
storage.setItem('data:github-releases', {
29+
storage?.setItem('data:github-releases', {
3030
releases
3131
})
3232
})

src/index.d.ts renamed to src/types/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DocusRootNode } from '@docus/core'
1+
import { DocusRootNode } from '@docus/core/node'
22

33
export interface GithubRelease {
44
name: string

templates/plugin.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)