diff --git a/lib/api.js b/lib/api.js index f7eb2df5..022ecea3 100644 --- a/lib/api.js +++ b/lib/api.js @@ -36,6 +36,7 @@ class API { this.onTestsComplete = config.onTestsComplete || this.defaultHook; this.onCompileComplete = config.onCompileComplete || this.defaultHook; this.onIstanbulComplete = config.onIstanbulComplete || this.defaultHook; + this.onPreCompile = config.onPreCompile || this.defaultHook; this.server = null; this.defaultPort = 8555; diff --git a/package.json b/package.json index 0e8c7fa6..8394c838 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,14 @@ { - "name": "solidity-coverage", + "name": "adhara-solidity-coverage", "version": "0.7.7", - "description": "", + "description": "Customized version of the public solidity-coverage truffle plugin", "main": "plugins/buidler.plugin.js", "bin": { "solidity-coverage": "./plugins/bin.js" }, + "publishConfig": { + "registry": "https://adhara.jfrog.io/artifactory/api/npm/smart-contract-modules/" + }, "directories": { "test": "test" }, @@ -16,10 +19,10 @@ "test:debug": "node --max-old-space-size=4096 ./node_modules/.bin/mocha test/units/* --timeout 100000 --no-warnings --exit", "netlify": "./scripts/run-netlify.sh" }, - "homepage": "https://github.com/sc-forks/solidity-coverage", + "homepage": "https://github.com/AdharaProjects/solidity-coverage", "repository": { "type": "git", - "url": "https://github.com/sc-forks/solidity-coverage.git" + "url": "https://github.com/AdharaProjects/solidity-coverage.git" }, "author": "", "license": "ISC", diff --git a/plugins/resources/.plugin.utils.js.swp b/plugins/resources/.plugin.utils.js.swp new file mode 100644 index 00000000..87aeb629 Binary files /dev/null and b/plugins/resources/.plugin.utils.js.swp differ diff --git a/plugins/resources/plugin.utils.js b/plugins/resources/plugin.utils.js index 933cfdab..3178ec9f 100644 --- a/plugins/resources/plugin.utils.js +++ b/plugins/resources/plugin.utils.js @@ -94,7 +94,7 @@ function toRelativePath(pathToFile, pathToParent){ */ function getTempLocations(config){ const cwd = config.workingDir; - const contractsDirName = '.coverage_contracts'; + const contractsDirName = config.coverage_contracts_temp || '.coverage_contracts'; const artifactsDirName = config.temp || '.coverage_artifacts'; return { @@ -250,7 +250,6 @@ async function finish(config, api){ } = getTempLocations(config); shell.config.silent = true; - shell.rm('-Rf', tempContractsDir); shell.rm('-Rf', tempArtifactsDir); shell.config.silent = false; diff --git a/plugins/truffle.plugin.js b/plugins/truffle.plugin.js index 8e337c6e..1a706a73 100644 --- a/plugins/truffle.plugin.js +++ b/plugins/truffle.plugin.js @@ -97,6 +97,9 @@ async function plugin(config){ config.all = true; config.compilers.solc.settings.optimizer.enabled = false; + // Run pre-compile hook; + await api.onPreCompile(config); + // Compile Instrumented Contracts await truffle.contracts.compile(config); await api.onCompileComplete(config);