Skip to content

Commit

Permalink
Merge branch 'webauthn-open-source:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
HSMDBC authored Sep 8, 2022
2 parents f173d03 + a1bd544 commit c30a93c
Show file tree
Hide file tree
Showing 7 changed files with 815 additions and 438 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ See [package.json](/package.json) for available npm scripts, and [deno.jsonc](/d

Make sure to add tests if you add new features.

**Important:** Do not stage/commit `dist/main.js` and `dist/main.cjs`. These are generated and committed automatically by the CI-pipeline.

### Dependencies

When adding, removing or updating dependencies, start out with npm as usual. Then update `import_map.json` to points to the same versions shown by `npm list`, and run `deno task update-deps` to update the Deno lock-file.
Expand Down
176 changes: 88 additions & 88 deletions deno-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion deno.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"test:dist": "deno test --lock=deno-lock.json --importmap=import_map.dist.json --ignore=test/dist test",

/* Run after changing dependencies */
"update-deps": "deno cache --lock=deno-lock.json --lock-write --importmap=import_map.json test/main.test.js lib/main.js",
"update-deps": "deno cache -r --lock=deno-lock.json --lock-write --importmap=import_map.json test/main.test.js lib/main.js",

"build": "deno task test && (mkdir dist; deno bundle --lock=deno-lock.json lib/main.js dist/main.js) && deno task test:dist"
}
Expand Down
394 changes: 187 additions & 207 deletions dist/main.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions import_map.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"imports": {
"tldts": "https://unpkg.com/tldts@5.7.90/dist/index.esm.min.js",
"tldts": "https://unpkg.com/tldts@5.7.91/dist/index.esm.min.js",
"punycode": "https://deno.land/x/punycode@v2.1.1/punycode.js",
"jose": "https://deno.land/x/jose@v4.9.1/index.ts?module",
"jose": "https://deno.land/x/jose@v4.9.2/index.ts?module",
"asn1js": "https://unpkg.com/asn1js@3.0.5?module",
"cbor-x": "https://deno.land/x/cbor@v1.4.0/index.js?module",
"std/": "https://deno.land/std@0.136.0/",
"pkijs": "https://unpkg.com/pkijs@3.0.7?module",
"pkijs": "https://unpkg.com/pkijs@3.0.8?module",
"@hexagon/base64": "https://deno.land/x/b64@1.1.23/dist/base64.min.mjs",

"sinon": "https://unpkg.com/sinon@14.0.0/pkg/sinon-esm.js",
Expand Down
Loading

0 comments on commit c30a93c

Please sign in to comment.