Skip to content

refactor: use kit rc10 utilities #72

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 5 commits into from
Sep 20, 2022
Merged

refactor: use kit rc10 utilities #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
15afd67
refactor: use nuxt kit util to avoid deprecation warning
Lexpeartha Sep 20, 2022
ba6d2f8
lint: ignore unused var rule
Lexpeartha Sep 20, 2022
74a7edb
lint: change to optional chaining to avoid lint error
Lexpeartha Sep 20, 2022
fbb7563
chore: update nuxt to rc 10
Lexpeartha Sep 20, 2022
52e98be
Revert "chore: update nuxt to rc 10"
Lexpeartha Sep 20, 2022
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
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"@ionic/vue": "^6.2.7",
"@ionic/vue-router": "^6.2.7",
"@kevinmarrec/nuxt-pwa": "^0.4.2",
"@nuxt/kit": "^3.0.0-rc.8",
"@nuxt/kit": "^3.0.0-rc.10",
"ionicons": "^6.0.3",
"pathe": "^0.3.8",
"pkg-types": "^0.3.5",
Expand All @@ -68,8 +68,8 @@
},
"devDependencies": {
"@nuxt/module-builder": "^0.1.7",
"@nuxt/schema": "3.0.0-rc.8",
"@nuxt/test-utils": "3.0.0-rc.8",
"@nuxt/schema": "3.0.0-rc.10",
"@nuxt/test-utils": "3.0.0-rc.10",
"@nuxtjs/eslint-config-typescript": "^11.0.0",
"@release-it/conventional-changelog": "^5.1.0",
"@types/node": "^18.7.16",
Expand Down
1 change: 1 addition & 0 deletions playground/middleware/auth.global.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// eslint-disable-next-line @typescript-eslint/no-unused-vars
export default defineNuxtRouteMiddleware(to => {
console.log('ran middleware')
})
48 changes: 26 additions & 22 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 13 additions & 9 deletions src/module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
import { existsSync, promises as fsp } from 'node:fs'

import { defineNuxtModule, addComponent, addPlugin, addTemplate } from '@nuxt/kit'
import {
defineNuxtModule,
addComponent,
addPlugin,
addTemplate,
addImportsSources,
} from '@nuxt/kit'
import { join, resolve } from 'pathe'
import { readPackageJSON } from 'pkg-types'
import { defineUnimportPreset } from 'unimport'
Expand Down Expand Up @@ -137,14 +143,12 @@ export default defineNuxtModule<ModuleOptions>({
)

// Add auto-imported composables
nuxt.hook('autoImports:sources', presets => {
presets.push(
defineUnimportPreset({
from: '@ionic/vue',
imports: [...IonicHooks],
})
)
})
addImportsSources(
defineUnimportPreset({
from: '@ionic/vue',
imports: [...IonicHooks],
})
)

const { setupBasic, setupCore, setupUtilities } = useCSSSetup()

Expand Down
6 changes: 2 additions & 4 deletions src/parts/icons.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useNuxt } from '@nuxt/kit'
import { useNuxt, addImportsSources } from '@nuxt/kit'
import { defineUnimportPreset } from 'unimport'
import * as icons from 'ionicons/icons/index.mjs'

Expand All @@ -16,7 +16,5 @@ export const setupIcons = () => {

nuxt.options.build.transpile.push(/ionicons/)

nuxt.hook('autoImports:sources', presets => {
presets.push(iconsPreset)
})
addImportsSources(iconsPreset)
}
4 changes: 2 additions & 2 deletions src/runtime/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default defineNuxtPlugin(async nuxtApp => {
const routes = routerOptions.routes?.(_routes) ?? _routes

const initialURL = process.server
? nuxtApp.ssrContext!.url
? nuxtApp.ssrContext?.url
: createCurrentLocation(routerBase, window.location)
const router = createRouter({
...routerOptions,
Expand Down Expand Up @@ -177,7 +177,7 @@ export default defineNuxtPlugin(async nuxtApp => {
})

// https://github.com/vuejs/router/blob/4a0cc8b9c1e642cdf47cc007fa5bbebde70afc66/packages/router/src/history/html5.ts#L37
function createCurrentLocation (base: string, location: Location): string {
function createCurrentLocation(base: string, location: Location): string {
const { pathname, search, hash } = location
// allows hash bases like #, /#, #/, #!, #!/, /#!/, or even /folder#end
const hashPos = base.indexOf('#')
Expand Down