Skip to content

Commit bf6c684

Browse files
committed
Do not use mem file
1 parent 7fcb4ad commit bf6c684

4 files changed

Lines changed: 5 additions & 18 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
echo $Qt5_DIR
6666
cp --verbose -r build/qt/* ${Qt5_DIR}
6767
echo $(which emcc).py
68-
sed -i -r "s/(shared.Settings.MEM_INIT_IN_WASM = )True/\1False/" "$(which emcc).py"
68+
# sed -i -r "s/(shared.Settings.MEM_INIT_IN_WASM = )True/\1False/" "$(which emcc).py"
6969
- name: Install ccache
7070
run: |
7171
sudo apt install -y ccache

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ aqt install-qt linux desktop ${Qt5_VER} wasm_32 --outputdir ${AQT_PREFIX} --arch
143143
cp -r build/qt/* ${Qt5_DIR}
144144

145145
# Patch emcc.py to emit separate .mem files regardless of MEM_INIT_METHOD settings (MEM_INIT_METHOD won't work with wasm)
146-
sed -i -r "s/(shared.Settings.MEM_INIT_IN_WASM = )True/\1False/" "$(which emcc).py"
146+
# sed -i -r "s/(shared.Settings.MEM_INIT_IN_WASM = )True/\1False/" "$(which emcc).py"
147147
```
148148

149149
4. Checkout submodules

web-public/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@
5050
"build:js-only": "npm run clean:d-ts && npm run bundle && npm run d-ts",
5151
"version": "npm run build:js-only",
5252
"bundle": "rollup -c",
53-
"compile": "cd ../web/ && make release && cd - && mv webmscore.lib.js.mem webmscore.lib.mem.wasm && mv webmscore.lib.js.symbols webmscore.lib.symbols",
53+
"compile": "cd ../web/ && make release && cd - && mv webmscore.lib.js.symbols webmscore.lib.symbols",
5454
"postcompile": "perl -pi -e 's/\\\\([0-9a-f]{2})/chr(hex($1))/eg' webmscore.lib.symbols",
5555
"clean": "npm run clean:d-ts && npm run clean:md && cd ../web/ && make clean",
5656
"clean:d-ts": "rm -f src/*.d.ts *.d.ts",
5757
"clean:md": "rm -f *.md",
5858
"d-ts": "tsc --emitDeclarationOnly --declaration --allowJs --lib esnext --target esnext src/index.js",
5959
"prepack": "cp ../README.md . && cp ../CHANGELOG.md .",
60-
"install:webpack": "node -e \"fs.linkSync('webmscore.lib.wasm', 'webmscore.lib.wasm-');fs.linkSync('webmscore.lib.mem.wasm', 'webmscore.lib.mem-')\" || true # workaround for Webpack 4"
60+
"install:webpack": "node -e \"fs.linkSync('webmscore.lib.wasm', 'webmscore.lib.wasm-')\" || true # workaround for Webpack 4"
6161
}
6262
}

web-public/rollup.config.js

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22
import babel from '@rollup/plugin-babel'
33
import { version } from './package.json'
44

5-
const MEM_FILE = 'webmscore.lib.mem.wasm'
6-
75
const WEBPACK_IMPORT = `
86
import libWasm from '!!file-loader?name=[name].wasm!./webmscore.lib.wasm-' // workaround for Webpack 4
97
import libData from '!!file-loader?name=[name].[ext].wasm!./webmscore.lib.data'
10-
import libMem from '!!file-loader?name=${MEM_FILE}!./webmscore.lib.mem-'
118
`
129

1310
const CDN_IMPORT = `
@@ -16,7 +13,6 @@ const URL_PREFIX = CDN_PROVIDER + '/webmscore@%VERSION%/' // https://cdn.jsdeliv
1613
1714
const libWasm = URL_PREFIX + 'webmscore.lib.wasm'
1815
const libData = URL_PREFIX + 'webmscore.lib.data'
19-
const libMem = URL_PREFIX + '${MEM_FILE}'
2016
`
2117

2218
const WEBPACK_LOCATE_FILE = `
@@ -27,19 +23,10 @@ if (path.endsWith('.data')) return new URL(MSCORE_LIB_DATA, MSCORE_BASEURL).href
2723
if (path.endsWith('.wasm.js')) throw new Error('WebAssembly is not supported in your browser')
2824
`
2925

30-
const WEBPACK_WORKER_IMPORT = '+ `var MSCORE_LIB_WASM = "${libWasm}", MSCORE_LIB_DATA = "${libData}", MSCORE_LIB_MEM = "${libMem}", MSCORE_BASEURL = "${document.baseURI}";`'
26+
const WEBPACK_WORKER_IMPORT = '+ `var MSCORE_LIB_WASM = "${libWasm}", MSCORE_LIB_DATA = "${libData}", MSCORE_BASEURL = "${document.baseURI}";`'
3127

3228
const INJECTION_HINT = (n) => `// %INJECTION_HINT_${n}%`
3329

34-
const REPLACE_MEM_FILE = {
35-
transform(code, id) {
36-
if (id.endsWith("webmscore.lib.js")) {
37-
code = code.replace("webmscore.lib.js.mem", MEM_FILE)
38-
}
39-
return { code }
40-
}
41-
}
42-
4330
const REPLACE_IMPORT_META = {
4431
resolveImportMeta(property) {
4532
if (property === 'url') {

0 commit comments

Comments
 (0)