Merge branch 'main' into 1.x

Author: timacdonald

.github/workflows/codeql-analysis.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/tests.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/vite-plugin/compare/v0.7.8...main)
+## [Unreleased](https://github.com/laravel/vite-plugin/compare/v0.8.1...main)
+
+## [v0.8.1](https://github.com/laravel/vite-plugin/compare/v0.8.0...v0.8.1) - 2023-09-26
+
+- [0.8] Fix issue with `0.0.0.0` network resolution by [@timacdonald](https://github.com/timacdonald) in https://github.com/laravel/vite-plugin/pull/241
+- Upgrade vitest by [@sapphi-red](https://github.com/sapphi-red) in https://github.com/laravel/vite-plugin/pull/246
+
+## [v0.8.0](https://github.com/laravel/vite-plugin/compare/v0.7.8...v0.8.0) - 2023-08-08
+
+- fix: compile error following upgrade.md's vite to mix guide by [@AshboDev](https://github.com/AshboDev) in https://github.com/laravel/vite-plugin/pull/231
+- Support Laravel Herd by [@claudiodekker](https://github.com/claudiodekker) in https://github.com/laravel/vite-plugin/pull/233
 
 ## [v0.7.8](https://github.com/laravel/vite-plugin/compare/v0.7.7...v0.7.8) - 2023-05-24
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "laravel-vite-plugin",
-    "version": "0.7.8",
+    "version": "0.8.1",
     "description": "Laravel plugin for Vite.",
     "keywords": [
         "laravel",
@@ -47,7 +47,7 @@
         "eslint": "^8.14.0",
         "typescript": "^4.6.4",
         "vite": "^4.0.0",
-        "vitest": "^0.25.2"
+        "vitest": "^0.34.4"
     },
     "peerDependencies": {
         "vite": "^3.0.0 || ^4.0.0"

src/index.ts

@@ -116,6 +116,7 @@ export default function laravel(config: string|string[]|PluginConfig): [LaravelP
 function resolveLaravelPlugin(pluginConfig: Required<PluginConfig>): LaravelPlugin {
     let viteDevServerUrl: DevServerUrl
     let resolvedConfig: ResolvedConfig
+    let userConfig: UserConfig
 
     const defaultAliases: Record<string, string> = {
         '@': '/resources/js',
@@ -124,7 +125,8 @@ function resolveLaravelPlugin(pluginConfig: Required<PluginConfig>): LaravelPlug
     return {
         name: 'laravel',
         enforce: 'post',
-        config: (userConfig, { command, mode }) => {
+        config: (config, { command, mode }) => {
+            userConfig = config
             const ssr = !! userConfig.build?.ssr
             const env = loadEnv(mode, userConfig.envDir || process.cwd(), '')
             const assetUrl = env.ASSET_URL ?? ''
@@ -202,7 +204,7 @@ function resolveLaravelPlugin(pluginConfig: Required<PluginConfig>): LaravelPlug
 
                 const isAddressInfo = (x: string|AddressInfo|null|undefined): x is AddressInfo => typeof x === 'object'
                 if (isAddressInfo(address)) {
-                    viteDevServerUrl = resolveDevServerUrl(address, server.config)
+                    viteDevServerUrl = resolveDevServerUrl(address, server.config, userConfig)
                     fs.writeFileSync(pluginConfig.hotFile, viteDevServerUrl)
 
                     setTimeout(() => {
@@ -406,16 +408,17 @@ function resolveFullReloadConfig({ refresh: config }: Required<PluginConfig>): P
 /**
  * Resolve the dev server URL from the server address and configuration.
  */
-function resolveDevServerUrl(address: AddressInfo, config: ResolvedConfig): DevServerUrl {
+function resolveDevServerUrl(address: AddressInfo, config: ResolvedConfig, userConfig: UserConfig): DevServerUrl {
     const configHmrProtocol = typeof config.server.hmr === 'object' ? config.server.hmr.protocol : null
     const clientProtocol = configHmrProtocol ? (configHmrProtocol === 'wss' ? 'https' : 'http') : null
     const serverProtocol = config.server.https ? 'https' : 'http'
     const protocol = clientProtocol ?? serverProtocol
 
     const configHmrHost = typeof config.server.hmr === 'object' ? config.server.hmr.host : null
     const configHost = typeof config.server.host === 'string' ? config.server.host : null
+    const sailHost = process.env.LARAVEL_SAIL && ! userConfig.server?.host ? 'localhost' : null
     const serverAddress = isIpv6(address) ? `[${address.address}]` : address.address
-    const host = configHmrHost ?? configHost ?? serverAddress
+    const host = configHmrHost ?? sailHost ?? configHost ?? serverAddress
 
     const configHmrClientPort = typeof config.server.hmr === 'object' ? config.server.hmr.clientPort : null
     const port = configHmrClientPort ?? address.port