Compare commits

..

2 Commits

Author SHA1 Message Date
Lea Anthony
be83d16b2b lint fixes 2020-06-19 08:50:23 +10:00
Lea Anthony
6214b41c43 Initial implementation of vanilla template 2020-06-19 08:50:23 +10:00
9 changed files with 53 additions and 64 deletions

View File

@@ -28,4 +28,3 @@ Wails is what it is because of the time and effort given by these great people.
* [Konez2k](https://github.com/konez2k)
* [msms](https://github.com/sayuthisobri)
* [dedo1911](https://github.com/dedo1911)
* [Florian Didron](https://github.com/fdidron)

View File

@@ -561,11 +561,6 @@ func ldFlags(po *ProjectOptions, buildMode string) string {
ldflags += "-X github.com/wailsapp/wails.BuildMode=" + buildMode
// Add additional ldflags passed in via the `ldflags` cli flag
if len(po.LdFlags) > 0 {
ldflags += " " + po.LdFlags
}
// If we wish to generate typescript
if po.typescriptDefsFilename != "" {
cwd, err := os.Getwd()

View File

@@ -161,7 +161,6 @@ type ProjectOptions struct {
CrossCompile bool
Platform string
Architecture string
LdFlags string
}
// Defaults sets the default project template

File diff suppressed because one or more lines are too long

View File

@@ -5,24 +5,25 @@ const runtime = require('@wailsapp/runtime');
// running our JS
runtime.Init(() => {
// Ensure the default app div is 100% wide/high
var app = document.getElementById('app');
app.style.width = '100%';
app.style.height = '100%';
// Ensure the default app div is 100% wide/high
var app = document.getElementById("app");
app.style.width = "100%";
app.style.height = "100%";
// Inject html
app.innerHTML = `
<div class='logo'></div>
<div class='container'>
<button id='button'>Click Me!</button>
<div id='result'/>
</div>
`;
// Inject html
app.innerHTML = `
<div class="logo"></div>
<div class="container">
<button id="button">Click Me!</button>
<div id="result"/>
</div>
`;
// Connect button to Go method
document.getElementById("button").onclick = () => {
window.backend.basic().then((result) => {
document.getElementById("result").innerText = result;
})
}
// Connect button to Go method
document.getElementById('button').onclick = () => {
window.backend.basic().then((result) => {
document.getElementById('result').innerText = result;
})
}
});

View File

@@ -1,7 +1,7 @@
const path = require('path');
const CopyWebpackPlugin = require('copy-webpack-plugin');
let imageSizeLimit = 9007199254740991; // Number.MAX_SAFE_INTEGER
let imageSizeLimit = 9999999999999999;
let sourceDir = path.resolve(__dirname, 'src');
let buildDir = path.resolve(__dirname, 'build');
@@ -40,17 +40,19 @@ module.exports = {
]
},
plugins: [
new CopyWebpackPlugin({
new CopyWebpackPlugin({
patterns: [
{
from: path.resolve(sourceDir, 'main.css'),
to: path.resolve(buildDir, 'main.css')
{
from: path.resolve(sourceDir, 'main.css'),
to: path.resolve(buildDir, 'main.css')
},
{
from: path.resolve(sourceDir, 'index.html'),
to: path.resolve(buildDir, 'index.html')
{
from: path.resolve(sourceDir, 'index.html'),
to: path.resolve(buildDir, 'index.html')
},
]
})
]
};
]
}

View File

@@ -1,4 +1,4 @@
package cmd
// Version - Wails version
const Version = "v1.7.0-pre1"
const Version = "v1.6.0-pre6"

View File

@@ -29,7 +29,6 @@ func init() {
var typescriptFilename = ""
var verbose = false
var platform = ""
var ldflags = ""
buildSpinner := spinner.NewSpinner()
buildSpinner.SetSpinSpeed(50)
@@ -41,8 +40,7 @@ func init() {
BoolFlag("f", "Force rebuild of application components", &forceRebuild).
BoolFlag("d", "Build in Debug mode", &debugMode).
BoolFlag("verbose", "Verbose output", &verbose).
StringFlag("t", "Generate Typescript definitions to given file (at runtime)", &typescriptFilename).
StringFlag("ldflags", "Extra options for -ldflags", &ldflags)
StringFlag("t", "Generate Typescript definitions to given file (at runtime)", &typescriptFilename)
var b strings.Builder
for _, plat := range getSupportedPlatforms() {
@@ -86,7 +84,7 @@ func init() {
}
}
if !supported {
return fmt.Errorf("unsupported platform '%s' specified.\nPlease run `wails build -h` to see the supported platform/architecture options", platform)
return fmt.Errorf("Unsupported platform '%s' specified.\nPlease run `wails build -h` to see the supported platform/architecture options.", platform)
}
projectOptions.CrossCompile = true
@@ -95,9 +93,6 @@ func init() {
projectOptions.Architecture = plat[1]
}
// Add ldflags
projectOptions.LdFlags = ldflags
// Validate config
// Check if we have a frontend
err = cmd.ValidateFrontendConfig(projectOptions)

View File

@@ -447,7 +447,6 @@ struct webview_priv
}
gtk_file_filter_set_name(file_filter, filter);
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dlg), file_filter);
g_strfreev(filters);
}
gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dlg), FALSE);
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dlg), FALSE);