build: move globals and register to runtime directory

BREAKING CHANGE: package exports have been moved

* see #480 for context and further changes to come

jest.config.js

@@ -7,7 +7,9 @@ module.exports = {
   },
   setupFiles: ['<rootDir>/test/unit/setup'],
   moduleNameMapper: {
-    '@nuxtjs/composition-api/dist/globals': '<rootDir>/src/globals',
-    '@nuxtjs/composition-api/dist/register': '<rootDir>/src/register',
+    '@nuxtjs/composition-api/dist/runtime/globals':
+      '<rootDir>/src/runtime/globals',
+    '@nuxtjs/composition-api/dist/runtime/register':
+      '<rootDir>/src/runtime/register',
   },
 }

package.json

@@ -25,8 +25,8 @@
     "./module": "./dist/module.js",
     "./package.json": "./package.json",
     "./dist/babel-plugin": "./dist/babel-plugin.js",
-    "./dist/globals": "./dist/globals.js",
-    "./dist/register": "./dist/register.js",
+    "./dist/runtime/globals": "./dist/runtime/globals.js",
+    "./dist/runtime/register": "./dist/runtime/register.mjs",
     "./dist/runtime/templates/*": "./dist/runtime/templates/*"
   },
   "main": "./dist/index.js",

siroc.config.js

@@ -3,8 +3,8 @@ import { defineSirocConfig } from 'siroc'
 export default defineSirocConfig({
   rollup: {
     externals: [
-      '@nuxtjs/composition-api/dist/globals',
-      '@nuxtjs/composition-api/dist/register',
+      '@nuxtjs/composition-api/dist/runtime/globals',
+      '@nuxtjs/composition-api/dist/runtime/register',
     ],
   },
 })

src/globals-register.ts

@@ -37,5 +37,6 @@ export function addGlobalsFile(this: ModuleThis) {
     contents,
   })
 
-  nuxtOptions.alias['@nuxtjs/composition-api/dist/globals'] = globalsFile
+  nuxtOptions.alias['@nuxtjs/composition-api/dist/runtime/globals'] =
+    globalsFile
 }

src/runtime/composables/async.ts

@@ -1,7 +1,7 @@
 import { isRef, onServerPrefetch } from '@vue/composition-api'
 import type { Ref } from '@vue/composition-api'
 
-import { globalNuxt } from '@nuxtjs/composition-api/dist/globals'
+import { globalNuxt } from '@nuxtjs/composition-api/dist/runtime/globals'
 import { ssrRef } from './ssr-ref'
 import { validateKey } from './utils'
 

src/runtime/composables/context.ts

@@ -4,7 +4,7 @@ import type { Ref } from '@vue/composition-api'
 import type { Context } from '@nuxt/types'
 import type { Route } from 'vue-router'
 
-import { globalNuxt } from '@nuxtjs/composition-api/dist/globals'
+import { globalNuxt } from '@nuxtjs/composition-api/dist/runtime/globals'
 import { getCurrentInstance } from './utils'
 
 interface ContextCallback {

src/runtime/composables/fetch.ts

@@ -10,7 +10,7 @@ import {
   globalContext,
   globalNuxt,
   isFullStatic,
-} from '@nuxtjs/composition-api/dist/globals'
+} from '@nuxtjs/composition-api/dist/runtime/globals'
 import type { NuxtApp } from '@nuxt/types/app'
 
 import { getCurrentInstance, ComponentInstance } from './utils'

src/runtime/composables/index.ts

@@ -1,4 +1,4 @@
-import '@nuxtjs/composition-api/dist/register'
+import '@nuxtjs/composition-api/dist/runtime/register'
 
 export { useAsync } from './async'
 export { defineComponent } from './component'

src/runtime/composables/ssr-ref.ts

@@ -6,7 +6,10 @@ import {
 } from '@vue/composition-api'
 import type { Ref } from '@vue/composition-api'
 
-import { globalContext, globalNuxt } from '@nuxtjs/composition-api/dist/globals'
+import {
+  globalContext,
+  globalNuxt,
+} from '@nuxtjs/composition-api/dist/runtime/globals'
 import { getCurrentInstance, validateKey } from './utils'
 
 function getValue<T>(value: T | (() => T)): T {
@@ -40,9 +43,8 @@ const useServerData = () => {
         globalRefs[key] = sanitise(val)
         break
       case 'ssrRefs':
-        ;(vm![globalNuxt].context.ssrContext as any).nuxt.ssrRefs[
-          key
-        ] = sanitise(val)
+        ;(vm![globalNuxt].context.ssrContext as any).nuxt.ssrRefs[key] =
+          sanitise(val)
     }
   }
 

src/runtime/composables/static.ts

@@ -8,7 +8,7 @@ import {
   globalContext,
   staticPath,
   publicPath as _publicPath,
-} from '@nuxtjs/composition-api/dist/globals'
+} from '@nuxtjs/composition-api/dist/runtime/globals'
 
 const staticCache: Record<string, any> = {}
 

test/fixture/nuxt.config.ts

@@ -15,15 +15,15 @@ console.log('Testing', inDevelopment ? 'source' : 'built', 'module')
 
 export default <NuxtConfig>{
   alias: {
-    '@nuxtjs/composition-api/dist/register': join(
+    '@nuxtjs/composition-api/dist/runtime/register': join(
       rootDir,
       inDevelopment ? 'src' : 'dist',
-      'register'
+      'runtime/register'
     ),
-    '@nuxtjs/composition-api/dist/globals': join(
+    '@nuxtjs/composition-api/dist/runtime/globals': join(
       rootDir,
       inDevelopment ? 'src' : 'dist',
-      'globals'
+      'runtime/globals'
     ),
     '@nuxtjs/composition-api': join(
       rootDir,

tsconfig.json

@@ -12,7 +12,12 @@
     "resolveJsonModule": true,
     "allowSyntheticDefaultImports": true,
     "paths": {
-      "@nuxtjs/composition-api/dist/globals": ["./src/globals.ts"],
+      "@nuxtjs/composition-api/dist/runtime/globals": [
+        "./src/runtime/globals.ts"
+      ],
+      "@nuxtjs/composition-api/dist/runtime/register": [
+        "./src/runtime/register.ts"
+      ],
       "@nuxtjs/composition-api": ["./src/index.ts"]
     },
     "types": ["node", "@nuxt/types", "jest"]