Skip to content

Commit 7170f3f

Browse files
committed
Merge branch 'feat-rewrite-wasm' into next
# Conflicts: # yarn.lock
2 parents cd6eec1 + 01598a7 commit 7170f3f

2 files changed

Lines changed: 92 additions & 88 deletions

File tree

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
66
"license": "MIT",
77
"dependencies": {
8-
"@webassemblyjs/ast": "1.2.2",
9-
"@webassemblyjs/wasm-edit": "1.2.2",
10-
"@webassemblyjs/wasm-parser": "1.2.2",
8+
"@webassemblyjs/ast": "1.2.6",
9+
"@webassemblyjs/wasm-edit": "1.2.6",
10+
"@webassemblyjs/wasm-parser": "1.2.6",
1111
"acorn": "^5.0.0",
1212
"acorn-dynamic-import": "^3.0.0",
1313
"ajv": "^6.1.0",

yarn.lock

Lines changed: 89 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,6 @@
22
# yarn lockfile v1
33

44

5-
"@babel/code-frame@^7.0.0-beta.36":
6-
version "7.0.0-beta.40"
7-
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.40.tgz#37e2b0cf7c56026b4b21d3927cadf81adec32ac6"
8-
dependencies:
9-
"@babel/highlight" "7.0.0-beta.40"
10-
11-
"@babel/highlight@7.0.0-beta.40":
12-
version "7.0.0-beta.40"
13-
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.40.tgz#b43d67d76bf46e1d10d227f68cddcd263786b255"
14-
dependencies:
15-
chalk "^2.0.0"
16-
esutils "^2.0.2"
17-
js-tokens "^3.0.0"
18-
195
"@types/node@^9.6.4":
206
version "9.6.6"
217
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.6.tgz#439b91f9caf3983cad2eef1e11f6bedcbf9431d2"
@@ -24,83 +10,98 @@
2410
version "1.0.2"
2511
resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.2.tgz#e13182e1b69871a422d7863e11a4a6f5b814a4bd"
2612

27-
"@webassemblyjs/ast@1.2.2":
28-
version "1.2.2"
29-
resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.2.2.tgz#7c82efc467f5d0305a2ecba246e4129043d62bb0"
13+
"@webassemblyjs/ast@1.2.6":
14+
version "1.2.6"
15+
resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.2.6.tgz#e777dceeaa81aa5035cec69a1e83838152f01010"
3016
dependencies:
31-
"@webassemblyjs/wast-parser" "1.2.2"
32-
webassembly-floating-point-hex-parser "0.1.2"
33-
webassemblyjs "1.2.2"
17+
"@webassemblyjs/wast-parser" "1.2.6"
18+
webassemblyjs "1.2.6"
3419

35-
"@webassemblyjs/helper-buffer@1.2.2":
36-
version "1.2.2"
37-
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.2.2.tgz#916eb3da6cdf8d04e946281021e947f4881402d4"
20+
"@webassemblyjs/floating-point-hex-parser@1.2.6":
21+
version "1.2.6"
22+
resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.2.6.tgz#b20f8be26b680c1c87cc9cbc7b7104bedd8b2a2d"
3823

39-
"@webassemblyjs/helper-leb128@1.2.2":
40-
version "1.2.2"
41-
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-leb128/-/helper-leb128-1.2.2.tgz#ebeea2c40c8d0cf3b116feb2e4d1213f86db8017"
24+
"@webassemblyjs/helper-buffer@1.2.6":
25+
version "1.2.6"
26+
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.2.6.tgz#7d24f29c0860499da038e94a623f32031f346c24"
27+
28+
"@webassemblyjs/helper-code-frame@1.2.6":
29+
version "1.2.6"
30+
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.2.6.tgz#3472472a55e4b33ce4f1893fc6077c49f31198f5"
4231
dependencies:
43-
leb "^0.3.0"
32+
"@webassemblyjs/wast-printer" "1.2.6"
4433

45-
"@webassemblyjs/helper-wasm-bytecode@1.2.2":
46-
version "1.2.2"
47-
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.2.2.tgz#e5f605d16e00d8c4df093899174d12a01535c1fc"
34+
"@webassemblyjs/helper-fsm@1.2.6":
35+
version "1.2.6"
36+
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.2.6.tgz#81bed2548c5aa77ce6787f330a40716b0119ff53"
4837

49-
"@webassemblyjs/helper-wasm-section@1.2.2":
50-
version "1.2.2"
51-
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.2.2.tgz#5a56f867a6d2c222f13a9e4a5c51abbb6764d88f"
38+
"@webassemblyjs/helper-wasm-bytecode@1.2.6":
39+
version "1.2.6"
40+
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.2.6.tgz#9d093f1b175040f9bba18f020511c9d096119f0f"
41+
42+
"@webassemblyjs/helper-wasm-section@1.2.6":
43+
version "1.2.6"
44+
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.2.6.tgz#7ee1d1e029e9e9de9cbdcdb4ef81ddff83f8b47a"
5245
dependencies:
53-
"@webassemblyjs/ast" "1.2.2"
54-
"@webassemblyjs/helper-buffer" "1.2.2"
55-
"@webassemblyjs/helper-wasm-bytecode" "1.2.2"
56-
"@webassemblyjs/wasm-gen" "1.2.2"
46+
"@webassemblyjs/ast" "1.2.6"
47+
"@webassemblyjs/helper-buffer" "1.2.6"
48+
"@webassemblyjs/helper-wasm-bytecode" "1.2.6"
49+
"@webassemblyjs/wasm-gen" "1.2.6"
5750

58-
"@webassemblyjs/wasm-edit@1.2.2":
59-
version "1.2.2"
60-
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.2.2.tgz#229ffe0db16ec9c15a521b49de1d2844e773db4c"
61-
dependencies:
62-
"@webassemblyjs/ast" "1.2.2"
63-
"@webassemblyjs/helper-buffer" "1.2.2"
64-
"@webassemblyjs/helper-wasm-bytecode" "1.2.2"
65-
"@webassemblyjs/helper-wasm-section" "1.2.2"
66-
"@webassemblyjs/wasm-gen" "1.2.2"
67-
"@webassemblyjs/wasm-parser" "1.2.2"
68-
"@webassemblyjs/wast-printer" "1.2.2"
51+
"@webassemblyjs/leb128@1.2.6":
52+
version "1.2.6"
53+
resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.2.6.tgz#e08defc61ff72a855decd67abc8d3cdc748462c3"
54+
dependencies:
55+
leb "^0.3.0"
56+
57+
"@webassemblyjs/wasm-edit@1.2.6":
58+
version "1.2.6"
59+
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.2.6.tgz#c8c4555b4fbcdcf7521bc7e48df31a4c7ce68b72"
60+
dependencies:
61+
"@webassemblyjs/ast" "1.2.6"
62+
"@webassemblyjs/helper-buffer" "1.2.6"
63+
"@webassemblyjs/helper-wasm-bytecode" "1.2.6"
64+
"@webassemblyjs/helper-wasm-section" "1.2.6"
65+
"@webassemblyjs/wasm-gen" "1.2.6"
66+
"@webassemblyjs/wasm-parser" "1.2.6"
67+
"@webassemblyjs/wast-printer" "1.2.6"
6968
debug "^3.1.0"
7069

71-
"@webassemblyjs/wasm-gen@1.2.2":
72-
version "1.2.2"
73-
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.2.2.tgz#c468901f85a29f15d9f7b60dc72bf55cfe3062d3"
70+
"@webassemblyjs/wasm-gen@1.2.6":
71+
version "1.2.6"
72+
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.2.6.tgz#39608473a2b0c510a35d4ae6938e7920a0b2cfab"
7473
dependencies:
75-
"@webassemblyjs/ast" "1.2.2"
76-
"@webassemblyjs/helper-leb128" "1.2.2"
77-
"@webassemblyjs/helper-wasm-bytecode" "1.2.2"
74+
"@webassemblyjs/ast" "1.2.6"
75+
"@webassemblyjs/helper-wasm-bytecode" "1.2.6"
76+
"@webassemblyjs/leb128" "1.2.6"
7877

79-
"@webassemblyjs/wasm-parser@1.2.2":
80-
version "1.2.2"
81-
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.2.2.tgz#9a81f3cc4f9710d5ee3e6ff0ebcca73346a58161"
78+
"@webassemblyjs/wasm-parser@1.2.6":
79+
version "1.2.6"
80+
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.2.6.tgz#eecf45094055bceb0edb093624412bc4cb17b3df"
8281
dependencies:
83-
"@webassemblyjs/ast" "1.2.2"
84-
"@webassemblyjs/helper-leb128" "1.2.2"
85-
"@webassemblyjs/helper-wasm-bytecode" "1.2.2"
86-
"@webassemblyjs/wasm-parser" "1.2.2"
87-
webassemblyjs "1.2.2"
82+
"@webassemblyjs/ast" "1.2.6"
83+
"@webassemblyjs/helper-wasm-bytecode" "1.2.6"
84+
"@webassemblyjs/leb128" "1.2.6"
85+
"@webassemblyjs/wasm-parser" "1.2.6"
86+
webassemblyjs "1.2.6"
8887

89-
"@webassemblyjs/wast-parser@1.2.2":
90-
version "1.2.2"
91-
resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.2.2.tgz#a52ba6faddeb58d42fad67d8bf4adbcd5683900c"
88+
"@webassemblyjs/wast-parser@1.2.6":
89+
version "1.2.6"
90+
resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.2.6.tgz#dffd2d07c93c5d9d760f260f6abdf26bc17b0030"
9291
dependencies:
93-
"@babel/code-frame" "^7.0.0-beta.36"
94-
"@webassemblyjs/ast" "1.2.2"
92+
"@webassemblyjs/ast" "1.2.6"
93+
"@webassemblyjs/floating-point-hex-parser" "1.2.6"
94+
"@webassemblyjs/helper-code-frame" "1.2.6"
95+
"@webassemblyjs/helper-fsm" "1.2.6"
9596
long "^3.2.0"
96-
webassembly-floating-point-hex-parser "0.1.2"
97-
webassemblyjs "1.2.2"
97+
webassemblyjs "1.2.6"
9898

99-
"@webassemblyjs/wast-printer@1.2.2":
100-
version "1.2.2"
101-
resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.2.2.tgz#0db9c25719348a04e3b02c07867433e5ef3c71b2"
99+
"@webassemblyjs/wast-printer@1.2.6":
100+
version "1.2.6"
101+
resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.2.6.tgz#93cf30b1656ddb685273c8eb55007b181521b74e"
102102
dependencies:
103-
"@webassemblyjs/wast-parser" "1.2.2"
103+
"@webassemblyjs/ast" "1.2.6"
104+
"@webassemblyjs/wast-parser" "1.2.6"
104105
long "^3.2.0"
105106

106107
abbrev@1:
@@ -636,14 +637,22 @@ chalk@^1.1.1, chalk@^1.1.3:
636637
strip-ansi "^3.0.0"
637638
supports-color "^2.0.0"
638639

639-
chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.2:
640+
chalk@^2.0.0, chalk@^2.3.2:
640641
version "2.4.1"
641642
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
642643
dependencies:
643644
ansi-styles "^3.2.1"
644645
escape-string-regexp "^1.0.5"
645646
supports-color "^5.3.0"
646647

648+
chalk@^2.1.0:
649+
version "2.3.0"
650+
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
651+
dependencies:
652+
ansi-styles "^3.1.0"
653+
escape-string-regexp "^1.0.5"
654+
supports-color "^4.0.0"
655+
647656
character-parser@1.2.1:
648657
version "1.2.1"
649658
resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-1.2.1.tgz#c0dde4ab182713b919b970959a123ecc1a30fcd6"
@@ -4740,19 +4749,14 @@ watchpack@^1.5.0:
47404749
graceful-fs "^4.1.2"
47414750
neo-async "^2.5.0"
47424751

4743-
webassembly-floating-point-hex-parser@0.1.2:
4744-
version "0.1.2"
4745-
resolved "https://registry.yarnpkg.com/webassembly-floating-point-hex-parser/-/webassembly-floating-point-hex-parser-0.1.2.tgz#85bb01f54e68690c2645ea0cfad26c1110fdf988"
4746-
4747-
webassemblyjs@1.2.2:
4748-
version "1.2.2"
4749-
resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.2.2.tgz#4e6865bce8256808fad113b5f347578821742fcb"
4752+
webassemblyjs@1.2.6:
4753+
version "1.2.6"
4754+
resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.2.6.tgz#0013de6c5f3f0c04b1ce30ceade66e9a00f3130e"
47504755
dependencies:
4751-
"@webassemblyjs/ast" "1.2.2"
4752-
"@webassemblyjs/wasm-parser" "1.2.2"
4753-
"@webassemblyjs/wast-parser" "1.2.2"
4756+
"@webassemblyjs/ast" "1.2.6"
4757+
"@webassemblyjs/wasm-parser" "1.2.6"
4758+
"@webassemblyjs/wast-parser" "1.2.6"
47544759
long "^3.2.0"
4755-
webassembly-floating-point-hex-parser "0.1.2"
47564760

47574761
webpack-dev-middleware@^1.9.0:
47584762
version "1.12.2"

0 commit comments

Comments
 (0)