@onivoro/onix 20.5.41 → 20.5.43
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.
package/package.json
CHANGED
|
@@ -23,12 +23,17 @@ const executor = (options, context) => tslib_1.__awaiter(void 0, void 0, void 0,
|
|
|
23
23
|
const [webProjectOutputs] = (0, extract_project_build_outputs_function_1.extractProjectBuildOutputs)(context, ui);
|
|
24
24
|
if (webProjectOutputs === null || webProjectOutputs === void 0 ? void 0 : webProjectOutputs.length) {
|
|
25
25
|
(0, pmx_function_1.pmxSpawn)(context, `nx build ${ui}`, { NODE_ENV: 'production' });
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
(
|
|
26
|
+
yield new Promise((resolve, reject) => {
|
|
27
|
+
const projectConfiguration = (0, extract_project_configuration_function_1.extractProjectConfiguration)(context, context.projectName);
|
|
28
|
+
const [projectDist] = apiProjectOutput.split(projectConfiguration.root);
|
|
29
|
+
const [__, projectAssetsPath] = apiProjectAssetPath.split(projectConfiguration.sourceRoot);
|
|
30
|
+
const projectDistAssetPathForUi = (0, path_1.join)(projectDist, projectConfiguration.root, projectAssetsPath, uiAssetFolderName);
|
|
31
|
+
setTimeout(() => {
|
|
32
|
+
[webProjectOutputs].forEach(output => {
|
|
33
|
+
(0, child_process_1.execSync)(`cp -R ${output} ${projectDistAssetPathForUi}`);
|
|
34
|
+
});
|
|
35
|
+
resolve(null);
|
|
36
|
+
}, 0);
|
|
32
37
|
});
|
|
33
38
|
}
|
|
34
39
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/deploy-ecs/executor.ts"],"names":[],"mappings":";;;AAAA,uCAAsE;AAEtE,iDAAyC;AACzC,2GAA2F;AAC3F,mHAAoG;AACpG,iHAAkG;AAClG,+BAA4B;AAC5B,mHAAqG;AACrG,+FAAgF;AAChF,+DAAwD;AAExD,MAAM,KAAK,GAAG,SAAS,CAAC;AACxB,MAAM,iBAAiB,GAAG,IAAI,CAAC;AAE/B,MAAM,QAAQ,GAAoC,CAChD,OAAuB,EACvB,OAAwB,EACxB,EAAE;IACF,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAE3E,IAAA,uBAAQ,EAAC,OAAO,EAAE,YAAY,OAAO,CAAC,WAAW,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/deploy-ecs/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,14 +5,13 @@ exports.pmxExec = pmxExec;
|
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const child_process_1 = require("child_process");
|
|
7
7
|
const pm_function_1 = require("./pm.function");
|
|
8
|
-
const object_to_env_exports_function_1 = require("./object-to-env-exports.function");
|
|
9
8
|
function pmxSpawn(context, command, env = {}) {
|
|
10
9
|
const { dlx } = (0, pm_function_1.pm)(context);
|
|
11
|
-
const envLiteral =
|
|
10
|
+
const envLiteral = ''; // objectToEnvExports(env);
|
|
12
11
|
const completeCommand = `${envLiteral} ${dlx} ${command}`.trim();
|
|
13
12
|
devkit_1.logger.info(completeCommand);
|
|
14
|
-
const [program, ...args] = completeCommand.split(' ');
|
|
15
|
-
(0, child_process_1.spawnSync)(program, args, { stdio: 'inherit' });
|
|
13
|
+
const [program, ...args] = completeCommand.trim().split(' ');
|
|
14
|
+
(0, child_process_1.spawnSync)(program, args, { stdio: 'inherit', env });
|
|
16
15
|
}
|
|
17
16
|
function pmxExec(context, command) {
|
|
18
17
|
const { dlx } = (0, pm_function_1.pm)(context);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pmx.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/pmx.function.ts"],"names":[],"mappings":";;AAQA,4BAYC;AAED,0BAQC;AA9BD,uCAGoB;AACpB,iDAAoD;AACpD,+CAAmC;
|
|
1
|
+
{"version":3,"file":"pmx.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/pmx.function.ts"],"names":[],"mappings":";;AAQA,4BAYC;AAED,0BAQC;AA9BD,uCAGoB;AACpB,iDAAoD;AACpD,+CAAmC;AAGnC,SAAgB,QAAQ,CAAC,OAAwB,EAAE,OAAe,EAAE,MAA2B,EAAE;IAC7F,MAAM,EAAE,GAAG,EAAE,GAAG,IAAA,gBAAE,EAAC,OAAO,CAAC,CAAC;IAE5B,MAAM,UAAU,GAAG,EAAE,CAAC,CAAC,2BAA2B;IAElD,MAAM,eAAe,GAAG,GAAG,UAAU,IAAI,GAAG,IAAI,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC;IAEjE,eAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAE7B,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,eAAe,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE7D,IAAA,yBAAS,EAAC,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;AACxD,CAAC;AAED,SAAgB,OAAO,CAAC,OAAwB,EAAE,OAAe;IAC7D,MAAM,EAAE,GAAG,EAAE,GAAG,IAAA,gBAAE,EAAC,OAAO,CAAC,CAAC;IAE5B,MAAM,eAAe,GAAG,GAAG,GAAG,IAAI,OAAO,EAAE,CAAC;IAE5C,eAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAE7B,IAAA,wBAAQ,EAAC,eAAe,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;AACpD,CAAC"}
|