Rename the dist folder 'plugins' (#444)

cgewecke · web-flow · commit f87c274c2f03 · 2019-11-28T15:37:12.000-08:00
diff --git a/index.js b/index.js
diff --git a/package.json b/package.json
@@ -2,9 +2,9 @@
   "name": "solidity-coverage",
   "version": "0.7.0-beta.2",
   "description": "",
-  "main": "dist/buidler.plugin.js",
+  "main": "plugins/buidler.plugin.js",
   "bin": {
-    "solidity-coverage": "./dist/bin.js"
+    "solidity-coverage": "./plugins/bin.js"
   },
   "directories": {
     "test": "test"
diff --git a/plugins/bin.js b/plugins/bin.js
diff --git a/plugins/buidler.plugin.js b/plugins/buidler.plugin.js
@@ -1,7 +1,7 @@
 const API = require('./../lib/api');
-const utils = require('./plugin-assets/plugin.utils');
-const buidlerUtils = require('./plugin-assets/buidler.utils');
-const PluginUI = require('./plugin-assets/buidler.ui');
+const utils = require('./resources/plugin.utils');
+const buidlerUtils = require('./resources/buidler.utils');
+const PluginUI = require('./resources/buidler.ui');
 
 const pkg = require('./../package.json');
 const death = require('death');
diff --git a/plugins/resources/buidler.ui.js b/plugins/resources/buidler.ui.js
diff --git a/plugins/resources/buidler.utils.js b/plugins/resources/buidler.utils.js
diff --git a/plugins/resources/plugin.utils.js b/plugins/resources/plugin.utils.js
diff --git a/plugins/resources/truffle.library.js b/plugins/resources/truffle.library.js
diff --git a/plugins/resources/truffle.library.js.map b/plugins/resources/truffle.library.js.map
diff --git a/plugins/resources/truffle.ui.js b/plugins/resources/truffle.ui.js
diff --git a/plugins/resources/truffle.utils.js b/plugins/resources/truffle.utils.js
diff --git a/plugins/truffle.plugin.js b/plugins/truffle.plugin.js
@@ -1,7 +1,7 @@
 const API = require('./../lib/api');
-const utils = require('./plugin-assets/plugin.utils');
-const truffleUtils = require('./plugin-assets/truffle.utils');
-const PluginUI = require('./plugin-assets/truffle.ui');
+const utils = require('./resources/plugin.utils');
+const truffleUtils = require('./resources/truffle.utils');
+const PluginUI = require('./resources/truffle.ui');
 
 const pkg = require('./../package.json');
 const death = require('death');
diff --git a/test/integration/projects/bad-solcoverjs/buidler.config.js b/test/integration/projects/bad-solcoverjs/buidler.config.js
@@ -1,5 +1,5 @@
 const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing");
-loadPluginFile(__dirname + "/../dist/buidler.plugin");
+loadPluginFile(__dirname + "/../plugins/buidler.plugin");
 usePlugin("@nomiclabs/buidler-truffle5");
 
 module.exports={
diff --git a/test/integration/projects/ganache-solcoverjs/buidler.config.js b/test/integration/projects/ganache-solcoverjs/buidler.config.js
@@ -1,5 +1,5 @@
 const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing");
-loadPluginFile(__dirname + "/../dist/buidler.plugin");
+loadPluginFile(__dirname + "/../plugins/buidler.plugin");
 usePlugin("@nomiclabs/buidler-truffle5");
 
 module.exports={
diff --git a/test/integration/projects/import-paths/buidler.config.js b/test/integration/projects/import-paths/buidler.config.js
@@ -1,5 +1,5 @@
 const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing");
-loadPluginFile(__dirname + "/../dist/buidler.plugin");
+loadPluginFile(__dirname + "/../plugins/buidler.plugin");
 usePlugin("@nomiclabs/buidler-truffle5");
 
 module.exports={
diff --git a/test/integration/projects/libraries/buidler.config.js b/test/integration/projects/libraries/buidler.config.js
@@ -1,5 +1,5 @@
 const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing");
-loadPluginFile(__dirname + "/../dist/buidler.plugin");
+loadPluginFile(__dirname + "/../plugins/buidler.plugin");
 usePlugin("@nomiclabs/buidler-truffle5");
 
 module.exports={
diff --git a/test/integration/projects/multiple-suites/buidler.config.js b/test/integration/projects/multiple-suites/buidler.config.js
@@ -1,5 +1,5 @@
 const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing");
-loadPluginFile(__dirname + "/../dist/buidler.plugin");
+loadPluginFile(__dirname + "/../plugins/buidler.plugin");
 usePlugin("@nomiclabs/buidler-truffle5");
 
 module.exports={
diff --git a/test/integration/projects/no-sources/buidler.config.js b/test/integration/projects/no-sources/buidler.config.js
@@ -1,5 +1,5 @@
 const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing");
-loadPluginFile(__dirname + "/../dist/buidler.plugin");
+loadPluginFile(__dirname + "/../plugins/buidler.plugin");
 usePlugin("@nomiclabs/buidler-truffle5");
 
 module.exports={
diff --git a/test/integration/projects/skipping/buidler.config.js b/test/integration/projects/skipping/buidler.config.js
@@ -1,5 +1,5 @@
 const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing");
-loadPluginFile(__dirname + "/../dist/buidler.plugin");
+loadPluginFile(__dirname + "/../plugins/buidler.plugin");
 usePlugin("@nomiclabs/buidler-truffle5");
 
 module.exports={
diff --git a/test/integration/projects/test-files/buidler.config.js b/test/integration/projects/test-files/buidler.config.js
@@ -1,5 +1,5 @@
 const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing");
-loadPluginFile(__dirname + "/../dist/buidler.plugin");
+loadPluginFile(__dirname + "/../plugins/buidler.plugin");
 usePlugin("@nomiclabs/buidler-truffle5");
 
 module.exports={
diff --git a/test/units/buidler/errors.js b/test/units/buidler/errors.js
@@ -7,7 +7,7 @@ const ganache = require('ganache-cli')
 
 const verify = require('../../util/verifiers')
 const mock = require('../../util/integration');
-const plugin = require('../../../dist/buidler.plugin');
+const plugin = require('../../../plugins/buidler.plugin');
 
 // =======
 // Errors
diff --git a/test/units/buidler/flags.js b/test/units/buidler/flags.js
@@ -5,7 +5,7 @@ const shell = require('shelljs');
 
 const verify = require('../../util/verifiers')
 const mock = require('../../util/integration');
-const plugin = require('../../../dist/buidler.plugin');
+const plugin = require('../../../plugins/buidler.plugin');
 
 // =======================
 // CLI Options / Flags
@@ -85,7 +85,7 @@ describe('Buidler Plugin: command line options', function() {
     verify.lineCoverage(expected);
   });
 
-  it.only('--testfiles test/<fileName>', async function() {
+  it('--testfiles test/<fileName>', async function() {
     const taskArgs = {
       testfiles: path.join(
         buidlerConfig.paths.root,
diff --git a/test/units/buidler/standard.js b/test/units/buidler/standard.js
@@ -5,7 +5,7 @@ const shell = require('shelljs');
 
 const verify = require('../../util/verifiers')
 const mock = require('../../util/integration');
-const plugin = require('../../../dist/buidler.plugin');
+const plugin = require('../../../plugins/buidler.plugin');
 
 // =======================
 // Standard Use-case Tests
diff --git a/test/units/truffle/errors.js b/test/units/truffle/errors.js
@@ -7,7 +7,7 @@ const ganache = require('ganache-core-sc');
 
 const verify = require('../../util/verifiers')
 const mock = require('../../util/integration');
-const plugin = require('../../../dist/truffle.plugin');
+const plugin = require('../../../plugins/truffle.plugin');
 
 // =======
 // Errors
@@ -208,7 +208,7 @@ describe('Truffle Plugin: error cases', function() {
   })
 
   it('user runs "solidity-coverage" as shell command', function(){
-    const pathToCommand = './dist/bin.js';
+    const pathToCommand = './plugins/bin.js';
     const pkg = require('../../../package.json');
 
     assert(
diff --git a/test/units/truffle/flags.js b/test/units/truffle/flags.js
@@ -5,7 +5,7 @@ const shell = require('shelljs');
 
 const verify = require('../../util/verifiers')
 const mock = require('../../util/integration');
-const plugin = require('../../../dist/truffle.plugin');
+const plugin = require('../../../plugins/truffle.plugin');
 
 // =======================
 // CLI Options / Flags
diff --git a/test/units/truffle/standard.js b/test/units/truffle/standard.js
@@ -5,7 +5,7 @@ const shell = require('shelljs');
 
 const verify = require('../../util/verifiers')
 const mock = require('../../util/integration');
-const plugin = require('../../../dist/truffle.plugin');
+const plugin = require('../../../plugins/truffle.plugin');
 
 // =======================
 // Standard Use-case Tests
diff --git a/test/util/integration.js b/test/util/integration.js
@@ -159,7 +159,7 @@ function getDefaultBuidlerConfig() {
 function getBuidlerConfigJS(config){
   const prefix =`
     const { loadPluginFile } = require("@nomiclabs/buidler/plugins-testing");
-    loadPluginFile(__dirname + "/../dist/buidler.plugin");
+    loadPluginFile(__dirname + "/../plugins/buidler.plugin");
     usePlugin("@nomiclabs/buidler-truffle5");
   `
 
