GeezerVison is showing github.com — Merge pull request #7379 from xtuc/refactor-use-wast-in-tests · webpack/webpack@4cd0cf5
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: package.json +1Lines changed: 1 addition & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
72 | 72 | "url-loader": "^0.6.2", |
73 | 73 | "val-loader": "^1.0.2", |
74 | 74 | "vm-browserify": "~0.0.0", |
| 75 | + "wast-loader": "^1.5.5", |
75 | 76 | "webpack-dev-middleware": "^1.9.0", |
76 | 77 | "worker-loader": "^1.1.1", |
77 | 78 | "xxhashjs": "^0.2.1" |
|
Collapse file
Copy file name to clipboardExpand all lines: test/TestCases.template.js +5Lines changed: 5 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -143,6 +143,11 @@ const describeCases = config => { |
143 | 143 | { |
144 | 144 | test: /\.pug/, |
145 | 145 | loader: "pug-loader" |
| 146 | + }, |
| 147 | + { |
| 148 | + test: /\.wat$/i, |
| 149 | + loader: "wast-loader", |
| 150 | + type: "webassembly/experimental" |
146 | 151 | } |
147 | 152 | ] |
148 | 153 | }, |
|
Collapse file
Copy file name to clipboardExpand all lines: test/cases/wasm/import-wasm-wasm/index.js +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
|
1 | 1 | it("should allow to run a WebAssembly module with imports", function() { |
2 | | - return import("./wasm.wasm").then(function(wasm) { |
| 2 | + return import("./wasm.wat").then(function(wasm) { |
3 | 3 | const result = wasm.addNumber(20); |
4 | 4 | expect(result).toEqual(42); |
5 | 5 | }); |
|
Collapse file
Copy file name to clipboard Collapse file
Copy file name to clipboard +9Lines changed: 9 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
| 1 | +(module |
| 2 | + (type $t0 (func (result i32))) |
| 3 | + (type $t1 (func (param i32) (result i32))) |
| 4 | + (import "./wasm2.wat" "getNumber" (func $./wasm2.wasm.getNumber (type $t0))) |
| 5 | + (func $addNumber (export "addNumber") (type $t1) (param $p0 i32) (result i32) |
| 6 | + (i32.add |
| 7 | + (get_local $p0) |
| 8 | + (call $./wasm2.wasm.getNumber)))) |
| 9 | + |
Collapse file
Copy file name to clipboard Collapse file
Copy file name to clipboard +5Lines changed: 5 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
| 1 | +(module |
| 2 | + (type $t0 (func (result i32))) |
| 3 | + (func $getNumber (export "getNumber") (type $t0) (result i32) |
| 4 | + (i32.const 22))) |
| 5 | + |
Collapse file
Copy file name to clipboardExpand all lines: test/cases/wasm/imports-circular/module.js +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
|
1 | | -import { addNumber } from "./wasm.wasm"; |
| 1 | +import { addNumber } from "./wasm.wat"; |
2 | 2 |
|
3 | 3 | export var result = addNumber(22); |
4 | 4 |
|
|
Collapse file
Copy file name to clipboard Collapse file
Copy file name to clipboard +9Lines changed: 9 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
| 1 | +(module |
| 2 | + (type $t0 (func (result i32))) |
| 3 | + (type $t1 (func (param i32) (result i32))) |
| 4 | + (import "./module" "getNumber" (func $./module.getNumber (type $t0))) |
| 5 | + (func $addNumber (export "addNumber") (type $t1) (param $p0 i32) (result i32) |
| 6 | + (i32.add |
| 7 | + (get_local $p0) |
| 8 | + (call $./module.getNumber)))) |
| 9 | + |