diff --git a/index.ts b/index.ts index 98565dd..9e3cb44 100644 --- a/index.ts +++ b/index.ts @@ -13,10 +13,11 @@ export { Redirect } from './src/redirect.js' export { Server } from './src/server/main.js' export { Router } from './src/router/main.js' export { Route } from './src/router/route.js' +export * as errors from './src/exceptions.js' +export { BriskRoute } from './src/router/brisk.js' export { RouteGroup } from './src/router/group.js' export { defineConfig } from './src/define_config.js' -export { RouteResource } from './src/router/resource.js' -export { BriskRoute } from './src/router/brisk.js' +export { CookieClient } from './src/cookies/client.js' export { HttpContext } from './src/http_context/main.js' -export * as errors from './src/exceptions.js' +export { RouteResource } from './src/router/resource.js' export { HttpExceptionHandler } from './src/exception_handler.js' diff --git a/package.json b/package.json index 28ff5c3..d31a845 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "@japa/run-failed-tests": "^1.1.0", "@japa/runner": "^2.2.2", "@japa/spec-reporter": "^1.3.2", - "@swc/core": "^1.3.29", + "@swc/core": "^1.3.30", "@types/accepts": "^1.3.5", "@types/content-disposition": "^0.5.5", "@types/cookie": "^0.5.1", @@ -76,7 +76,7 @@ "c8": "^7.12.0", "cross-env": "^7.0.3", "del-cli": "^5.0.0", - "eslint": "^8.32.0", + "eslint": "^8.33.0", "eslint-config-prettier": "^8.6.0", "eslint-plugin-adonis": "^3.0.3", "eslint-plugin-prettier": "^4.2.1", @@ -94,7 +94,7 @@ "typescript": "^4.9.4" }, "dependencies": { - "@poppinss/macroable": "^1.0.0-0", + "@poppinss/macroable": "^1.0.0-2", "@poppinss/matchit": "^3.1.2", "@poppinss/middleware": "^3.1.0", "@poppinss/utils": "^6.5.0-0", diff --git a/src/http_context/main.ts b/src/http_context/main.ts index 4880fb0..646b3c9 100644 --- a/src/http_context/main.ts +++ b/src/http_context/main.ts @@ -8,8 +8,8 @@ */ import { inspect } from 'node:util' +import Macroable from '@poppinss/macroable' import type { Logger } from '@adonisjs/logger' -import { Macroable } from '@poppinss/macroable' import { RuntimeException } from '@poppinss/utils' import { ContainerResolver } from '@adonisjs/fold' diff --git a/src/request.ts b/src/request.ts index 6d7b1e2..4bf04ca 100644 --- a/src/request.ts +++ b/src/request.ts @@ -14,9 +14,9 @@ import accepts from 'accepts' import { isIP } from 'node:net' import is from '@sindresorhus/is' import proxyaddr from 'proxy-addr' -import lodash from '@poppinss/utils/lodash' import { safeEqual } from '@poppinss/utils' -import { Macroable } from '@poppinss/macroable' +import Macroable from '@poppinss/macroable' +import lodash from '@poppinss/utils/lodash' import { parse, UrlWithStringQuery } from 'node:url' import type { Encryption } from '@adonisjs/encryption' import { ServerResponse, IncomingMessage, IncomingHttpHeaders } from 'node:http' diff --git a/src/response.ts b/src/response.ts index f43629e..ec92753 100644 --- a/src/response.ts +++ b/src/response.ts @@ -16,7 +16,7 @@ import { extname } from 'node:path' import onFinished from 'on-finished' import { promisify } from 'node:util' import json from '@poppinss/utils/json' -import { Macroable } from '@poppinss/macroable' +import Macroable from '@poppinss/macroable' import { createReadStream, stat } from 'node:fs' import { RuntimeException } from '@poppinss/utils' import contentDisposition from 'content-disposition' diff --git a/src/router/brisk.ts b/src/router/brisk.ts index 2ed29e1..bcca858 100644 --- a/src/router/brisk.ts +++ b/src/router/brisk.ts @@ -7,7 +7,7 @@ * file that was distributed with this source code. */ -import { Macroable } from '@poppinss/macroable' +import Macroable from '@poppinss/macroable' import type { Application } from '@adonisjs/application' import { Route } from './route.js' diff --git a/src/router/group.ts b/src/router/group.ts index a343e7c..fc1526d 100644 --- a/src/router/group.ts +++ b/src/router/group.ts @@ -7,7 +7,7 @@ * file that was distributed with this source code. */ -import { Macroable } from '@poppinss/macroable' +import Macroable from '@poppinss/macroable' import type { RouteMatcher, StoreRouteMiddleware } from '../types/route.js' import type { MiddlewareFn, ParsedNamedMiddleware } from '../types/middleware.js' diff --git a/src/router/matchers.ts b/src/router/matchers.ts index b6a66c6..bb3b3c1 100644 --- a/src/router/matchers.ts +++ b/src/router/matchers.ts @@ -7,7 +7,7 @@ * file that was distributed with this source code. */ -import { Macroable } from '@poppinss/macroable' +import Macroable from '@poppinss/macroable' /** * Shortcut methods for commonly used route matchers diff --git a/src/router/resource.ts b/src/router/resource.ts index 2563650..3618f35 100644 --- a/src/router/resource.ts +++ b/src/router/resource.ts @@ -8,7 +8,7 @@ */ import string from '@poppinss/utils/string' -import { Macroable } from '@poppinss/macroable' +import Macroable from '@poppinss/macroable' import { RuntimeException } from '@poppinss/utils' import type { Application } from '@adonisjs/application' diff --git a/src/router/route.ts b/src/router/route.ts index b7d2aad..a7a617f 100644 --- a/src/router/route.ts +++ b/src/router/route.ts @@ -8,8 +8,8 @@ */ import is from '@sindresorhus/is' +import Macroable from '@poppinss/macroable' import Middleware from '@poppinss/middleware' -import { Macroable } from '@poppinss/macroable' import { RuntimeException } from '@poppinss/utils' import type { Application } from '@adonisjs/application' import { moduleCaller, moduleExpression, moduleImporter } from '@adonisjs/fold'