Merge pull request #11 from solid/update-deps

Update dependencies

.travis.yml

@@ -2,6 +2,6 @@ sudo: false
 
 language: node_js
 
-node_js: "8.10"
+node_js: "12"
 
 script: npm run test

package.json

@@ -14,7 +14,7 @@
     "build-dist": "webpack --progress",
     "dist": "npm run build-dist",
     "prepare": "npm run build-dist",
-    "test": "mocha test",
+    "test": "mocha --recursive test",
     "jsdoc": "jsdoc -c jsdoc.json -r"
   },
   "repository": {
@@ -46,16 +46,16 @@
   "dependencies": {
     "@sinonjs/text-encoding": "^0.7.1",
     "base64url": "^3.0.1",
-    "isomorphic-webcrypto": "^2.3.2"
+    "isomorphic-webcrypto": "^2.3.6"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "babel-preset-env": "^1.7.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "dirty-chai": "^2.0.1",
-    "mocha": "^6.2.2",
-    "webpack": "^4.41.2",
-    "webpack-cli": "^3.3.10"
+    "mocha": "^8.0.1",
+    "webpack": "^4.44.0",
+    "webpack-cli": "^3.3.12"
   }
 }

src/algorithms/RSASSA-PKCS1-v1_5.js

@@ -5,7 +5,7 @@
  * @ignore
  */
 const base64url = require('base64url')
-const crypto = require('isomorphic-webcrypto')
+let crypto = require('../crypto')
 const TextEncoder = require('../text-encoder')
 
 /**

src/crypto.js

@@ -0,0 +1,3 @@
+const imported = require('isomorphic-webcrypto')
+
+module.exports = (imported.default ? imported.default : imported)

src/index.js

@@ -1,6 +1,7 @@
 /**
  * @module JSON Object Signing and Encryption (JOSE)
  */
+const crypto = require('./crypto')
 const JWA = require('./jose/JWA')
 const JWK = require('./jose/JWK')
 const JWKSet = require('./jose/JWKSet')
@@ -11,6 +12,7 @@ const JWS = require('./jose/JWS')
  * Export
  */
 module.exports = {
+  crypto,
   JWA,
   JWK,
   JWKSet,

test/cryptoSpec.js

@@ -0,0 +1,28 @@
+'use strict'
+
+/**
+ * Test dependencies
+ */
+const chai = require('chai')
+const chaiAsPromised = require('chai-as-promised')
+
+/**
+ * Assertions
+ */
+chai.should()
+chai.use(chaiAsPromised)
+let expect = chai.expect
+
+/**
+ * Code under test
+ */
+const Index = require('../src/')
+
+/**
+ * Tests
+ */
+describe('Index', () => {
+  it('exports crypto', () => {
+    return Object.keys(Index.crypto).should.deep.equal(['subtle'])
+  })
+})