embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: make code compile again after rebase

This commit is contained in:
Pascal Precht 2018-10-23 11:26:15 +02:00
parent aecc667a8c
commit 853ab2d855
No known key found for this signature in database
GPG Key ID: 0EE28D8D6FD85D7D
6 changed files with 4426 additions and 771 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/engine.js
View File

@ -73,7 +73,7 @@ class Engine {
"libraryManager": this.libraryManagerService, "libraryManager": this.libraryManagerService,
"processManager": this.processManagerService, "processManager": this.processManagerService,
"storage": this.storageService, "storage": this.storageService,
"pluginCommand": this.pluginCommandService "pluginCommand": this.pluginCommandService,
"graph": this.graphService, "graph": this.graphService,
"pluginCommand": this.pluginCommandService, "pluginCommand": this.pluginCommandService,
"testRunner": this.testRunnerService, "testRunner": this.testRunnerService,

2
lib/core/fs.js
View File

@ -204,7 +204,7 @@ module.exports = {
writeFile, writeFile,
writeFileSync, writeFileSync,
writeJSONSync, writeJSONSync,
copyPreserve copyPreserve,
dappPath, dappPath,
pkgPath, pkgPath,
outputFileSync, outputFileSync,

2
lib/modules/ipfs/index.js
View File

@ -120,7 +120,7 @@ class IPFS {
storageConfig: self.storageConfig, storageConfig: self.storageConfig,
webServerConfig: self.webServerConfig, webServerConfig: self.webServerConfig,
blockchainConfig: self.blockchainConfig, blockchainConfig: self.blockchainConfig,
corsParts: self.embark.config.corsParts corsParts: self.embark.config.corsParts,
embark: self.embark embark: self.embark
}); });
self.logger.trace(`Storage module: Launching ipfs process...`); self.logger.trace(`Storage module: Launching ipfs process...`);

2
lib/modules/swarm/index.js
View File

@ -98,7 +98,7 @@ class Swarm {
events: self.events, events: self.events,
storageConfig: self.storageConfig, storageConfig: self.storageConfig,
webServerConfig: self.webServerConfig, webServerConfig: self.webServerConfig,
corsParts: self.embark.config.corsParts corsParts: self.embark.config.corsParts,
embark: self.embark embark: self.embark
}); });
self.logger.trace(`Storage module: Launching swarm process...`); self.logger.trace(`Storage module: Launching swarm process...`);

5170
npm-shrinkwrap.json generated
View File

File diff suppressed because it is too large Load Diff

19
package.json
View File

@ -100,14 +100,8 @@
"pkg-up": "2.0.0", "pkg-up": "2.0.0",
"promptly": "2.2.0", "promptly": "2.2.0",
"propose": "0.0.5", "propose": "0.0.5",
<<<<<<< HEAD
"remix-tests": "0.0.13", "remix-tests": "0.0.13",
"react-scripts": "^1.1.4",
||||||| merged common ancestors
"react-scripts": "^1.1.4",
=======
"react-scripts": "1.1.5", "react-scripts": "1.1.5",
>>>>>>> exact versions per `npm ls --depth=0`
"request": "2.88.0", "request": "2.88.0",
"sass-loader": "7.1.0", "sass-loader": "7.1.0",
"semver": "5.5.1", "semver": "5.5.1",
@ -125,22 +119,11 @@
"url-loader": "1.1.1", "url-loader": "1.1.1",
"uuid": "3.3.2", "uuid": "3.3.2",
"viz.js": "1.8.2", "viz.js": "1.8.2",
<<<<<<< HEAD
"web3": "1.0.0-beta.34", "web3": "1.0.0-beta.34",
"webpack": "4.19.0", "webpack": "4.19.0",
"websocket": "1.0.28", "websocket": "1.0.28",
"window-size": "1.1.1", "window-size": "1.1.1",
"webpack-bundle-analyzer": "^2.13.1", "webpack-bundle-analyzer": "^2.13.1"
||||||| merged common ancestors
"web3": "1.0.0-beta.36",
"webpack": "4.18.0",
"webpack-bundle-analyzer": "^2.13.1",
=======
"web3": "1.0.0-beta.36",
"webpack": "4.18.0",
"webpack-bundle-analyzer": "2.13.1",
>>>>>>> exact versions per `npm ls --depth=0`
"window-size": "1.1.1"
}, },
"author": "Iuri Matias <iuri.matias@gmail.com>", "author": "Iuri Matias <iuri.matias@gmail.com>",
"contributors": [], "contributors": [],