@builder6/core 0.9.0 → 0.9.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -10,10 +10,9 @@ export declare class PluginModule {
|
|
|
10
10
|
static state: any;
|
|
11
11
|
static targetState: any;
|
|
12
12
|
constructor(moleculerService: MoleculerPluginService);
|
|
13
|
-
static forRootAsync(): DynamicModule;
|
|
14
13
|
onModuleInit(): void;
|
|
15
|
-
static
|
|
16
|
-
static loadPlugins(): any[]
|
|
14
|
+
static forRootAsync(): Promise<DynamicModule>;
|
|
15
|
+
static loadPlugins(): Promise<any[]>;
|
|
17
16
|
static loadPlugin(packageName: string): any;
|
|
18
17
|
static getPackagePath(packageName: string): string;
|
|
19
18
|
static getPluginDir(): string;
|
|
@@ -33,36 +33,20 @@ let PluginModule = PluginModule_1 = class PluginModule {
|
|
|
33
33
|
this.moleculerService = moleculerService;
|
|
34
34
|
this.logger = new common_1.Logger(plugin_service_1.PluginService.name);
|
|
35
35
|
}
|
|
36
|
-
static forRootAsync() {
|
|
37
|
-
return {
|
|
38
|
-
module: PluginModule_1,
|
|
39
|
-
imports: [],
|
|
40
|
-
providers: [
|
|
41
|
-
{
|
|
42
|
-
provide: 'PLUGINS',
|
|
43
|
-
useFactory: async () => {
|
|
44
|
-
return this.loadPlugins();
|
|
45
|
-
},
|
|
46
|
-
},
|
|
47
|
-
],
|
|
48
|
-
exports: ['PLUGINS'],
|
|
49
|
-
};
|
|
50
|
-
}
|
|
51
36
|
onModuleInit() {
|
|
52
37
|
this.moleculerService.loadServices();
|
|
53
38
|
}
|
|
54
|
-
static
|
|
55
|
-
const modules = this.loadPlugins();
|
|
56
|
-
console.log(modules);
|
|
39
|
+
static async forRootAsync() {
|
|
40
|
+
const modules = await this.loadPlugins();
|
|
57
41
|
return {
|
|
58
42
|
module: PluginModule_1,
|
|
59
43
|
imports: modules,
|
|
60
44
|
};
|
|
61
45
|
}
|
|
62
|
-
static loadPlugins() {
|
|
46
|
+
static async loadPlugins() {
|
|
63
47
|
const modules = process.env.B6_PLUGIN_MODULES;
|
|
64
48
|
this.updateNpmrc();
|
|
65
|
-
this.installPackages();
|
|
49
|
+
await this.installPackages();
|
|
66
50
|
const plugins = [];
|
|
67
51
|
if (modules) {
|
|
68
52
|
for (const module of modules.split(',')) {
|
|
@@ -149,7 +133,7 @@ let PluginModule = PluginModule_1 = class PluginModule {
|
|
|
149
133
|
}
|
|
150
134
|
}
|
|
151
135
|
}
|
|
152
|
-
static installPackages() {
|
|
136
|
+
static async installPackages() {
|
|
153
137
|
const pkgFilePath = path.join(this.getPluginDir(), 'package.json');
|
|
154
138
|
if (!fs.existsSync(pkgFilePath)) {
|
|
155
139
|
fs.writeFileSync(pkgFilePath, JSON.stringify({ name: 'b6-plugins', version: '0.0.0', dependencies: {} }, null, 2));
|
|
@@ -160,7 +144,7 @@ let PluginModule = PluginModule_1 = class PluginModule {
|
|
|
160
144
|
const wantedDependencies = this.getInstallPackages();
|
|
161
145
|
const existingModules = Object.keys(existingDependencies);
|
|
162
146
|
const wantedModules = Object.keys(wantedDependencies);
|
|
163
|
-
this.logger.log(`
|
|
147
|
+
this.logger.log(`Existing dependencies: ${existingModules}`);
|
|
164
148
|
let changed = false;
|
|
165
149
|
if (existingModules.length !== wantedModules.length) {
|
|
166
150
|
changed = true;
|
|
@@ -182,7 +166,7 @@ let PluginModule = PluginModule_1 = class PluginModule {
|
|
|
182
166
|
}
|
|
183
167
|
if (changed) {
|
|
184
168
|
this.state = States.INSTALLING;
|
|
185
|
-
this.logger.warn(`Install
|
|
169
|
+
this.logger.warn(`Install dependencies: ${this.install_packages}`);
|
|
186
170
|
pkg.dependencies = wantedDependencies;
|
|
187
171
|
fs.writeFileSync(pkgFilePath, JSON.stringify(pkg, null, 2));
|
|
188
172
|
const npmEnv = Object.assign({}, process.env);
|
|
@@ -211,6 +195,7 @@ let PluginModule = PluginModule_1 = class PluginModule {
|
|
|
211
195
|
});
|
|
212
196
|
child.on('close', (code) => {
|
|
213
197
|
if (code === 0) {
|
|
198
|
+
this.logger.warn(`Dependencies installed: ${this.install_packages}`);
|
|
214
199
|
resolve();
|
|
215
200
|
}
|
|
216
201
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.module.js","sourceRoot":"","sources":["../../src/plugin/plugin.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAA+D;AAC/D,yBAAyB;AACzB,6BAA6B;AAC7B,8CAA8C;AAC9C,qDAAiD;AACjD,2DAA6D;AAC7D,mDAAsD;AAEtD,MAAM,MAAM,GAAG;IACb,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,UAAU,EAAE,YAAY;IACxB,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,SAAS;IAClB,QAAQ,EAAE,UAAU;CACrB,CAAC;AAMK,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAWvB,YAA6B,gBAAwC;QAAxC,qBAAgB,GAAhB,gBAAgB,CAAwB;QAPpD,WAAM,GAAG,IAAI,eAAM,CAAC,8BAAa,CAAC,IAAI,CAAC,CAAC;IAOe,CAAC;IAEzE,
|
|
1
|
+
{"version":3,"file":"plugin.module.js","sourceRoot":"","sources":["../../src/plugin/plugin.module.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@builder6/core",
|
|
3
|
-
"version": "0.9.
|
|
3
|
+
"version": "0.9.2",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"files": [
|
|
7
7
|
"dist"
|
|
8
8
|
],
|
|
9
9
|
"dependencies": {
|
|
10
|
-
"@builder6/query-mongodb": "^0.9.
|
|
10
|
+
"@builder6/query-mongodb": "^0.9.2"
|
|
11
11
|
},
|
|
12
12
|
"scripts": {
|
|
13
13
|
"build": "rm -rf dist && tsc",
|
|
@@ -16,5 +16,5 @@
|
|
|
16
16
|
"publishConfig": {
|
|
17
17
|
"access": "public"
|
|
18
18
|
},
|
|
19
|
-
"gitHead": "
|
|
19
|
+
"gitHead": "7a86e5904a102487f7b1c13dc869961c58af0d17"
|
|
20
20
|
}
|