Skip to content
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

Jump to bottom

Fix bundled version in node (breaking changes) #78

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

Fix bundled version in node (breaking changes) #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b68d24c
remove outdated argon2.js.mem replace patch
davidyuk Feb 5, 2022
81764cd
move unloadRuntime replace patch to em-post.js
davidyuk Feb 5, 2022
692ee12
remove outdated receiveInstantiatedSource replace patch
davidyuk Feb 5, 2022
adfd860
wrap emscripten module with a function to don't use globals
davidyuk Feb 5, 2022
ee9d0c3
use inlined wasm in nodejs
davidyuk Feb 5, 2022
74a6f3c
remove module definition header in lib/argon2
davidyuk Feb 6, 2022
8012af7
build lib/argon2 using webpack to fix importing of em module in browser
davidyuk Feb 6, 2022
82c3eb2
fix docs by wrapping emscripten module with custom webpack loader
davidyuk Feb 6, 2022
a60d2cf
use webpack.DefinePlugin to remove bare require of wasm in bundled
davidyuk Feb 7, 2022
abc2088
don't require path package in bundled version
davidyuk Feb 7, 2022
84917cb
don't refer to "process" in bundled version
davidyuk Feb 7, 2022
0820ce6
add default export to fix if interpret as cjs module
davidyuk Feb 12, 2022
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
run: npm ci
- name: Build
run: source emsdk/emsdk_env.sh && ./build.sh
- name: Bundle
run: npm run build
- name: Test
run: npm test
- name: Bundle
run: npm run build-bundle
- name: Package
run: npm pack
- name: Publish to npm
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ npm install argon2-browser

Then add this script to your HTML or use your favorite bundler:
```html
<script src="node_modules/argon2-browser/lib/argon2.js"></script>
<script src="node_modules/argon2-browser/dist/argon2.min.js"></script>
```

Alternatively, you can use the bundled version, this way you can include just one script:
```html
<script src="node_modules/argon2-browser/dist/argon2-bundled.js"></script>
<script src="node_modules/argon2-browser/dist/argon2-bundled.min.js"></script>
```

Calculate the hash:
Expand Down
5 changes: 0 additions & 5 deletions build-wasm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,3 @@ cmake --build .

shasum dist/argon2.js
shasum dist/argon2.wasm

perl -pi -e 's/"argon2.js.mem"/null/g' dist/argon2.js
perl -pi -e 's/$/if(typeof module!=="undefined")module.exports=Module;Module.unloadRuntime=function(){if(typeof self!=="undefined"){delete self.Module}Module=jsModule=wasmMemory=wasmTable=asm=buffer=HEAP8=HEAPU8=HEAP16=HEAPU16=HEAP32=HEAPU32=HEAPF32=HEAPF64=undefined;if(typeof module!=="undefined"){delete module.exports}};/' dist/argon2.js
perl -pi -e 's/typeof Module!=="undefined"\?Module:\{};/typeof self!=="undefined"&&typeof self.Module!=="undefined"?self.Module:{};var jsModule=Module;/g' dist/argon2.js
perl -pi -e 's/receiveInstantiatedSource\(output\)\{/receiveInstantiatedSource(output){Module=jsModule;if(typeof self!=="undefined")self.Module=Module;/g' dist/argon2.js
2 changes: 1 addition & 1 deletion examples/vanilla/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Argon2 Browser VanillaJS Demo</title>
<script src="node_modules/argon2-browser/lib/argon2.js"></script>
<script src="node_modules/argon2-browser/dist/argon2.min.js"></script>
</head>
<body>
<h1>Argon2-Browser WebPack Demo</h1>
Expand Down
Loading