Release v3

.editorconfig

@@ -11,12 +11,5 @@ insert_final_newline = true
 [*.json]
 insert_final_newline = ignore
 
-[**.min.js]
-indent_style = ignore
-insert_final_newline = ignore
-
-[MakeFile]
-indent_style = space
-
 [*.md]
 trim_trailing_whitespace = false

.github/funding.yml

@@ -0,0 +1 @@
+github: [thetutlage, Julien-R44]

LICENSE.md

@@ -1,6 +1,6 @@
 # The MIT License
 
-Copyright 2022 Harminder Virk, contributors
+Copyright (c) 2023
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

bin/test.ts

@@ -1,20 +1,44 @@
+/*
+ * @adonisjs/vite
+ *
+ * (c) AdonisJS
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 import { assert } from '@japa/assert'
+import { snapshot } from '@japa/snapshot'
 import { fileSystem } from '@japa/file-system'
-import { expectTypeOf } from '@japa/expect-type'
 import { processCLIArgs, configure, run } from '@japa/runner'
-import { BASE_URL } from '../tests_helpers/index.js'
 
+import { BASE_URL } from '../tests/backend/helpers.js'
+
+/*
+|--------------------------------------------------------------------------
+| Configure tests
+|--------------------------------------------------------------------------
+|
+| The configure method accepts the configuration to configure the Japa
+| tests runner.
+|
+| The first method call "processCLIArgs" process the command line arguments
+| and turns them into a config object. Using this method is not mandatory.
+|
+| Please consult japa.dev/runner-config for the config docs.
+*/
 processCLIArgs(process.argv.slice(2))
 configure({
   files: ['tests/**/*.spec.ts'],
-  plugins: [
-    assert(),
-    fileSystem({
-      autoClean: true,
-      basePath: BASE_URL,
-    }),
-    expectTypeOf(),
-  ],
+  plugins: [assert(), fileSystem({ basePath: BASE_URL }), snapshot()],
 })
 
+/*
+|--------------------------------------------------------------------------
+| Run tests
+|--------------------------------------------------------------------------
+|
+| The following "run" method is required to execute all the tests.
+|
+*/
 run()

configure.ts

@@ -8,6 +8,7 @@
  */
 
 import type Configure from '@adonisjs/core/commands/configure'
+
 import { stubsRoot } from './stubs/main.js'
 
 /**
@@ -24,11 +25,22 @@ export async function configure(command: Configure) {
   await codemods.makeUsingStub(stubsRoot, 'vite.config.stub', {})
   await codemods.makeUsingStub(stubsRoot, 'js_entrypoint.stub', {})
 
+  /**
+   * Update RC file
+   */
   await codemods.updateRcFile((rcFile) => {
     rcFile.addProvider('@adonisjs/vite/vite_provider')
     rcFile.addMetaFile('public/**', false)
+    rcFile.addAssemblerHook('onBuildStarting', '@adonisjs/vite/build_hook')
   })
 
+  /**
+   * Add server middleware
+   */
+  await codemods.registerMiddleware('server', [
+    { path: '@adonisjs/vite/vite_middleware', position: 'after' },
+  ])
+
   /**
    * Prompt when `install` or `--no-install` flags are
    * not used
@@ -45,4 +57,25 @@ export async function configure(command: Configure) {
   } else {
     await codemods.listPackagesToInstall([{ name: 'vite', isDevDependency: true }])
   }
+
+  /**
+   * Add `assetsBundler: false` to the adonisrc file
+   */
+  const tsMorph = await import('ts-morph')
+  const project = await codemods.getTsMorphProject()
+  const adonisRcFile = project?.getSourceFile('adonisrc.ts')
+  const defineConfigCall = adonisRcFile
+    ?.getDescendantsOfKind(tsMorph.SyntaxKind.CallExpression)
+    .find((statement) => statement.getExpression().getText() === 'defineConfig')
+
+  const configObject = defineConfigCall!
+    .getArguments()[0]
+    .asKindOrThrow(tsMorph.SyntaxKind.ObjectLiteralExpression)
+
+  configObject.addPropertyAssignment({
+    name: 'assetsBundler',
+    initializer: 'false',
+  })
+
+  await adonisRcFile?.save()
 }

index.ts

@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
+export { Vite } from './src/vite.js'
 export { configure } from './configure.js'
-export { Vite } from './src/backend/vite.js'
 export { stubsRoot } from './stubs/main.js'
-export { defineConfig } from './src/backend/define_config.js'
+export { defineConfig } from './src/define_config.js'

package.json

@@ -1,91 +1,86 @@
 {
   "name": "@adonisjs/vite",
-  "description": "Vite plugin for Adonis.js",
-  "version": "2.0.2",
+  "description": "Vite plugin for AdonisJS",
+  "version": "3.0.0-11",
   "engines": {
-    "node": ">=18.16.0"
+    "node": ">=20.6.0"
   },
   "main": "build/index.js",
   "type": "module",
   "files": [
-    "build/configure.js",
-    "build/configure.d.ts",
-    "build/index.js",
-    "build/index.d.ts",
-    "build/stubs",
-    "build/src",
-    "build/services",
-    "build/providers"
+    "build",
+    "!build/bin",
+    "!build/tests",
+    "!build/tests_helpers"
   ],
   "exports": {
     ".": "./build/index.js",
-    "./services/main": "./build/services/vite.js",
     "./vite_provider": "./build/providers/vite_provider.js",
+    "./plugins/edge": "./build/src/plugins/edge.js",
+    "./vite_middleware": "./build/src/vite_middleware.js",
+    "./build_hook": "./build/src/hooks/build_hook.js",
+    "./services/main": "./build/services/vite.js",
     "./client": "./build/src/client/main.js",
-    "./plugins/edge": "./build/backend/plugins/edge.js",
-    "./types": "./build/src/backend/types.js"
+    "./types": "./build/src/types.js"
   },
   "scripts": {
     "clean": "del-cli build",
-    "copy:templates": "copyfiles \"stubs/**/*.stub\" build",
+    "copy:templates": "copyfiles --up 1 \"stubs/**/*.stub\" build",
     "typecheck": "tsc --noEmit",
     "lint": "eslint . --ext=.ts",
     "format": "prettier --write .",
     "quick:test": "node --enable-source-maps --loader=ts-node/esm bin/test.ts",
     "pretest": "npm run lint",
     "test": "c8 npm run quick:test",
-    "precompile": "npm run lint && npm run clean ",
-    "compile": "tsc",
-    "postcompile": "npm run copy:templates",
-    "build": "npm run compile",
+    "prebuild": "npm run lint && npm run clean",
+    "build": "tsup-node && tsc --emitDeclarationOnly --declaration",
+    "postbuild": "npm run copy:templates",
     "release": "np",
     "version": "npm run build",
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@adonisjs/assembler": "^7.1.0",
-    "@adonisjs/core": "^6.2.1",
-    "@adonisjs/eslint-config": "^1.2.1",
-    "@adonisjs/prettier-config": "^1.2.1",
-    "@adonisjs/session": "^7.1.1",
-    "@adonisjs/shield": "^8.1.0",
-    "@adonisjs/tsconfig": "^1.2.1",
-    "@commitlint/cli": "^18.5.0",
-    "@commitlint/config-conventional": "^18.5.0",
-    "@japa/assert": "^2.1.0",
-    "@japa/expect-type": "^2.0.1",
-    "@japa/file-system": "^2.2.0",
-    "@japa/runner": "^3.1.1",
-    "@swc/core": "^1.3.105",
-    "@types/node": "^20.11.5",
+    "@adonisjs/assembler": "^7.7.0",
+    "@adonisjs/core": "6.9.1",
+    "@adonisjs/eslint-config": "^1.3.0",
+    "@adonisjs/prettier-config": "^1.3.0",
+    "@adonisjs/session": "^7.4.0",
+    "@adonisjs/shield": "^8.1.1",
+    "@adonisjs/tsconfig": "^1.3.0",
+    "@japa/assert": "3.0.0",
+    "@japa/file-system": "^2.3.0",
+    "@japa/runner": "3.1.4",
+    "@japa/snapshot": "^2.0.5",
+    "@swc/core": "^1.5.24",
+    "@types/node": "^20.13.0",
+    "@types/supertest": "^6.0.2",
     "c8": "^9.1.0",
     "copyfiles": "^2.4.1",
     "del-cli": "^5.1.0",
-    "edge.js": "^6.0.1",
-    "eslint": "^8.56.0",
-    "husky": "^8.0.3",
-    "np": "^9.2.0",
-    "prettier": "^3.2.4",
-    "rollup": "^4.9.6",
+    "edge.js": "^6.0.2",
+    "eslint": "^8.57.0",
+    "np": "^10.0.5",
+    "prettier": "^3.3.0",
+    "supertest": "^6.3.4",
+    "ts-morph": "^22.0.0",
     "ts-node": "^10.9.2",
-    "typescript": "^5.3.3",
-    "vite": "^5.0.12"
+    "tsup": "^8.0.2",
+    "typescript": "~5.4.5",
+    "vite": "^5.2.12"
   },
   "dependencies": {
-    "defu": "^6.1.4",
+    "@poppinss/utils": "^6.7.3",
+    "@vavite/multibuild": "^4.1.1",
     "edge-error": "^4.0.1",
     "vite-plugin-restart": "^0.4.0"
   },
   "peerDependencies": {
-    "@adonisjs/core": "^6.2.0",
+    "@adonisjs/core": "^6.3.0",
     "@adonisjs/shield": "^8.0.0",
     "edge.js": "^6.0.1",
-    "vite": "^5.0.11"
+    "vite": "^5.1.4"
   },
   "peerDependenciesMeta": {
-    "vite": {
-      "optional": true
-    },
     "edge.js": {
       "optional": true
     },
@@ -107,27 +102,18 @@
     "vite",
     "adonisjs"
   ],
-  "contributors": [
-    "virk",
-    "adonisjs"
-  ],
   "eslintConfig": {
     "extends": "@adonisjs/eslint-config/package"
   },
   "prettier": "@adonisjs/prettier-config",
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ]
-  },
   "publishConfig": {
     "access": "public",
-    "tag": "latest"
+    "tag": "next"
   },
   "np": {
     "message": "chore(release): %s",
-    "tag": "latest",
-    "branch": "main",
+    "tag": "next",
+    "branch": "next",
     "anyBranch": false
   },
   "c8": {
@@ -140,7 +126,22 @@
       "tests_helpers/**"
     ]
   },
-  "directories": {
-    "test": "tests"
+  "tsup": {
+    "entry": [
+      "./src/hooks/build_hook.ts",
+      "./providers/vite_provider.ts",
+      "./src/vite_middleware.ts",
+      "./src/plugins/edge.ts",
+      "./src/client/main.ts",
+      "./services/vite.ts",
+      "./src/types.ts",
+      "./index.ts"
+    ],
+    "outDir": "./build",
+    "clean": true,
+    "format": "esm",
+    "dts": false,
+    "sourcemap": true,
+    "target": "esnext"
   }
 }