diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..2bf885bec --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,71 @@ +name: Release + +on: + push: + branches: [ releasetest/* ] + pull_request: + branches: [ releasetest/* ] + workflow_dispatch: + +jobs: + test: + name: Run Go Tests + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ ubuntu-latest, windows-latest, macos-latest ] + go-version: [ 1.18, 1.19 ] + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Install linux dependencies + if: matrix.os == 'ubuntu-latest' + run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev build-essential pkg-config + + - name: Set up Go 1.18 + uses: actions/setup-go@v3 + with: + go-version: ${{ matrix.go-version }} + + - name: Run tests + run: go test -v ./... + + test_templates: + name: Test Templates + needs: test + if: github.repository == 'wailsapp/wails' + runs-on: ${{ matrix.os }} + strategy: + fail-fast: true + matrix: + os: [ ubuntu-latest, windows-latest, macos-latest ] + template: [ svelte, svelte-ts, vue, vue-ts, react, react-ts, preact, preact-ts, lit, lit-ts, vanilla, vanilla-ts, plain ] + go-version: [ 1.18, 1.19 ] + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Setup Go + uses: actions/setup-go@v3 + with: + go-version: ${{ matrix.go-version }} + + - name: Build Wails CLI + run: | + cd ./v2/cmd/wails + go install + wails -help + + - name: Install linux dependencies + if: matrix.os == 'ubuntu-latest' + run: sudo apt-get update -y && sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev build-essential pkg-config + + - name: Generate template '${{ matrix.template }}' + run: | + mkdir -p ./test-${{ matrix.template }} + cd ./test-${{ matrix.template }} + wails init -n ${{ matrix.template }} -t ${{ matrix.template }} + cd ${{ matrix.template }} + wails build -v 2 diff --git a/v2/cmd/wails/internal/commands/dev/watcher_test.go b/v2/cmd/wails/internal/commands/dev/watcher_test.go index 486acf083..ad228b66c 100644 --- a/v2/cmd/wails/internal/commands/dev/watcher_test.go +++ b/v2/cmd/wails/internal/commands/dev/watcher_test.go @@ -1,6 +1,7 @@ package dev import ( + "github.com/samber/lo" "os" "path/filepath" "reflect" @@ -60,6 +61,10 @@ func Test_processDirectories(t *testing.T) { } func Test_GetIgnoreDirs(t *testing.T) { + + // Remove testdir if it exists + _ = os.RemoveAll("testdir") + tests := []struct { name string files []string @@ -73,7 +78,7 @@ func Test_GetIgnoreDirs(t *testing.T) { }, { name: "Should ignore dotFiles", - files: []string{".*"}, + files: []string{".test1", ".wailsignore"}, want: []string{"testdir/build/*", ".*", "node_modules"}, }, } @@ -91,6 +96,11 @@ func Test_GetIgnoreDirs(t *testing.T) { } got := getIgnoreDirs("testdir") + + got = lo.Map(got, func(s string, _ int) string { + return filepath.ToSlash(s) + }) + if (err != nil) != tt.shouldErr { t.Errorf("initialiseWatcher() error = %v, shouldErr %v", err, tt.shouldErr) return diff --git a/v2/cmd/wails/internal/commands/generate/template/base/main.tmpl.go b/v2/cmd/wails/internal/commands/generate/template/base/main.go.tmpl similarity index 100% rename from v2/cmd/wails/internal/commands/generate/template/base/main.tmpl.go rename to v2/cmd/wails/internal/commands/generate/template/base/main.go.tmpl diff --git a/v2/cmd/wails/internal/commands/initialise/initialise.go b/v2/cmd/wails/internal/commands/initialise/initialise.go index aa2d92631..b36102fcc 100644 --- a/v2/cmd/wails/internal/commands/initialise/initialise.go +++ b/v2/cmd/wails/internal/commands/initialise/initialise.go @@ -14,7 +14,7 @@ import ( "github.com/wailsapp/wails/v2/pkg/buildassets" - "github.com/wailsapp/wails/v2/cmd/wails/internal/commands/initialise/templates" + "github.com/wailsapp/wails/v2/pkg/templates" "github.com/leaanthony/clir" "github.com/pkg/errors" diff --git a/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/index.tmpl.html b/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/index.tmpl.html deleted file mode 100644 index e904c489c..000000000 --- a/v2/cmd/wails/internal/commands/initialise/templates/generate/plain/frontend/src/index.tmpl.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - {{.ProjectName}} - - - - -
- -
Please enter your name below 👇
-
- - -
-
- - - diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/src/assets/preact.svg b/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/src/assets/preact.svg deleted file mode 100644 index 23433fcf8..000000000 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/preact/frontend/src/assets/preact.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/.vscode/extensions.json b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/.vscode/extensions.json deleted file mode 100644 index bdef82015..000000000 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/.vscode/extensions.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "recommendations": ["svelte.svelte-vscode"] -} diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/README.md b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/README.md deleted file mode 100644 index 4ef762ffe..000000000 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte-ts/frontend/README.md +++ /dev/null @@ -1,48 +0,0 @@ -# Svelte + TS + Vite - -This template should help get you started developing with Svelte and TypeScript in Vite. - -## Recommended IDE Setup - -[VS Code](https://code.visualstudio.com/) + [Svelte](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode). - -## Need an official Svelte framework? - -Check out [SvelteKit](https://github.com/sveltejs/kit#readme), which is also powered by Vite. Deploy anywhere with its serverless-first approach and adapt to various platforms, with out of the box support for TypeScript, SCSS, and Less, and easily-added support for mdsvex, GraphQL, PostCSS, Tailwind CSS, and more. - -## Technical considerations - -**Why use this over SvelteKit?** - -- It brings its own routing solution which might not be preferable for some users. -- It is first and foremost a framework that just happens to use Vite under the hood, not a Vite app. - `vite dev` and `vite build` wouldn't work in a SvelteKit environment, for example. - -This template contains as little as possible to get started with Vite + TypeScript + Svelte, while taking into account the developer experience with regards to HMR and intellisense. It demonstrates capabilities on par with the other `create-vite` templates and is a good starting point for beginners dipping their toes into a Vite + Svelte project. - -Should you later need the extended capabilities and extensibility provided by SvelteKit, the template has been structured similarly to SvelteKit so that it is easy to migrate. - -**Why `global.d.ts` instead of `compilerOptions.types` inside `jsconfig.json` or `tsconfig.json`?** - -Setting `compilerOptions.types` shuts out all other types not explicitly listed in the configuration. Using triple-slash references keeps the default TypeScript setting of accepting type information from the entire workspace, while also adding `svelte` and `vite/client` type information. - -**Why include `.vscode/extensions.json`?** - -Other templates indirectly recommend extensions via the README, but this file allows VS Code to prompt the user to install the recommended extension upon opening the project. - -**Why enable `allowJs` in the TS template?** - -While `allowJs: false` would indeed prevent the use of `.js` files in the project, it does not prevent the use of JavaScript syntax in `.svelte` files. In addition, it would force `checkJs: false`, bringing the worst of both worlds: not being able to guarantee the entire codebase is TypeScript, and also having worse typechecking for the existing JavaScript. In addition, there are valid use cases in which a mixed codebase may be relevant. - -**Why is HMR not preserving my local component state?** - -HMR state preservation comes with a number of gotchas! It has been disabled by default in both `svelte-hmr` and `@sveltejs/vite-plugin-svelte` due to its often surprising behavior. You can read the details [here](https://github.com/rixo/svelte-hmr#svelte-hmr). - -If you have state that's important to retain within a component, consider creating an external store which would not be replaced by HMR. - -```ts -// store.ts -// An extremely simple external store -import { writable } from 'svelte/store' -export default writable(0) -``` diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/.vscode/extensions.json b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/.vscode/extensions.json deleted file mode 100644 index bdef82015..000000000 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/.vscode/extensions.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "recommendations": ["svelte.svelte-vscode"] -} diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/README.md b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/README.md deleted file mode 100644 index 50ea7ed3b..000000000 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/README.md +++ /dev/null @@ -1,48 +0,0 @@ -# Svelte + Vite - -This template should help get you started developing with Svelte in Vite. - -## Recommended IDE Setup - -[VS Code](https://code.visualstudio.com/) + [Svelte](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode). - -## Need an official Svelte framework? - -Check out [SvelteKit](https://github.com/sveltejs/kit#readme), which is also powered by Vite. Deploy anywhere with its serverless-first approach and adapt to various platforms, with out of the box support for TypeScript, SCSS, and Less, and easily-added support for mdsvex, GraphQL, PostCSS, Tailwind CSS, and more. - -## Technical considerations - -**Why use this over SvelteKit?** - -- It brings its own routing solution which might not be preferable for some users. -- It is first and foremost a framework that just happens to use Vite under the hood, not a Vite app. - `vite dev` and `vite build` wouldn't work in a SvelteKit environment, for example. - -This template contains as little as possible to get started with Vite + Svelte, while taking into account the developer experience with regards to HMR and intellisense. It demonstrates capabilities on par with the other `create-vite` templates and is a good starting point for beginners dipping their toes into a Vite + Svelte project. - -Should you later need the extended capabilities and extensibility provided by SvelteKit, the template has been structured similarly to SvelteKit so that it is easy to migrate. - -**Why `global.d.ts` instead of `compilerOptions.types` inside `jsconfig.json` or `tsconfig.json`?** - -Setting `compilerOptions.types` shuts out all other types not explicitly listed in the configuration. Using triple-slash references keeps the default TypeScript setting of accepting type information from the entire workspace, while also adding `svelte` and `vite/client` type information. - -**Why include `.vscode/extensions.json`?** - -Other templates indirectly recommend extensions via the README, but this file allows VS Code to prompt the user to install the recommended extension upon opening the project. - -**Why enable `checkJs` in the JS template?** - -It is likely that most cases of changing variable types in runtime are likely to be accidental, rather than deliberate. This provides advanced typechecking out of the box. Should you like to take advantage of the dynamically-typed nature of JavaScript, it is trivial to change the configuration. - -**Why is HMR not preserving my local component state?** - -HMR state preservation comes with a number of gotchas! It has been disabled by default in both `svelte-hmr` and `@sveltejs/vite-plugin-svelte` due to its often surprising behavior. You can read the details [here](https://github.com/rixo/svelte-hmr#svelte-hmr). - -If you have state that's important to retain within a component, consider creating an external store which would not be replaced by HMR. - -```js -// store.js -// An extremely simple external store -import { writable } from 'svelte/store' -export default writable(0) -``` diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/README.md b/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/README.md deleted file mode 100644 index 30b15e215..000000000 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vue-ts/frontend/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# Vue 3 + TypeScript + Vite - -This template should help get you started developing with Vue 3 and TypeScript in Vite. The template uses Vue 3 ` +import HelloWorld from './components/HelloWorld.vue'