Skip to content

Commit

Permalink
chore: type check errors running tsc (#269)
Browse files Browse the repository at this point in the history
Co-authored-by: Daniel Roe <[email protected]>
Co-authored-by: Pooya Parsa <[email protected]>
  • Loading branch information
3 people authored Jun 12, 2022
1 parent 9ca8022 commit 3f11508
Show file tree
Hide file tree
Showing 17 changed files with 30 additions and 20 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
cache: pnpm
- run: pnpm install
- run: pnpm lint
- run: pnpm test:types
- run: pnpm build
- run: pnpm vitest --coverage
- uses: codecov/codecov-action@v3
Expand Down
4 changes: 4 additions & 0 deletions examples/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../tsconfig.json",
"include": ["."]
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
"prepack": "pnpm build",
"release": "pnpm test && pnpm build && standard-version && pnpm publish && git push --follow-tags",
"stub": "unbuild --stub",
"test": "pnpm lint && vitest run --silent"
"test": "pnpm lint && vitest run --silent",
"test:types": "tsc --noEmit"
},
"resolutions": {
"nitropack": "link:."
Expand Down
3 changes: 1 addition & 2 deletions src/presets/aws-lambda.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { defineNitroPreset } from '../preset'

export const awsLambda = defineNitroPreset({
entry: '#internal/nitro/entries/aws-lambda',
externals: true
entry: '#internal/nitro/entries/aws-lambda'
})
1 change: 0 additions & 1 deletion src/presets/azure-functions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import type { Nitro } from '../types'
export const azureFunctions = defineNitroPreset({
serveStatic: true,
entry: '#internal/nitro/entries/azure-functions',
externals: true,
commands: {
deploy: 'az functionapp deployment source config-zip -g <resource-group> -n <app-name> --src {{ output.dir }}/deploy.zip'
},
Expand Down
1 change: 0 additions & 1 deletion src/presets/azure.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import type { Nitro } from '../types'

export const azure = defineNitroPreset({
entry: '#internal/nitro/entries/azure',
externals: true,
output: {
serverDir: '{{ output.dir }}/server/functions'
},
Expand Down
1 change: 0 additions & 1 deletion src/presets/firebase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import type { Nitro } from '../types'

export const firebase = defineNitroPreset({
entry: '#internal/nitro/entries/firebase',
externals: true,
commands: {
deploy: 'npx firebase deploy'
},
Expand Down
3 changes: 1 addition & 2 deletions src/presets/node.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { defineNitroPreset } from '../preset'

export const node = defineNitroPreset({
entry: '#internal/nitro/entries/node',
externals: true
entry: '#internal/nitro/entries/node'
})
1 change: 0 additions & 1 deletion src/presets/stormkit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { defineNitroPreset } from '../preset'

export const stormkit = defineNitroPreset({
entry: '#internal/nitro/entries/stormkit',
externals: true,
output: {
dir: '{{ rootDir }}/.stormkit'
}
Expand Down
2 changes: 1 addition & 1 deletion src/rollup/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ export const plugins = [

// Externals Plugin
if (!nitro.options.noExternals) {
rollupConfig.plugins.push(externals(defu(nitro.options.externals as any, {
rollupConfig.plugins.push(externals(defu(nitro.options.externals, {
outDir: nitro.options.output.serverDir,
moduleDirectories: nitro.options.nodeModulesDirs,
external: [
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function createNitroApp (): NitroApp {
const routerOptions = createMatcher({ routes: config.nitro.routes })

for (const h of handlers) {
let handler = h.lazy ? lazyEventHandler(h.handler as any) : h.handler
let handler = h.lazy ? lazyEventHandler(h.handler) : h.handler

const referenceRoute = h.route.replace(/:\w+|\*\*/g, '_')
const routeOptions = routerOptions.lookup(referenceRoute) || {}
Expand Down
3 changes: 2 additions & 1 deletion src/runtime/client.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Client polyfill
import { $fetch } from 'ohmyfetch'
import { $Fetch, NitroFetchRequest } from '../types'

if (!globalThis.$fetch) {
globalThis.$fetch = $fetch
globalThis.$fetch = $fetch as $Fetch<unknown, NitroFetchRequest>
}
3 changes: 2 additions & 1 deletion src/runtime/entries/netlify-edge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@ export default async function (request: Request, _context) {
url: url.pathname + url.search,
host: url.hostname,
protocol: url.protocol,
// @ts-ignore TODO
headers: request.headers,
method: request.method,
redirect: request.redirect,
body
})

return new Response(r.body, {
headers: r.headers,
headers: r.headers as HeadersInit,
status: r.status,
statusText: r.statusText
})
Expand Down
4 changes: 3 additions & 1 deletion src/runtime/entries/service-worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,14 @@ async function handleEvent (url, event) {
})

return new Response(r.body, {
headers: r.headers,
headers: r.headers as HeadersInit,
status: r.status,
statusText: r.statusText
})
}

declare const self: ServiceWorkerGlobalScope

self.addEventListener('install', () => {
self.skipWaiting()
})
Expand Down
9 changes: 6 additions & 3 deletions src/runtime/virtual/server-handlers.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import type { CompatibilityEventHandler, RouterMethod } from 'h3'
import type { CompatibilityEventHandler, LazyEventHandler, RouterMethod } from 'h3'

interface HandlerDefinition {
type HandlerDefinition = {
route: string
lazy?: boolean
middleware?: boolean
handler: CompatibilityEventHandler | (() => Promise<CompatibilityEventHandler>)
handler: CompatibilityEventHandler
method?: RouterMethod
} & {
lazy: true
handler: LazyEventHandler
}

export const handlers: HandlerDefinition[]
2 changes: 1 addition & 1 deletion src/runtime/virtual/storage.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import type { Storage } from 'unstorage'

export const useStorage = () => Storage
export declare const useStorage: () => Storage
7 changes: 5 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"allowSyntheticDefaultImports": true,
"skipLibCheck": true,
"lib": [
"WebWorker"
"WebWorker",
"DOM.Iterable"
],
"target": "ESNext",
"module": "ESNext",
Expand All @@ -27,6 +28,8 @@
"include": [
"src",
"test",
"examples"
],
"exclude": [
"test/fixture"
]
}

0 comments on commit 3f11508

Please sign in to comment.