Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 842a724

Browse files
committed
build: move globals and register to runtime directory
BREAKING CHANGE: package exports have been moved * see #480 for context and further changes to come
1 parent 23afd5a commit 842a724

File tree

14 files changed

+31
-21
lines changed

14 files changed

+31
-21
lines changed

jest.config.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ module.exports = {
77
},
88
setupFiles: ['<rootDir>/test/unit/setup'],
99
moduleNameMapper: {
10-
'@nuxtjs/composition-api/dist/globals': '<rootDir>/src/globals',
11-
'@nuxtjs/composition-api/dist/register': '<rootDir>/src/register',
10+
'@nuxtjs/composition-api/dist/runtime/globals':
11+
'<rootDir>/src/runtime/globals',
12+
'@nuxtjs/composition-api/dist/runtime/register':
13+
'<rootDir>/src/runtime/register',
1214
},
1315
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"./module": "./dist/module.js",
2626
"./package.json": "./package.json",
2727
"./dist/babel-plugin": "./dist/babel-plugin.js",
28-
"./dist/globals": "./dist/globals.js",
29-
"./dist/register": "./dist/register.js",
28+
"./dist/runtime/globals": "./dist/runtime/globals.js",
29+
"./dist/runtime/register": "./dist/runtime/register.mjs",
3030
"./dist/runtime/templates/*": "./dist/runtime/templates/*"
3131
},
3232
"main": "./dist/index.js",

siroc.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { defineSirocConfig } from 'siroc'
33
export default defineSirocConfig({
44
rollup: {
55
externals: [
6-
'@nuxtjs/composition-api/dist/globals',
7-
'@nuxtjs/composition-api/dist/register',
6+
'@nuxtjs/composition-api/dist/runtime/globals',
7+
'@nuxtjs/composition-api/dist/runtime/register',
88
],
99
},
1010
})

src/globals-register.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,6 @@ export function addGlobalsFile(this: ModuleThis) {
3737
contents,
3838
})
3939

40-
nuxtOptions.alias['@nuxtjs/composition-api/dist/globals'] = globalsFile
40+
nuxtOptions.alias['@nuxtjs/composition-api/dist/runtime/globals'] =
41+
globalsFile
4142
}

src/runtime/composables/async.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { isRef, onServerPrefetch } from '@vue/composition-api'
22
import type { Ref } from '@vue/composition-api'
33

4-
import { globalNuxt } from '@nuxtjs/composition-api/dist/globals'
4+
import { globalNuxt } from '@nuxtjs/composition-api/dist/runtime/globals'
55
import { ssrRef } from './ssr-ref'
66
import { validateKey } from './utils'
77

src/runtime/composables/context.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type { Ref } from '@vue/composition-api'
44
import type { Context } from '@nuxt/types'
55
import type { Route } from 'vue-router'
66

7-
import { globalNuxt } from '@nuxtjs/composition-api/dist/globals'
7+
import { globalNuxt } from '@nuxtjs/composition-api/dist/runtime/globals'
88
import { getCurrentInstance } from './utils'
99

1010
interface ContextCallback {

src/runtime/composables/fetch.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
globalContext,
1111
globalNuxt,
1212
isFullStatic,
13-
} from '@nuxtjs/composition-api/dist/globals'
13+
} from '@nuxtjs/composition-api/dist/runtime/globals'
1414
import type { NuxtApp } from '@nuxt/types/app'
1515

1616
import { getCurrentInstance, ComponentInstance } from './utils'

src/runtime/composables/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import '@nuxtjs/composition-api/dist/register'
1+
import '@nuxtjs/composition-api/dist/runtime/register'
22

33
export { useAsync } from './async'
44
export { defineComponent } from './component'

src/runtime/composables/ssr-ref.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ import {
66
} from '@vue/composition-api'
77
import type { Ref } from '@vue/composition-api'
88

9-
import { globalContext, globalNuxt } from '@nuxtjs/composition-api/dist/globals'
9+
import {
10+
globalContext,
11+
globalNuxt,
12+
} from '@nuxtjs/composition-api/dist/runtime/globals'
1013
import { getCurrentInstance, validateKey } from './utils'
1114

1215
function getValue<T>(value: T | (() => T)): T {
@@ -40,9 +43,8 @@ const useServerData = () => {
4043
globalRefs[key] = sanitise(val)
4144
break
4245
case 'ssrRefs':
43-
;(vm![globalNuxt].context.ssrContext as any).nuxt.ssrRefs[
44-
key
45-
] = sanitise(val)
46+
;(vm![globalNuxt].context.ssrContext as any).nuxt.ssrRefs[key] =
47+
sanitise(val)
4648
}
4749
}
4850

src/runtime/composables/static.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
globalContext,
99
staticPath,
1010
publicPath as _publicPath,
11-
} from '@nuxtjs/composition-api/dist/globals'
11+
} from '@nuxtjs/composition-api/dist/runtime/globals'
1212

1313
const staticCache: Record<string, any> = {}
1414

0 commit comments

Comments
 (0)