Feature/1.16 (#646)

* Initial support for embed * Security (#644) * Bump y18n from 3.2.1 to 3.2.2 in /runtime/js/runtime (#639) * Create FUNDING.yml * Update README.md * Bump y18n from 3.2.1 to 3.2.2 in /runtime/js/runtime Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2. - [Release notes](https://github.com/yargs/y18n/releases) - [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/yargs/y18n/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Lea Anthony <lea.anthony@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump elliptic from 6.5.3 to 6.5.4 in /runtime/js (#617) Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/indutny/elliptic/releases) - [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump y18n from 4.0.0 to 4.0.1 in /runtime/js (#643) * Create FUNDING.yml * Update README.md * Updated sponsors * Consistent styling of README.md * Bump y18n from 4.0.0 to 4.0.1 in /runtime/js (#638) Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/yargs/y18n/releases) - [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/yargs/y18n/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Revert "Bump y18n from 4.0.0 to 4.0.1 in /runtime/js (#638)" (#642) This reverts commit 17b28a26bd. * Bump y18n from 4.0.0 to 4.0.1 in /runtime/js Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/yargs/y18n/releases) - [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/yargs/y18n/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Lea Anthony <lea.anthony@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Support for minimum and maximum window sizes (#612) * add support for minimum and maximum window sizes * attempt to fix windows * bug fixes * support min/max window sizes on Linux and Windows * fix min/max window sizes on Linux * formatting and comments * fixes Windows DPI issue, clamps width/height values to min/max * App can't go into full screen when max size is set for Mac * fixed Linux maximum width/height on window maximize * Revert "fixed Linux maximum width/height on window maximize" This reverts commit 3f7ba8b26435392116df3c9fe66ef11536e30c59. The fix glitches on PopOS Co-authored-by: Lea Anthony <lea.anthony@gmail.com> * v1.13.0 * Remove mewn. Update templates. Remove logging. * Import embed in templates! * Fix react import path * Update README.md * Updated sponsors * Consistent styling of README.md * Revert "Bump y18n from 4.0.0 to 4.0.1 in /runtime/js (#638)" (#642) This reverts commit 17b28a26bd. * Update actions to use 1.16 * v1.16.0 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: RH12503 <48951973+RH12503@users.noreply.github.com>
2026-04-02 05:08:54 -07:00 · 2021-04-02 20:44:55 +11:00
parent 79af447109
commit a2f16aba9b
27 changed files with 131 additions and 250 deletions
--- a/cmd/cmd-mewn.go
+++ b/cmd/cmd-mewn.go
--- a/cmd/helpers.go
+++ b/cmd/helpers.go
@@ -2,7 +2,6 @@ package cmd

 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"os/user"
@@ -12,10 +11,9 @@ import (
 	"strings"
 	"time"

-	"github.com/leaanthony/mewn"
-	"github.com/leaanthony/mewn/lib"
 	"github.com/leaanthony/slicer"
 	"github.com/leaanthony/spinner"
+	wailsruntime "github.com/wailsapp/wails/runtime"
 )

 const xgoVersion = "1.0.1"
@@ -61,30 +59,6 @@ func InstallGoDependencies(verbose bool) error {
 	return nil
 }

-// EmbedAssets will embed the built frontend assets via mewn.
-func EmbedAssets() ([]string, error) {
-	mewnFiles := lib.GetMewnFiles([]string{}, false)
-
-	referencedAssets, err := lib.GetReferencedAssets(mewnFiles)
-	if err != nil {
-		return []string{}, err
-	}
-
-	targetFiles := []string{}
-
-	for _, referencedAsset := range referencedAssets {
-		packfileData, err := lib.GeneratePackFileString(referencedAsset, false)
-		if err != nil {
-			return []string{}, err
-		}
-		targetFile := filepath.Join(referencedAsset.BaseDir, referencedAsset.PackageName+"-mewn.go")
-		targetFiles = append(targetFiles, targetFile)
-		ioutil.WriteFile(targetFile, []byte(packfileData), 0644)
-	}
-
-	return targetFiles, nil
-}
-
 func InitializeCrossCompilation(verbose bool) error {
 	// Check Docker
 	if err := CheckIfInstalled("docker"); err != nil {
@@ -127,7 +101,10 @@ func BuildDocker(binaryName string, buildMode string, projectOptions *ProjectOpt
 	// Check build directory
 	buildDirectory := filepath.Join(fs.Cwd(), "build")
 	if !fs.DirExists(buildDirectory) {
-		fs.MkDir(buildDirectory)
+		err := fs.MkDir(buildDirectory)
+		if err != nil {
+			return err
+		}
 	}

 	buildCommand := slicer.String()
@@ -198,11 +175,6 @@ func BuildDocker(binaryName string, buildMode string, projectOptions *ProjectOpt
 // BuildNative builds on the target platform itself.
 func BuildNative(binaryName string, forceRebuild bool, buildMode string, projectOptions *ProjectOptions) error {

-	// Check Mewn is installed
-	if err := CheckMewn(projectOptions.Verbose); err != nil {
-		return err
-	}
-
 	if err := CheckWindres(); err != nil {
 		return err
 	}
@@ -275,12 +247,6 @@ func BuildNative(binaryName string, forceRebuild bool, buildMode string, project
 func BuildApplication(binaryName string, forceRebuild bool, buildMode string, packageApp bool, projectOptions *ProjectOptions) error {
 	var err error

-	// embed resources
-	targetFiles, err := EmbedAssets()
-	if err != nil {
-		return err
-	}
-
 	if projectOptions.CrossCompile {
 		if err := InitializeCrossCompilation(projectOptions.Verbose); err != nil {
 			return err
@@ -296,20 +262,6 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
 		}
 	}

-	// cleanup temporary embedded assets
-	defer func() {
-		for _, filename := range targetFiles {
-			if err := os.Remove(filename); err != nil {
-				fmt.Println(err)
-			}
-		}
-		// Removed by popular demand
-		// TODO: Potentially add a flag to cleanup
-		// if projectOptions.Platform == "windows" {
-		// 	helper.CleanWindows(projectOptions)
-		// }
-	}()
-
 	if projectOptions.CrossCompile {
 		err = BuildDocker(binaryName, buildMode, projectOptions)
 	} else {
@@ -374,30 +326,6 @@ func BuildFrontend(projectOptions *ProjectOptions) error {
 	return nil
 }

-// CheckMewn checks if mewn is installed and if not, attempts to fetch it
-func CheckMewn(verbose bool) (err error) {
-	programHelper := NewProgramHelper(verbose)
-	if !programHelper.IsInstalled("mewn") {
-		var buildSpinner *spinner.Spinner
-		if !verbose {
-			buildSpinner = spinner.New()
-			buildSpinner.SetSpinSpeed(50)
-			buildSpinner.Start("Installing Mewn asset packer...")
-		}
-		err := programHelper.InstallGoPackage("github.com/leaanthony/mewn/cmd/mewn")
-		if err != nil {
-			if buildSpinner != nil {
-				buildSpinner.Error()
-			}
-			return err
-		}
-		if buildSpinner != nil {
-			buildSpinner.Success()
-		}
-	}
-	return nil
-}
-
 // CheckWindres checks if Windres is installed and if not, aborts
 func CheckWindres() (err error) {
 	if runtime.GOOS != "windows" { // FIXME: Handle windows cross-compile for windows!
@@ -493,11 +421,18 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 		}

 		// Update md5sum file
-		ioutil.WriteFile(md5sumFile, []byte(packageJSONMD5), 0644)
+		err := os.WriteFile(md5sumFile, []byte(packageJSONMD5), 0644)
+		if err != nil {
+			return err
+		}
 	}

 	// Install the runtime
-	err = InstallRuntime(caller, projectDir, projectOptions)
+	if caller == "build" {
+		err = InstallProdRuntime(projectDir, projectOptions)
+	} else {
+		err = InstallBridge(projectDir, projectOptions)
+	}
 	if err != nil {
 		return err
 	}
@@ -510,28 +445,17 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc
 	return nil
 }

-// InstallRuntime installs the correct runtime for the type of build
-func InstallRuntime(caller string, projectDir string, projectOptions *ProjectOptions) error {
-	if caller == "build" {
-		return InstallProdRuntime(projectDir, projectOptions)
-	}
-
-	return InstallBridge(projectDir, projectOptions)
-}
-
 // InstallBridge installs the relevant bridge javascript library
 func InstallBridge(projectDir string, projectOptions *ProjectOptions) error {
-	bridgeFileData := mewn.String("../runtime/assets/bridge.js")
 	bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, "node_modules", "@wailsapp", "runtime", "init.js")
-	err := fs.CreateFile(bridgeFileTarget, []byte(bridgeFileData))
+	err := fs.CreateFile(bridgeFileTarget, wailsruntime.BridgeJS)
 	return err
 }

 // InstallProdRuntime installs the production runtime
 func InstallProdRuntime(projectDir string, projectOptions *ProjectOptions) error {
-	prodInit := mewn.String("../runtime/js/runtime/init.js")
 	bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, "node_modules", "@wailsapp", "runtime", "init.js")
-	err := fs.CreateFile(bridgeFileTarget, []byte(prodInit))
+	err := fs.CreateFile(bridgeFileTarget, wailsruntime.InitJS)
 	return err
 }

--- a/cmd/templates/angular-template/main.go.template
+++ b/cmd/templates/angular-template/main.go.template
@@ -1,7 +1,7 @@
 package main

 import (
-	"github.com/leaanthony/mewn"
+    _ "embed"
 	"github.com/wailsapp/wails"
 )

@@ -9,10 +9,13 @@ func basic() string {
 	return "World!"
 }

-func main() {
+//go:embed frontend/dist/my-app/main.js
+var js string

-	js := mewn.String("./frontend/dist/my-app/main.js")
-	css := mewn.String("./frontend/dist/my-app/styles.css")
+//go:embed frontend/dist/my-app/styles.css
+var css string
+
+func main() {

 	app := wails.CreateApp(&wails.AppConfig{
 		Width:  1024,
--- a/cmd/templates/create-react-app/main.go.template
+++ b/cmd/templates/create-react-app/main.go.template
@@ -1,7 +1,7 @@
 package main

 import (
-  "github.com/leaanthony/mewn"
+  _ "embed"
  "github.com/wailsapp/wails"
 )

@@ -9,10 +9,13 @@ func basic() string {
  return "World!"
 }

-func main() {
+//go:embed frontend/build/static/js/main.js
+var js string

-  js := mewn.String("./frontend/build/static/js/main.js")
-  css := mewn.String("./frontend/build/static/css/main.css")
+//go:embed frontend/build/static/css/main.css
+var css string
+
+func main() {

  app := wails.CreateApp(&wails.AppConfig{
    Width:  1024,
--- a/cmd/templates/svelte/main.go.template
+++ b/cmd/templates/svelte/main.go.template
@@ -1,7 +1,7 @@
 package main

 import (
-	"github.com/leaanthony/mewn"
+    _ "embed"
 	"github.com/wailsapp/wails"
 )

@@ -9,9 +9,13 @@ func basic() string {
 	return "World!"
 }

+//go:embed frontend/public/build/bundle.js
+var js string
+
+//go:embed frontend/public/build/bundle.css
+var css string
+
 func main() {
-	js := mewn.String("./frontend/public/build/bundle.js")
-	css := mewn.String("./frontend/public/build/bundle.css")

 	app := wails.CreateApp(&wails.AppConfig{
 		Width:  1024,
--- a/cmd/templates/vanilla/main.go.template
+++ b/cmd/templates/vanilla/main.go.template
@@ -1,14 +1,17 @@
 package main

 import (
-  "github.com/leaanthony/mewn"
+  _ "embed"
  "github.com/wailsapp/wails"
 )

-func main() {
+//go:embed frontend/build/main.js
+var js string

-	js := mewn.String("./frontend/build/main.js")
-	css := mewn.String("./frontend/build/main.css")
+//go:embed frontend/build/main.css
+var css string
+
+func main() {

  app := wails.CreateApp(&wails.AppConfig{
    Width:  1024,
--- a/cmd/templates/vue3-full/main.go.template
+++ b/cmd/templates/vue3-full/main.go.template
@@ -1,7 +1,7 @@
 package main

 import (
-  "github.com/leaanthony/mewn"
+  _ "embed"
  "github.com/wailsapp/wails"
 )

@@ -9,10 +9,13 @@ func basic() string {
  return "Hello World!"
 }

-func main() {
+//go:embed frontend/dist/app.js
+var js string

-  js := mewn.String("./frontend/dist/app.js")
-  css := mewn.String("./frontend/dist/app.css")
+//go:embed frontend/dist/app.css
+var css string
+
+func main() {

  app := wails.CreateApp(&wails.AppConfig{
    Width:  1024,
--- a/cmd/templates/vuebasic/main.go.template
+++ b/cmd/templates/vuebasic/main.go.template
@@ -1,7 +1,7 @@
 package main

 import (
-  "github.com/leaanthony/mewn"
+  _ "embed"
  "github.com/wailsapp/wails"
 )

@@ -9,10 +9,13 @@ func basic() string {
  return "Hello World!"
 }

-func main() {
+//go:embed frontend/dist/app.js
+var js string

-  js := mewn.String("./frontend/dist/app.js")
-  css := mewn.String("./frontend/dist/app.css")
+//go:embed frontend/dist/app.css
+var css string
+
+func main() {

  app := wails.CreateApp(&wails.AppConfig{
    Width:  1024,
--- a/cmd/templates/vuetify-basic/main.go.template
+++ b/cmd/templates/vuetify-basic/main.go.template
@@ -1,7 +1,7 @@
 package main

 import (
-  "github.com/leaanthony/mewn"
+  _ "embed"
  "github.com/wailsapp/wails"
 )

@@ -9,10 +9,13 @@ func basic() string {
  return "Hello World!"
 }

-func main() {
+//go:embed frontend/dist/app.js
+var js string

-  js := mewn.String("./frontend/dist/app.js")
-  css := mewn.String("./frontend/dist/app.css")
+//go:embed frontend/dist/app.css
+var css string
+
+func main() {

  app := wails.CreateApp(&wails.AppConfig{
    Width:  1024,
--- a/cmd/templates/vuetify2-basic/main.go.template
+++ b/cmd/templates/vuetify2-basic/main.go.template
@@ -1,7 +1,7 @@
 package main

 import (
-  "github.com/leaanthony/mewn"
+  _ "embed"
  "github.com/wailsapp/wails"
 )

@@ -9,10 +9,13 @@ func basic() string {
  return "Hello World!"
 }

-func main() {
+//go:embed frontend/dist/app.js
+var js string

-  js := mewn.String("./frontend/dist/app.js")
-  css := mewn.String("./frontend/dist/app.css")
+//go:embed frontend/dist/app.css
+var css string
+
+func main() {

  app := wails.CreateApp(&wails.AppConfig{
    Width:  1024,
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,4 +1,4 @@
 package cmd

 // Version - Wails version
-const Version = "v1.13.0"
+const Version = "v1.16.0"
--- a/cmd/wails/0_setup.go
+++ b/cmd/wails/0_setup.go
@@ -39,12 +39,6 @@ Create your first project by running 'wails init'.`
 			return err
 		}

-		// Check Mewn
-		err = cmd.CheckMewn(false)
-		if err != nil {
-			return err
-		}
-
 		// Check for errors
 		// CheckDependencies() returns !errors
 		// so to get the right message in this
--- a/cmd/wails/4_build.go
+++ b/cmd/wails/4_build.go
@@ -2,6 +2,7 @@ package main

 import (
 	"fmt"
+	"log"
 	"os"
 	"runtime"
 	"strings"
@@ -52,7 +53,10 @@ func init() {

 	var b strings.Builder
 	for _, plat := range getSupportedPlatforms() {
-		fmt.Fprintf(&b, " - %s\n", plat)
+		_, err := fmt.Fprintf(&b, " - %s\n", plat)
+		if err != nil {
+			log.Fatal(err)
+		}
 	}
 	initCmd.StringFlag("x",
 		fmt.Sprintf("Cross-compile application to specified platform via xgo\n%s", b.String()),
@@ -80,7 +84,7 @@ func init() {
 		fs := cmd.NewFSHelper()
 		err := projectOptions.LoadConfig(fs.Cwd())
 		if err != nil {
-			return fmt.Errorf("Unable to find 'project.json'. Please check you are in a Wails project directory")
+			return fmt.Errorf("unable to find 'project.json'. Please check you are in a Wails project directory")
 		}

 		// Set firebug flag
@@ -143,12 +147,6 @@ func init() {
 			if err != nil {
 				return err
 			}
-
-			// Ensure that runtime init.js is the production version
-			err = cmd.InstallProdRuntime(projectDir, projectOptions)
-			if err != nil {
-				return err
-			}
 		}

 		// Move to project directory
--- a/cmd/wails/6_serve.go
+++ b/cmd/wails/6_serve.go
@@ -27,19 +27,13 @@ func init() {
 		logger.PrintSmallBanner(message)
 		fmt.Println()

-		// Check Mewn is installed
-		err := cmd.CheckMewn(verbose)
-		if err != nil {
-			return err
-		}
-
 		// Project options
 		projectOptions := &cmd.ProjectOptions{}

 		// Check we are in project directory
 		// Check project.json loads correctly
 		fs := cmd.NewFSHelper()
-		err = projectOptions.LoadConfig(fs.Cwd())
+		err := projectOptions.LoadConfig(fs.Cwd())
 		if err != nil {
 			return err
 		}