build!: use /runtime subpath export

nuxt · Dec 9, 2023 · de9a2a8 · de9a2a8
1 parent c580600
commit de9a2a8
Show file tree

Hide file tree

Showing 21 changed files with 27 additions and 27 deletions.
diff --git a/examples/app-vitest-full/tests/nuxt/auto-import-mock.spec.ts b/examples/app-vitest-full/tests/nuxt/auto-import-mock.spec.ts
@@ -1,5 +1,5 @@
 import { expect, it, vi } from 'vitest'
-import { mockNuxtImport } from '@nuxt/test-utils/runtime-utils'
+import { mockNuxtImport } from '@nuxt/test-utils/runtime'
 
 mockNuxtImport<typeof useAutoImportedTarget>('useAutoImportedTarget', () => {
   return () => 'mocked!'

diff --git a/examples/app-vitest-full/tests/nuxt/mock-component-1.spec.ts b/examples/app-vitest-full/tests/nuxt/mock-component-1.spec.ts
@@ -1,5 +1,5 @@
 import { expect, it } from 'vitest'
-import { mockComponent, mountSuspended } from '@nuxt/test-utils/runtime-utils'
+import { mockComponent, mountSuspended } from '@nuxt/test-utils/runtime'
 import App from '~/app.vue'
 
 mockComponent('SomeComponent', async () => {

diff --git a/examples/app-vitest-full/tests/nuxt/mock-component-2.spec.ts b/examples/app-vitest-full/tests/nuxt/mock-component-2.spec.ts
@@ -1,5 +1,5 @@
 import { expect, it } from 'vitest'
-import { mockComponent, mountSuspended } from '@nuxt/test-utils/runtime-utils'
+import { mockComponent, mountSuspended } from '@nuxt/test-utils/runtime'
 import App from '~/app.vue'
 
 mockComponent('SomeComponent', () => import('./mocks/MockComponent.vue'))

diff --git a/examples/app-vitest-full/tests/nuxt/mock-component-3.spec.ts b/examples/app-vitest-full/tests/nuxt/mock-component-3.spec.ts
@@ -1,5 +1,5 @@
 import { expect, it } from 'vitest'
-import { mockComponent, mountSuspended } from '@nuxt/test-utils/runtime-utils'
+import { mockComponent, mountSuspended } from '@nuxt/test-utils/runtime'
 import { SomeComponent } from '#components'
 
 mockComponent('SomeComponent', async () => {

diff --git a/examples/app-vitest-full/tests/nuxt/mock-component-expose-setup-state.spec.ts b/examples/app-vitest-full/tests/nuxt/mock-component-expose-setup-state.spec.ts
@@ -1,5 +1,5 @@
 import { expect, it } from 'vitest'
-import { mountSuspended } from '@nuxt/test-utils/runtime-utils'
+import { mountSuspended } from '@nuxt/test-utils/runtime'
 import MockComponent from './mocks/MockComponent.vue'
 
 it('should expose setup state', async () => {

diff --git a/examples/app-vitest-full/tests/nuxt/mock-indexeddb.spec.ts b/examples/app-vitest-full/tests/nuxt/mock-indexeddb.spec.ts
@@ -1,5 +1,5 @@
 import { expect, it } from 'vitest'
-import { mountSuspended } from '@nuxt/test-utils/runtime-utils'
+import { mountSuspended } from '@nuxt/test-utils/runtime'
 import IndexedDbComponent from '~/components/IndexedDbComponent.vue'
 
 // Mocking of indexedDB can be enabled in vite.config.ts

diff --git a/examples/app-vitest-full/tests/nuxt/mock-nuxt-composable-1.spec.ts b/examples/app-vitest-full/tests/nuxt/mock-nuxt-composable-1.spec.ts
@@ -1,5 +1,5 @@
 import { expect, it } from 'vitest'
-import { mockNuxtImport } from '@nuxt/test-utils/runtime-utils'
+import { mockNuxtImport } from '@nuxt/test-utils/runtime'
 
 mockNuxtImport('useRuntimeConfig', () => {
   return () => {

diff --git a/examples/app-vitest-full/tests/nuxt/mock-nuxt-composable-2.spec.ts b/examples/app-vitest-full/tests/nuxt/mock-nuxt-composable-2.spec.ts
@@ -1,5 +1,5 @@
 import { expect, it } from 'vitest'
-import { mockNuxtImport } from '@nuxt/test-utils/runtime-utils'
+import { mockNuxtImport } from '@nuxt/test-utils/runtime'
 
 mockNuxtImport('useHead', () => {
   return () => true

diff --git a/examples/app-vitest-full/tests/nuxt/mock-nuxt-composable-3.spec.ts b/examples/app-vitest-full/tests/nuxt/mock-nuxt-composable-3.spec.ts
@@ -1,5 +1,5 @@
 import { expect, it } from 'vitest'
-import { mockNuxtImport } from '@nuxt/test-utils/runtime-utils'
+import { mockNuxtImport } from '@nuxt/test-utils/runtime'
 
 mockNuxtImport('useAutoImportedTarget', () => {
   return () => 'mocked'

diff --git a/examples/app-vitest-full/tests/nuxt/mount-suspended.spec.ts b/examples/app-vitest-full/tests/nuxt/mount-suspended.spec.ts
@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it } from 'vitest'
 
-import { mountSuspended } from '@nuxt/test-utils/runtime-utils'
+import { mountSuspended } from '@nuxt/test-utils/runtime'
 
 import App from '~/app.vue'
 import OptionsComponent from '~/components/OptionsComponent.vue'

diff --git a/examples/app-vitest-full/tests/nuxt/render-suspended.spec.ts b/examples/app-vitest-full/tests/nuxt/render-suspended.spec.ts
@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, it } from 'vitest'
-import { renderSuspended } from '@nuxt/test-utils/runtime-utils'
+import { renderSuspended } from '@nuxt/test-utils/runtime'
 import { cleanup, fireEvent, screen } from '@testing-library/vue'
 
 import App from '~/app.vue'

diff --git a/examples/app-vitest-full/tests/nuxt/routing.spec.ts b/examples/app-vitest-full/tests/nuxt/routing.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 
-import { mountSuspended } from '@nuxt/test-utils/runtime-utils'
+import { mountSuspended } from '@nuxt/test-utils/runtime'
 
 import App from '~/app.vue'
 

diff --git a/examples/app-vitest-full/tests/nuxt/server.spec.ts b/examples/app-vitest-full/tests/nuxt/server.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 
-import { mountSuspended, registerEndpoint } from '@nuxt/test-utils/runtime-utils'
+import { mountSuspended, registerEndpoint } from '@nuxt/test-utils/runtime'
 
 import { listen } from 'listhen'
 import { createApp, eventHandler, toNodeListener } from 'h3'

diff --git a/examples/app-vitest-full/tests/setup/mocks.ts b/examples/app-vitest-full/tests/setup/mocks.ts
@@ -1,5 +1,5 @@
 import { vi } from 'vitest'
-import { mockNuxtImport } from '@nuxt/test-utils/runtime-utils'
+import { mockNuxtImport } from '@nuxt/test-utils/runtime'
 
 mockNuxtImport<typeof useAutoImportSetupMocked>(
   'useAutoImportSetupMocked',

diff --git a/package.json b/package.json
@@ -14,15 +14,15 @@
     "./config": "./dist/config.mjs",
     "./experimental": "./dist/experimental.mjs",
     "./module": "./dist/module.mjs",
-    "./runtime-utils": "./dist/runtime-utils/index.mjs",
+    "./runtime": "./dist/runtime-utils/index.mjs",
     "./vitest-environment": "./dist/vitest-environment.mjs"
   },
   "files": [
     "dist",
     "config.d.ts",
     "experimental.d.ts",
     "module.d.ts",
-    "runtime-utils.d.ts",
+    "runtime.d.ts",
     "vitest-environment.d.ts"
   ],
   "scripts": {

diff --git a/runtime-utils.d.ts → runtime.d.ts b/runtime-utils.d.ts → runtime.d.ts
diff --git a/src/runtime-utils/mock.ts b/src/runtime-utils/mock.ts
@@ -23,7 +23,7 @@ export type OptionalFunction<T> = T | (() => Awaitable<T>)
  * @param options - factory function that returns the mocked data or an object containing both the `handler` and the `method` properties.
  * @example
  * ```ts
- * import { registerEndpoint } from '@nuxt/test-utils/runtime-utils'
+ * import { registerEndpoint } from '@nuxt/test-utils/runtime'
  *
  * registerEndpoint("/test/", () => {
  *  test: "test-field"
@@ -69,7 +69,7 @@ export function registerEndpoint(
  * @param _factory - factory function that returns mocked import.
  * @example
  * ```ts
- * import { mockNuxtImport } from '@nuxt/test-utils/runtime-utils'
+ * import { mockNuxtImport } from '@nuxt/test-utils/runtime'
  *
  * mockNuxtImport('useStorage', () => {
  *  return () => {
@@ -94,7 +94,7 @@ export function mockNuxtImport<T = any>(
  * @param setup - factory function that returns the mocked component.
  * @example
  * ```ts
- * import { mockComponent } from '@nuxt/test-utils/runtime-utils'
+ * import { mockComponent } from '@nuxt/test-utils/runtime'
  *
  * mockComponent('MyComponent', {
  *  props: {

diff --git a/src/runtime-utils/render.ts b/src/runtime-utils/render.ts
@@ -29,7 +29,7 @@ export const WRAPPER_EL_ID = 'test-wrapper'
  *
  * ```ts
  * // tests/components/SomeComponents.nuxt.spec.ts
- * import { renderSuspended } from '@nuxt/test-utils/runtime-utils'
+ * import { renderSuspended } from '@nuxt/test-utils/runtime'
  *
  * it('can render some component', async () => {
  * const { html } = await renderSuspended(SomeComponent)
@@ -40,7 +40,7 @@ export const WRAPPER_EL_ID = 'test-wrapper'
  * })
  *
  * // tests/App.nuxt.spec.ts
- * import { renderSuspended } from '@nuxt/test-utils/runtime-utils'
+ * import { renderSuspended } from '@nuxt/test-utils/runtime'
  * import { screen } from '@testing-library/vue'
  *
  * it('can also mount an app', async () => {

diff --git a/stubs/vitest-environment-nuxt/utils.mjs b/stubs/vitest-environment-nuxt/utils.mjs
@@ -1 +1 @@
-export * from '@nuxt/test-utils/runtime-utils'
+export * from '@nuxt/test-utils/runtime'
diff --git a/test/unit/mock-transform.spec.ts b/test/unit/mock-transform.spec.ts
@@ -43,7 +43,7 @@ describe('mocking', () => {
         from: 'bob'
       }]
       expect(await getResult(`
-        import { mockNuxtImport } from '@nuxt/test-utils/runtime-utils'
+        import { mockNuxtImport } from '@nuxt/test-utils/runtime'
         mockNuxtImport('useSomeExport', () => {
           return () => 'mocked'
         })
@@ -65,7 +65,7 @@ describe('mocking', () => {
           return mocks["bob"] 
         });
 
-                import { mockNuxtImport } from '@nuxt/test-utils/runtime-utils'
+                import { mockNuxtImport } from '@nuxt/test-utils/runtime'
                 
               
          import "bob";"
@@ -97,7 +97,7 @@ describe('mocking', () => {
         filePath: '/test/thing.vue'
       }]
       expect(await getResult(`
-        import { mockComponent } from '@nuxt/test-utils/runtime-utils'
+        import { mockComponent } from '@nuxt/test-utils/runtime'
         mockComponent('MyComponent', () => import('./MockComponent.vue'))
       `)).toMatchInlineSnapshot(`
         "import {vi} from "vitest";
@@ -112,7 +112,7 @@ describe('mocking', () => {
           return 'default' in result ? result : { default: result }
         });
 
-                import { mockComponent } from '@nuxt/test-utils/runtime-utils'
+                import { mockComponent } from '@nuxt/test-utils/runtime'
                 
               "
       `)

diff --git a/tsconfig.json b/tsconfig.json
@@ -7,7 +7,7 @@
     "config.d.ts",
     "experimental.d.ts",
     "module.d.ts",
-    "runtime-utils.d.ts",
+    "runtime.d.ts",
     "vitest-environment.d.ts",
     "dist/**",
     "examples/*",