github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-03 02:01:01 +08:00
Code Projects Activity

Add frontend:dev:install configuration (#1666)

Browse Source 
* Add frontend:dev:install configuration

* When building the frontend in dev mode, use `frontend:dev:install` (if it has been defined) to install the dependencies

* Simplified logic for determining installation command

Co-authored-by: Lea Anthony <lea.anthony@gmail.com>
This commit is contained in:
LGiki 2022-08-03 15:15:22 +08:00 committed by GitHub
parent 224f7c0c56
commit 568015972a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
v2/internal/project/project.go
View File

@ -22,6 +22,7 @@ type Project struct {
// Commands used in `wails dev`
DevCommand string `json:"frontend:dev"`
DevInstallCommand string `json:"frontend:dev:install"`
DevWatcherCommand string `json:"frontend:dev:watcher"`
// The url of the external wails dev server. If this is set, this server is used for the frontend. Default ""
FrontendDevServerURL string `json:"frontend:dev:serverUrl"`
@ -85,8 +86,8 @@ type Project struct {
}
func (p *Project) GetDevInstallerCommand() string {
if p.DevCommand != "" {
return p.DevCommand
if p.DevInstallCommand != "" {
return p.DevInstallCommand
}
return p.InstallCommand
}

10
v2/pkg/commands/build/base.go
View File

@ -513,7 +513,11 @@ func (b *BaseBuilder) BuildFrontend(outputLogger *clilogger.CLILogger) error {
frontendDir := filepath.Join(b.projectData.Path, "frontend")
// Check there is an 'InstallCommand' provided in wails.json
if b.projectData.InstallCommand == "" {
installCommand := b.projectData.InstallCommand
if b.projectData.OutputType == "dev" {
installCommand = b.projectData.GetDevInstallerCommand()
}
if installCommand == "" {
// No - don't install
outputLogger.Println(" - No Install command. Skipping.")
} else {
@ -521,9 +525,9 @@ func (b *BaseBuilder) BuildFrontend(outputLogger *clilogger.CLILogger) error {
outputLogger.Print(" - Installing frontend dependencies: ")
if verbose {
outputLogger.Println("")
outputLogger.Println(" Install command: '" + b.projectData.InstallCommand + "'")
outputLogger.Println(" Install command: '" + installCommand + "'")
}
if err := b.NpmInstallUsingCommand(frontendDir, b.projectData.InstallCommand, verbose); err != nil {
if err := b.NpmInstallUsingCommand(frontendDir, installCommand, verbose); err != nil {
return err
}
outputLogger.Println("Done.")

1
website/docs/reference/project-config.mdx
View File

@ -14,6 +14,7 @@ The project config resides in the `wails.json` file in the project directory. Th
"frontend:install": "[The command to install node dependencies, run in the frontend directory - often `npm install`]",
"frontend:build": "[The command to build the assets, run in the frontend directory - often `npm run build`]",
"frontend:dev": "[This command is the dev equivalent of frontend:build. If not specified falls back to frontend:build]",
"frontend:dev:install": "[This command is the dev equivalent of frontend:install. If not specified falls back to frontend:install]",
"frontend:dev:watcher": "[This command is run in a separate process on `wails dev`. Useful for 3rd party watchers or starting 3d party dev servers]",
"frontend:dev:serverUrl": "[URL to a 3rd party dev server to be used to serve assets, EG Vite. If this is set to 'auto' then the devServerUrl will be inferred from the Vite output]",
"wailsjsdir": "[Relative path to the directory that the auto-generated JS modules will be created]",

1
website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/reference/project-config.mdx
View File

@ -14,6 +14,7 @@ sidebar_position: 5
"frontend:install": "[安装 node 依赖的命令，在 frontend 目录下运行 - 通常是 `npm install`]",
"frontend:build": "[构建资源的命令，在 frontend 目录下运行 - 通常是 `npm run build`]",
"frontend:dev": "[此命令等效于开发模式中的 frontend:build，如果没有指定则只有 frontend:build]",
"frontend:dev:install": "[此命令等效于开发模式中的 frontend:install，如果没有指定则只有 frontend:install]",
"frontend:dev:watcher": "[此命令在 `wails dev` 上的单独进程中运行。对第 3 方观察者有用]",
"frontend:dev:serverUrl": "[使用第三方开发服务器提供资源，比如 Vite",
"wailsjsdir": "[自动生成的JS模块将被创建的目录的相对路径]",