Skip to content

Commit

Permalink
chore: update assembler
Browse files Browse the repository at this point in the history
  • Loading branch information
thetutlage committed Dec 20, 2023
1 parent 26cf77d commit 4a98cae
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions commands/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@ export default class Build extends BaseCommand {
const assetsBundler = await detectAssetsBundler(this.app)
return assetsBundler
? {
serve: this.assets === false ? false : true,
enabled: this.assets === false ? false : true,
driver: assetsBundler.name,
cmd: assetsBundler.build.command,
args: (assetsBundler.build.args || []).concat(this.assetsArgs || []),
}
: {
serve: false as const,
enabled: false as const,
}
}

Expand Down
4 changes: 2 additions & 2 deletions commands/serve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ export default class Serve extends BaseCommand {
const assetsBundler = await detectAssetsBundler(this.app)
return assetsBundler
? {
serve: this.assets === false ? false : true,
enabled: this.assets === false ? false : true,
driver: assetsBundler.name,
cmd: assetsBundler.devServer.command,
args: (assetsBundler.devServer.args || []).concat(this.assetsArgs || []),
}
: {
serve: false as const,
enabled: false as const,
}
}

Expand Down
4 changes: 2 additions & 2 deletions commands/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,13 @@ export default class Test extends BaseCommand {
const assetsBundler = await detectAssetsBundler(this.app)
return assetsBundler
? {
serve: this.assets === false ? false : true,
enabled: this.assets === false ? false : true,
driver: assetsBundler.name,
cmd: assetsBundler.devServer.command,
args: (assetsBundler.devServer.args || []).concat(this.assetsArgs || []),
}
: {
serve: false as const,
enabled: false as const,
}
}

Expand Down
6 changes: 3 additions & 3 deletions modules/ace/codemods.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { EventEmitter } from 'node:events'
import type { Logger } from '@poppinss/cliui'
import { EnvEditor } from '@adonisjs/env/editor'
import type { CodeTransformer } from '@adonisjs/assembler/code_transformer'
import type { AddMiddlewareEntry, EnvValidationDefinition } from '@adonisjs/assembler/types'
import type { MiddlewareNode, EnvValidationNode } from '@adonisjs/assembler/types'

import type { Application } from '../app.js'

Expand Down Expand Up @@ -112,7 +112,7 @@ export class Codemods extends EventEmitter {
/**
* Define validations for the environment variables
*/
async defineEnvValidations(validations: EnvValidationDefinition) {
async defineEnvValidations(validations: EnvValidationNode) {
await this.#importAssembler()
if (!this.#codeTransformer) {
this.#cliLogger.warning(
Expand All @@ -136,7 +136,7 @@ export class Codemods extends EventEmitter {
/**
* Define validations for the environment variables
*/
async registerMiddleware(stack: 'server' | 'router' | 'named', middleware: AddMiddlewareEntry[]) {
async registerMiddleware(stack: 'server' | 'router' | 'named', middleware: MiddlewareNode[]) {
await this.#importAssembler()
if (!this.#codeTransformer) {
this.#cliLogger.warning(
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"index:commands": "node --loader=ts-node/esm toolkit/main.js index build/commands"
},
"devDependencies": {
"@adonisjs/assembler": "^6.1.3-30",
"@adonisjs/assembler": "^7.0.0-0",
"@adonisjs/eslint-config": "^1.2.0",
"@adonisjs/prettier-config": "^1.2.0",
"@adonisjs/tsconfig": "^1.2.0",
Expand Down Expand Up @@ -141,7 +141,7 @@
"youch-terminal": "^2.2.3"
},
"peerDependencies": {
"@adonisjs/assembler": "^6.1.3-26",
"@adonisjs/assembler": "^7.0.0-0",
"@vinejs/vine": "^1.7.0",
"argon2": "^0.31.1",
"bcrypt": "^5.1.1",
Expand Down

0 comments on commit 4a98cae

Please sign in to comment.