Skip to content
This repository has been archived by the owner on May 9, 2022. It is now read-only.

Fix web assets path #118

Merged
merged 2 commits into from
Jun 29, 2021
Merged

Fix web assets path #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
423ba92
fix web assets path
Robert-Steiner Jun 21, 2021
694cf3a
move wasm bindings into assets folder
Robert-Steiner Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ dependencies = [ "build-dart" ]
script_runner = "@duckscript"
env = { WASM_SUFFIX="wasm_bindings" }
script = ["""
wasm_rel_path = set "bindings/dart/example/${WASM_SUFFIX}"
wasm_rel_path = set "bindings/dart/example/assets/${WASM_SUFFIX}"
set_env WASM_REL_PATH "${wasm_rel_path}"
cm_run_task build-wasm
cm_run_task gen-assets
Expand Down Expand Up @@ -121,9 +121,9 @@ script = ["""
rm -f ios/Classes/XaynAiFFiDart.h
rm -f lib/src/common/ffi/genesis.dart
rm -f lib/src/mobile/ffi/genesis.dart
rm -f example/wasm_bindings/genesis_bg.wasm
rm -f example/wasm_bindings/genesis.js
rm -f example/wasm_bindings/package.json
rm -f example/assets/wasm_bindings/genesis_bg.wasm
rm -f example/assets/wasm_bindings/genesis.js
rm -f example/assets/wasm_bindings/package.json
"""]

[tasks.clean-codegen]
Expand Down
4 changes: 2 additions & 2 deletions bindings/dart/example/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ app.*.map.json
/android/app/release

# wasm bindings
/wasm_bindings/*
!/wasm_bindings/.gitkeep
assets/wasm_bindings/*
!assets/wasm_bindings/.gitkeep
0 bindings/dart/example/wasm_bindings/.gitkeep → ...art/example/assets/wasm_bindings/.gitkeep
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion bindings/dart/example/lib/data_provider/web.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'package:xayn_ai_ffi_dart/package.dart'
import 'package:xayn_ai_ffi_dart_example/data_provider/data_provider.dart'
show joinPaths;

const _baseAssetUrl = 'assets';
const _baseAssetUrl = 'assets/assets';

/// Prepares and returns the data that is needed to init [`XaynAi`].
Future<SetupData> getInputData() async {
Expand Down
2 changes: 1 addition & 1 deletion bindings/dart/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ flutter:
- 'assets/qambert_v0001/'
- 'assets/ltr_v0000/'
- 'assets/call_data/'
- 'wasm_bindings/'
- 'assets/wasm_bindings/'

2 changes: 1 addition & 1 deletion bindings/dart/example/web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<body>
<script type="module">
// Exposes the xayn_ffi js wrapper for wasm to the global scope for Dart interop
import * as xayn_ai_ffi_wasm from './assets/wasm_bindings/genesis.js';
import * as xayn_ai_ffi_wasm from './assets/assets/wasm_bindings/genesis.js';
window.xayn_ai_ffi_wasm = xayn_ai_ffi_wasm;
</script>
</body>
Expand Down