chore: make basic-pipeline an optional plugin

chore: make basic-pipeline an optional plugin chore: make basic-pipeline an optional plugin chore: make basic-pipeline an optional plugin chore: make basic-pipeline an optional plugin chore: make basic-pipeline an optional plugin chore: make basic-pipeline an optional plugin chore: make basic-pipeline an optional plugin fixes address code review fix linter issue fix missing param fix binding remove pipeline warning remove unused var
embarklabs · Mar 13, 2020 · 8c11adf · 8c11adf
1 parent db8282c
commit 8c11adf
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 28 deletions.
diff --git a/dapps/templates/boilerplate/embark.json b/dapps/templates/boilerplate/embark.json
@@ -18,7 +18,8 @@
     "embark-geth": {},
     "embark-parity": {},
     "embark-profiler": {},
-    "embark-graph": {}
+    "embark-graph": {},
+    "embark-basic-pipeline": {}
   },
   "options": {
     "solc": {

diff --git a/dapps/templates/boilerplate/package.json b/dapps/templates/boilerplate/package.json
@@ -33,6 +33,7 @@
   },
   "devDependencies": {
     "embark": "^5.3.0-nightly.9",
+    "embark-basic-pipeline": "^5.3.0-nightly.7",
     "embark-geth": "^5.3.0-nightly.9",
     "embark-graph": "^5.3.0-nightly.7",
     "embark-ipfs": "^5.3.0-nightly.9",

diff --git a/dapps/templates/demo/embark.json b/dapps/templates/demo/embark.json
@@ -18,7 +18,8 @@
     "embark-geth": {},
     "embark-parity": {},
     "embark-profiler": {},
-    "embark-graph": {}
+    "embark-graph": {},
+    "embark-basic-pipeline": {}
   },
   "options": {
     "solc": {

diff --git a/dapps/templates/demo/package.json b/dapps/templates/demo/package.json
@@ -35,6 +35,7 @@
     "bootstrap": "4.3.1",
     "classnames": "2.2.6",
     "embark": "^5.3.0-nightly.9",
+    "embark-basic-pipeline": "^5.3.0-nightly.7",
     "embark-geth": "^5.3.0-nightly.9",
     "embark-graph": "^5.3.0-nightly.7",
     "embark-ipfs": "^5.3.0-nightly.9",

diff --git a/dapps/tests/app/embark.json b/dapps/tests/app/embark.json
@@ -25,7 +25,8 @@
     "embark-parity": {},
     "embark-profiler": {},
     "embark-graph": {},
-    "embark-dapp-test-service": {}
+    "embark-dapp-test-service": {},
+    "embark-basic-pipeline": {}
   },
   "options": {
     "solc": {

diff --git a/dapps/tests/app/package.json b/dapps/tests/app/package.json
@@ -3,6 +3,7 @@
   "devDependencies": {
     "bootstrap": "3.4.1",
     "embark": "^5.3.0-nightly.9",
+    "embark-basic-pipeline": "^5.3.0-nightly.7",
     "embark-dapp-test-service": "^5.2.3",
     "embark-geth": "^5.3.0-nightly.9",
     "embark-graph": "^5.3.0-nightly.7",

diff --git a/dapps/tests/contracts/embark.json b/dapps/tests/contracts/embark.json
@@ -18,6 +18,7 @@
     "embark-geth": {},
     "embark-parity": {},
     "embark-profiler": {},
-    "embark-graph": {}
+    "embark-graph": {},
+    "embark-basic-pipeline": {}
   }
 }
diff --git a/dapps/tests/contracts/package.json b/dapps/tests/contracts/package.json
@@ -2,6 +2,7 @@
   "description": "Test DApp for integration testing purposes",
   "devDependencies": {
     "embark": "^5.3.0-nightly.9",
+    "embark-basic-pipeline": "^5.3.0-nightly.7",
     "embark-geth": "^5.3.0-nightly.9",
     "embark-graph": "^5.3.0-nightly.7",
     "embark-ipfs": "^5.3.0-nightly.9",

diff --git a/packages/core/core/src/plugin.ts b/packages/core/core/src/plugin.ts
@@ -89,6 +89,8 @@ export class Plugin {
 
   plugins: any;
 
+  pluginsAPI: any;
+
   env: any;
 
   loaded = false;
@@ -121,6 +123,7 @@ export class Plugin {
     this.acceptedContext = options.pluginConfig.context || [constants.contexts.any];
     this.version = options.version;
     this.constants = constants;
+    this.pluginsAPI = options.pluginsAPI;
 
     if (!Array.isArray(this.currentContext)) {
       this.currentContext = [this.currentContext];

diff --git a/packages/core/core/src/plugins.ts b/packages/core/core/src/plugins.ts
@@ -87,6 +87,7 @@ export class Plugins {
       events: this.events,
       config: this.config,
       plugins: this.plugins,
+      pluginsAPI: this,
       fs: this.fs,
       isInternal: true,
       context: this.context,
@@ -121,6 +122,7 @@ export class Plugins {
       events: this.events,
       config: this.config,
       plugins: this.plugins,
+      pluginsAPI: this,
       fs: this.fs,
       isInternal: true,
       context: this.context,
@@ -152,6 +154,7 @@ export class Plugins {
       events: this.events,
       config: this.config,
       plugins: this.plugins,
+      pluginsAPI: this,
       fs: this.fs,
       isInternal: false,
       context: this.context,

diff --git a/packages/core/engine/package.json b/packages/core/engine/package.json
@@ -50,7 +50,6 @@
     "embark-accounts-manager": "^5.3.0-nightly.9",
     "embark-api": "^5.3.0-nightly.9",
     "embark-authenticator": "^5.3.0-nightly.7",
-    "embark-basic-pipeline": "^5.3.0-nightly.9",
     "embark-blockchain": "^5.3.0-nightly.9",
     "embark-code-runner": "^5.3.0-nightly.9",
     "embark-communication": "^5.3.0-nightly.7",

diff --git a/packages/core/engine/src/index.ts b/packages/core/engine/src/index.ts
@@ -39,8 +39,6 @@ export class Engine {
 
   webServerConfig: any;
 
-  webpackConfigName: string;
-
   singleUseAuthToken: boolean;
 
   ipcRole = 'client';
@@ -73,7 +71,6 @@ export class Engine {
     this.context = options.context;
     this.useDashboard = options.useDashboard;
     this.webServerConfig = options.webServerConfig;
-    this.webpackConfigName = options.webpackConfigName;
     this.singleUseAuthToken = options.singleUseAuthToken;
     this.package = options.package;
     this.ipcRole = options.ipcRole || 'client';
@@ -170,7 +167,6 @@ export class Engine {
       blockchainStackComponents: this.blockchainStackComponents,
       compiler: this.compilerComponents,
       contracts: this.contractsComponents,
-      pipeline: this.pipelineService,
       webserver: this.webserverService,
       namesystem: this.namesystemComponents,
       filewatcher: this.filewatcherService,
@@ -197,14 +193,6 @@ export class Engine {
     this.registerModulePackage('embark-watcher');
   }
 
-  pipelineService(_options) {
-    this.registerModulePackage('embark-basic-pipeline', {
-      plugins: this.plugins,
-      webpackConfigName: this.webpackConfigName,
-      useDashboard: this.useDashboard
-    });
-  }
-
   serviceMonitor() {
     this.servicesMonitor = new ServicesMonitor({ events: this.events, logger: this.logger, plugins: this.plugins });
 

diff --git a/packages/core/engine/tsconfig.json b/packages/core/engine/tsconfig.json
@@ -13,9 +13,6 @@
     {
       "path": "../../plugins/accounts-manager"
     },
-    {
-      "path": "../../plugins/basic-pipeline"
-    },
     {
       "path": "../../plugins/coverage"
     },

diff --git a/packages/embark/src/cmd/cmd_controller.js b/packages/embark/src/cmd/cmd_controller.js
@@ -183,7 +183,6 @@ class EmbarkController {
         engine.registerModuleGroup("namesystem");
         engine.registerModuleGroup("compiler");
         engine.registerModuleGroup("contracts");
-        engine.registerModuleGroup("pipeline");
         engine.registerModuleGroup("webserver");
         engine.registerModuleGroup("filewatcher");
         engine.registerModuleGroup("cockpit");
@@ -435,7 +434,6 @@ class EmbarkController {
         engine.registerModuleGroup("namesystem");
         engine.registerModuleGroup("compiler");
         engine.registerModuleGroup("contracts");
-        engine.registerModuleGroup("pipeline");
         engine.registerModuleGroup("webserver");
         engine.registerModuleGroup("filewatcher");
         if (!isSecondaryProcess(engine)) {
@@ -756,10 +754,10 @@ class EmbarkController {
         engine.registerModuleGroup("stackComponents");
 
         engine.registerModulePackage('embark-ganache');
+
         engine.registerModuleGroup("namesystem");
         engine.registerModuleGroup("compiler");
         engine.registerModuleGroup("contracts");
-        engine.registerModuleGroup("pipeline");
         engine.registerModuleGroup("webserver");
         engine.registerModuleGroup("filewatcher");
         engine.registerModulePackage('embark-deploy-tracker', { plugins: engine.plugins });
@@ -838,14 +836,14 @@ class EmbarkController {
         engine.registerModuleGroup("coreComponents");
         engine.registerModuleGroup("stackComponents");
 
+        engine.registerModuleGroup("compiler");
         engine.registerModulePackage('embark-ganache');
         engine.registerModuleGroup("compiler");
         engine.registerModulePackage('embark-ethereum-blockchain-client');
         engine.registerModulePackage('embark-web3');
         engine.registerModulePackage('embark-accounts-manager');
         engine.registerModulePackage('embark-rpc-manager');
         engine.registerModulePackage('embark-specialconfigs', { plugins: engine.plugins });
-        engine.registerModuleGroup("pipeline");
         engine.registerModuleGroup("tests", options);
         engine.registerModulePackage('embark-deploy-tracker', { plugins: engine.plugins, trackContracts: false });
         engine.registerModuleGroup("namesystem");

diff --git a/packages/plugins/basic-pipeline/src/index.js b/packages/plugins/basic-pipeline/src/index.js
@@ -8,23 +8,24 @@ require('./env');
 
 class BasicPipeline {
 
-  constructor(embark, options) {
+  constructor(embark) {
     this.embark = embark;
     this.assetFiles = embark.config.assetFiles;
     this.isFirstBuild = true;
     this.embarkConfig = embark.config.embarkConfig;
     // TODO: why god why
-    this.useDashboard = options.useDashboard;
+    // this.useDashboard = options.useDashboard;
+    this.useDashboard = true;
     this.fs = embark.fs;
-    this.webpackConfigName = options.webpackConfigName;
+    this.webpackConfigName = embark.config.webpackConfigName;
     this.env = embark.config.env;
     this.buildDir = embark.config.buildDir;
     this.contractsFiles = embark.config.contractsFiles;
     this.embarkConfig = embark.config.embarkConfig;
 
     this.logger = embark.logger;
     this.events = embark.events;
-    this.plugins = options.plugins;
+    this.plugins = embark.pluginsAPI;
     this.pipelinePlugins = this.plugins.getPluginsFor('pipeline');
     this.pipelineConfig = embark.config.pipelineConfig;
     let plugin = this.plugins.createPlugin('basic-pipeline', {});