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

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
This commit is contained in:
Iuri Matias 2020-01-29 14:11:50 -05:00
parent db8282c52c
commit 948956ab1f
15 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dapps/templates/boilerplate/embark.json
View File

@ -18,7 +18,8 @@
"embark-geth": {},
"embark-parity": {},
"embark-profiler": {},
"embark-graph": {}
"embark-graph": {},
"embark-basic-pipeline": {}
},
"options": {
"solc": {

1
dapps/templates/boilerplate/package.json
View File

@ -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",

3
dapps/templates/demo/embark.json
View File

@ -18,7 +18,8 @@
"embark-geth": {},
"embark-parity": {},
"embark-profiler": {},
"embark-graph": {}
"embark-graph": {},
"embark-basic-pipeline": {}
},
"options": {
"solc": {

1
dapps/templates/demo/package.json
View File

@ -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",

3
dapps/tests/app/embark.json
View File

@ -25,7 +25,8 @@
"embark-parity": {},
"embark-profiler": {},
"embark-graph": {},
"embark-dapp-test-service": {}
"embark-dapp-test-service": {},
"embark-basic-pipeline": {}
},
"options": {
"solc": {

1
dapps/tests/app/package.json
View File

@ -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",

3
dapps/tests/contracts/embark.json
View File

@ -18,6 +18,7 @@
"embark-geth": {},
"embark-parity": {},
"embark-profiler": {},
"embark-graph": {}
"embark-graph": {},
"embark-basic-pipeline": {}
}
}

1
dapps/tests/contracts/package.json
View File

@ -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",

3
packages/core/core/src/plugin.ts
View File

@ -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];

3
packages/core/core/src/plugins.ts
View File

@ -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,

1
packages/core/engine/package.json
View File

@ -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",

12
packages/core/engine/src/index.ts
View File

@ -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 });

3
packages/core/engine/tsconfig.json
View File

@ -13,9 +13,6 @@
{
"path": "../../plugins/accounts-manager"
},
{
"path": "../../plugins/basic-pipeline"
},
{
"path": "../../plugins/coverage"
},

6
packages/embark/src/cmd/cmd_controller.js
View File

@ -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,6 +836,7 @@ class EmbarkController {
engine.registerModuleGroup("coreComponents");
engine.registerModuleGroup("stackComponents");
engine.registerModuleGroup("compiler");
engine.registerModulePackage('embark-ganache');
engine.registerModuleGroup("compiler");
engine.registerModulePackage('embark-ethereum-blockchain-client');
@ -845,7 +844,6 @@ class EmbarkController {
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");

9
packages/plugins/basic-pipeline/src/index.js
View File

@ -8,15 +8,16 @@ 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;
@ -24,7 +25,7 @@ class BasicPipeline {
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', {});