Skip to content

Commit

Permalink
Fix CI and deploy to website
Browse files Browse the repository at this point in the history
  • Loading branch information
hunger committed Aug 24, 2022
1 parent 8aa9159 commit d506c9d
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 22 deletions.
28 changes: 11 additions & 17 deletions .github/workflows/wasm_editor_and_interpreter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,19 @@ jobs:
- name: Install NPM dependencies
run: npm install
working-directory: tools/online_editor
- name: Compile online editor
run: npm run build
- name: Build slint-wasm-interpreter
run: npm run build:wasm_preview-release
working-directory: tools/online_editor
- name: Clean wasm build artefacts from previous preview build
run: rm -rf pkg
working-directory: api/wasm-interpreter
- name: Compile slint-wasm-interpreter
run: npm run build:wasm_preview
- name: Build slint-wasm-lsp
run: npm run build:wasm_lsp-release
working-directory: tools/online_editor
- name: Lint online editor # This needs the slint-wasm-interpreter!
run: |
npm run syntax_check
npm run lint
working-directory: tools/online_editor
- name: Clean wasm build artefacts from previous lsp build
run: rm -rf pkg
working-directory: tools/lsp
- name: Compile slint-wasm-lsp
run: npm run build:wasm_lsp
- name: Compile online editor
run: npm run build
working-directory: tools/online_editor
- name: "Upload wasm Artifacts"
uses: actions/upload-artifact@v2
Expand All @@ -63,8 +62,3 @@ jobs:
api/wasm-interpreter/pkg/
tools/lsp/pkg/
tools/online_editor/dist/
- name: Lint online editor # This needs the slint-wasm-interpreter!
run: |
npm run syntax_check
npm run lint
working-directory: tools/online_editor
6 changes: 4 additions & 2 deletions tools/online_editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
"main": "index.js",
"scripts": {
"build": "rimraf dist pkg && npx vite build",
"build:wasm_preview": "wasm-pack build --release --target web ../../api/wasm-interpreter -- --features console_error_panic_hook",
"build:wasm_lsp": "wasm-pack build --release --target web ../lsp -- --no-default-features",
"build:wasm_preview-release": "wasm-pack build --release --target web ../../api/wasm-interpreter -- --features console_error_panic_hook",
"build:wasm_lsp-release": "wasm-pack build --release --target web ../lsp -- --no-default-features",
"build:wasm_preview": "wasm-pack build --target web ../../api/wasm-interpreter -- --features console_error_panic_hook",
"build:wasm_lsp": "wasm-pack build --target web ../lsp -- --no-default-features",
"lint": "eslint src",
"start": "rimraf dist && npm run build:wasm_preview && npm run start:vite",
"start:vite": "vite --open",
Expand Down
13 changes: 10 additions & 3 deletions tools/online_editor/vite.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Copyright © SixtyFPS GmbH <[email protected]>
// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial

// TODO: Do build and package wasm-lsp separately. Right now vite does not
// support `exclude` in web workers!

import { defineConfig } from "vite";

export default defineConfig(({ command, _mode }) => {
Expand All @@ -14,12 +17,16 @@ export default defineConfig(({ command, _mode }) => {
base: "./",
};

let global_aliases = {
"@lsp/": "../../../lsp/pkg/",
};

if (command === "serve") {
// For development builds, serve the wasm interpreter straight out of the local file system.
base_config.resolve = {
alias: {
"@preview/": "../../../api/wasm-interpreter/pkg/",
"@lsp/": "../../../lsp/pkg/",
...global_aliases,
},
};
} else {
Expand All @@ -28,13 +35,13 @@ export default defineConfig(({ command, _mode }) => {
// relative path to the interpreter is as below.
base_config.build = {};
base_config.build.rollupOptions = {
external: [new RegExp("/wasm-[a-z]+/slint")],
external: ["../../../../wasm-interpreter/slint_wasm_interpreter.js"],
input: ["index.html", "preview.html"],
};
base_config.resolve = {
alias: {
"@preview/": "../../../../wasm-interpreter/",
"@lsp/": "../../../../wasm-lsp/",
...global_aliases,
},
};
}
Expand Down

0 comments on commit d506c9d

Please sign in to comment.