Skip to content

Commit

Permalink
Merge pull request #545 from KhronosGroup/fix/wasmDependency
Browse files Browse the repository at this point in the history
Fix/wasm dependency
  • Loading branch information
UX3D-labode authored Jun 4, 2024
2 parents ba079f5 + 297fc81 commit d031694
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"url": "git+https://github.com/KhronosGroup/glTF-Sample-Viewer.git"
},
"scripts": {
"build": "echo 'Please run `npm run build` from the `app_web` or `app_headless` directory.'",
"build": "rollup -c",
"dev": "echo 'Please run `npm run dev` from the `app_web` or `app_headless` directory.'",
"prepublishOnly": "npm run build && npm run build_docs",
"build_docs": "./node_modules/.bin/jsdoc2md source/gltf-sample-viewer.js source/GltfView/gltf_view.js source/GltfState/gltf_state.js source/ResourceLoader/resource_loader.js source/gltf/user_camera.js > API.md",
Expand All @@ -31,15 +31,15 @@
"jpeg-js": "^0.4.3"
},
"devDependencies": {
"rollup": "^2.79.1",
"rollup-plugin-copy": "^3.4.0",
"rollup-plugin-glslify": "^1.3.1",
"@rollup/plugin-wasm": "^6.1.3",
"@rollup/plugin-commonjs": "^22.0.2",
"@rollup/plugin-node-resolve": "^14.1.0",
"@rollup/plugin-wasm": "^6.1.3",
"concurrently": "^7.4.0",
"eslint": "^8.24.0",
"jsdoc-to-markdown": "^7.1.1",
"rollup": "^2.79.1",
"rollup-plugin-copy": "^3.4.0",
"rollup-plugin-glslify": "^1.3.1",
"serve": "^14.0.1"
},
"bugs": {
Expand Down
4 changes: 2 additions & 2 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ export default {
}
],
plugins: [
wasm(),
wasm( {fileName: "libs/[name][extname]", publicPath: "./"} ),
glslify(),
resolve({
browser: false,
browser: true,
preferBuiltins: false,
dedupe: ['gl-matrix', 'jpeg-js', 'fast-png']
}),
Expand Down

0 comments on commit d031694

Please sign in to comment.