From 2551412ebeb3e56685293d8eac0bf538a1ce4e74 Mon Sep 17 00:00:00 2001 From: Mark Henderson Date: Mon, 2 Dec 2019 16:04:59 -0500 Subject: [PATCH 1/2] Removing unnecessary examples build steps --- package-lock.json | 22 ++++++++++++++++++++-- package.json | 6 +++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f9dd6d5..4735e86 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14206,6 +14206,23 @@ "requires": { "ethers": "^4.0.20", "orbit-db-keystore": "github:orbitdb/orbit-db-keystore" + }, + "dependencies": { + "orbit-db-keystore": { + "version": "github:orbitdb/orbit-db-keystore#662daf5ad1941fabbd121754565fcf208aff74cd", + "from": "github:orbitdb/orbit-db-keystore", + "requires": { + "elliptic": "^6.4.1", + "level": "~5.0.1", + "leveldown": "~5.1.1", + "levelup": "~4.1.0", + "libp2p-crypto": "^0.16.0", + "libp2p-crypto-secp256k1": "^0.3.0", + "lru": "^3.1.0", + "mkdirp": "^0.5.1", + "safe-buffer": "^5.1.2" + } + } } }, "orbit-db-io": { @@ -14232,8 +14249,9 @@ } }, "orbit-db-keystore": { - "version": "github:orbitdb/orbit-db-keystore#662daf5ad1941fabbd121754565fcf208aff74cd", - "from": "github:orbitdb/orbit-db-keystore", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/orbit-db-keystore/-/orbit-db-keystore-0.3.3.tgz", + "integrity": "sha512-NSRcpq+fUjf94UVud+EmHi1h7V6Me/E5f5ix7fji/2MHhCYPtTMTBgs2hg7y15EBjfv4QFQPOQ3nFJCtBvka3A==", "requires": { "elliptic": "^6.4.1", "level": "~5.0.1", diff --git a/package.json b/package.json index f2dc9c6..2403fe8 100644 --- a/package.json +++ b/package.json @@ -80,9 +80,9 @@ "test": "cross-env TEST=all mocha", "test:browser-multiple-tabs": "npm run build:dist && cpy dist/orbitdb.min.js ./test/browser --rename=orbitdb.js && cpy node_modules/ipfs/dist/index.js ./test/browser --rename=ipfs.js && cpy node_modules/orbit-db-identity-provider/dist/index-browser.min.js ./test/browser --rename=identities.js && cpy node_modules/ipfs-log/dist/ipfslog.min.js ./test/browser && mocha ./test/browser/concurrent.spec.js", "build": "npm run build:es5 && npm run build:debug && npm run build:dist && npm run build:examples && npm run build:docs/toc", - "build:examples": "webpack --config conf/webpack.example.config.js --sort-modules-by size && mkdirp examples/browser/lib && cpy node_modules/ipfs/dist/index.js examples/browser/lib/ipfs.js", - "build:dist": "webpack --config conf/webpack.config.js --sort-modules-by size && mkdirp examples/browser/lib && cpy dist/orbitdb.min.js examples/browser/lib/orbitdb.min.js", - "build:debug": "webpack --config conf/webpack.debug.config.js --sort-modules-by size && mkdirp examples/browser/lib && cpy dist/orbitdb.js examples/browser/lib/orbitdb.js && cpy dist/orbitdb.js.map examples/browser/lib/orbitdb.js.map", + "build:examples": "webpack --config conf/webpack.example.config.js --sort-modules-by size", + "build:dist": "webpack --config conf/webpack.config.js --sort-modules-by size && mkdirp examples/browser/lib && cpy dist/orbitdb.min.js examples/browser/lib", + "build:debug": "webpack --config conf/webpack.debug.config.js --sort-modules-by size && mkdirp examples/browser/lib && cpy dist/orbitdb.js examples/browser/lib && cpy dist/orbitdb.js.map examples/browser/lib", "build:docs/toc": "markdown-toc --no-first1 -i README.md && markdown-toc --no-first1 -i API.md && markdown-toc --no-first1 -i GUIDE.md && markdown-toc --no-first1 -i CHANGELOG.md && markdown-toc --no-first1 -i FAQ.md ", "build:es5": "babel src --out-dir ./dist/es5/ --presets babel-preset-env --plugins babel-plugin-transform-runtime" }, From 85a39230dfbc175763ebc16ec1b7754b9d2524c1 Mon Sep 17 00:00:00 2001 From: shamb0t Date: Tue, 3 Dec 2019 08:17:10 +0000 Subject: [PATCH 2/2] Resolve package conflict --- package-lock.json | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4735e86..816c1a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4510,9 +4510,9 @@ } }, "electron-to-chromium": { - "version": "1.3.321", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.321.tgz", - "integrity": "sha512-jJy/BZK2s2eAjMPXVMSaCmo7/pSY2aKkfQ+LoAb5Wk39qAhyP9r8KU74c4qTgr9cD/lPUhJgReZxxqU0n5puog==", + "version": "1.3.322", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz", + "integrity": "sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA==", "dev": true }, "elliptic": { @@ -14206,23 +14206,6 @@ "requires": { "ethers": "^4.0.20", "orbit-db-keystore": "github:orbitdb/orbit-db-keystore" - }, - "dependencies": { - "orbit-db-keystore": { - "version": "github:orbitdb/orbit-db-keystore#662daf5ad1941fabbd121754565fcf208aff74cd", - "from": "github:orbitdb/orbit-db-keystore", - "requires": { - "elliptic": "^6.4.1", - "level": "~5.0.1", - "leveldown": "~5.1.1", - "levelup": "~4.1.0", - "libp2p-crypto": "^0.16.0", - "libp2p-crypto-secp256k1": "^0.3.0", - "lru": "^3.1.0", - "mkdirp": "^0.5.1", - "safe-buffer": "^5.1.2" - } - } } }, "orbit-db-io": { @@ -14249,9 +14232,8 @@ } }, "orbit-db-keystore": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/orbit-db-keystore/-/orbit-db-keystore-0.3.3.tgz", - "integrity": "sha512-NSRcpq+fUjf94UVud+EmHi1h7V6Me/E5f5ix7fji/2MHhCYPtTMTBgs2hg7y15EBjfv4QFQPOQ3nFJCtBvka3A==", + "version": "github:orbitdb/orbit-db-keystore#662daf5ad1941fabbd121754565fcf208aff74cd", + "from": "github:orbitdb/orbit-db-keystore", "requires": { "elliptic": "^6.4.1", "level": "~5.0.1",