Skip to content

Update WASMbindgenAsset.js #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update WASMbindgenAsset.js #35

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dda22ef
Update WASMbindgenAsset.js
felixrabe Jul 12, 2020
0bd34c6
Update WASMbindgenAsset.js
felixrabe Jul 13, 2020
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
12 changes: 6 additions & 6 deletions WASMbindgenAsset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class WASMbindgenAsset extends Asset {
return super.process()
}

isTragetRust() {
isTargetRust() {
return path.basename(this.name) === 'Cargo.toml' || path.extname(this.name) === '.rs'
}

Expand All @@ -49,7 +49,7 @@ class WASMbindgenAsset extends Asset {
}

async parse(code) {
if (!this.isTragetRust()) {
if (!this.isTargetRust()) {
if (this.isNormalTOML())
return toml.parse(code)
else
Expand Down Expand Up @@ -155,7 +155,7 @@ class WASMbindgenAsset extends Asset {

const export_names = []
js_content = js_content.replace(/export\ function\ \w+/g, x => {
const name = x.slice(15)
const name = x.slice(16)
export_names.push(name)
return '__exports.' + name + ' = function'
})
Expand All @@ -169,7 +169,7 @@ class WASMbindgenAsset extends Asset {

const exported_classes = []
js_content = js_content.replace(/export\ class\ \w+/g, x => {
const name = x.slice(12)
const name = x.slice(13)
Copy link
Member

@xtuc xtuc Jul 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@felixrabe why do you need to change here?

exported_classes.push(name)
export_names.push(name)
return `class ${name}`
Expand Down Expand Up @@ -236,7 +236,7 @@ class WASMbindgenAsset extends Asset {
}

async collectDependencies() {
if (!this.isTragetRust())
if (!this.isTargetRust())
return false

// Read deps file
Expand All @@ -253,7 +253,7 @@ class WASMbindgenAsset extends Asset {
}

async generate() {
if (this.isTragetRust()) {
if (this.isTargetRust()) {
return [
{
type: 'js',
Expand Down