Skip to content

fix: opt in to import.meta.* properties#526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danielroe merged 1 commit into from
Mar 25, 2024
Merged

fix: opt in to import.meta.* properties #526

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/runtime/router.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,15 +38,15 @@ export default defineNuxtPlugin({

const history =
routerOptions.history?.(routerBase) ??
(process.client
(import.meta.client
? routerOptions.hashMode
? createWebHashHistory(routerBase)
: createWebHistory(routerBase)
: createMemoryHistory(routerBase))

const routes = routerOptions.routes?.(_routes) ?? _routes

const initialURL = process.server
const initialURL = import.meta.server
? nuxtApp.ssrContext!.url
: createCurrentLocation(routerBase, window.location)
const router = createRouter({
Expand DownExpand Up@@ -129,7 +129,7 @@ export default defineNuxtPlugin({
: entry

if (!middleware) {
if (process.dev) {
if (import.meta.dev) {
throw new Error(
`Unknown route middleware: '${entry}'. Valid middleware: ${Object.keys(
namedMiddleware
Expand All@@ -142,7 +142,7 @@ export default defineNuxtPlugin({
}

const result = await callWithNuxt(nuxtApp, middleware, [to, from])
if (process.server || (!nuxtApp.payload.serverRendered && nuxtApp.isHydrating)) {
if (import.meta.server || (!nuxtApp.payload.serverRendered && nuxtApp.isHydrating)) {
if (result === false || result instanceof Error) {
const error =
result ||
Expand All@@ -163,7 +163,7 @@ export default defineNuxtPlugin({
router.afterEach(async to => {
delete nuxtApp._processingMiddleware

if (process.client && !nuxtApp.isHydrating && error.value) {
if (import.meta.client && !nuxtApp.isHydrating && error.value) {
// Clear any existing errors
await callWithNuxt(nuxtApp, clearError)
}
Expand All@@ -175,7 +175,7 @@ export default defineNuxtPlugin({
statusMessage: `Page not found: ${to.fullPath}`,
}),
])
} else if (process.server) {
} else if (import.meta.server) {
const currentURL = to.fullPath || '/'
if (!isEqual(currentURL, initialURL, { trailingSlash: true })) {
const event = await callWithNuxt(nuxtApp, useRequestEvent)
Expand All@@ -189,7 +189,7 @@ export default defineNuxtPlugin({
})

try {
if (process.client) {
if (import.meta.client) {
await router.replace({
...router.resolve(initialURL),
name: undefined, // #4920, #4982
Expand Down