@onivoro/onix 20.5.45 → 20.5.47
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
|
@@ -10,6 +10,7 @@ const path_1 = require("path");
|
|
|
10
10
|
const extract_project_configuration_function_1 = require("../../functions/extract-project-configuration.function");
|
|
11
11
|
const restart_ecs_service_function_1 = require("../../functions/restart-ecs-service.function");
|
|
12
12
|
const pmx_function_1 = require("../../functions/pmx.function");
|
|
13
|
+
const fs_1 = require("fs");
|
|
13
14
|
const stdio = 'inherit';
|
|
14
15
|
const uiAssetFolderName = 'ui';
|
|
15
16
|
const executor = (options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -23,17 +24,16 @@ const executor = (options, context) => tslib_1.__awaiter(void 0, void 0, void 0,
|
|
|
23
24
|
const [webProjectOutputs] = (0, extract_project_build_outputs_function_1.extractProjectBuildOutputs)(context, ui);
|
|
24
25
|
if (webProjectOutputs === null || webProjectOutputs === void 0 ? void 0 : webProjectOutputs.length) {
|
|
25
26
|
(0, pmx_function_1.pmxSpawn)(context, `nx build ${ui}`, { NODE_ENV: 'production' });
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
}, 10000);
|
|
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
|
+
[webProjectOutputs].forEach(output => {
|
|
32
|
+
if (!(0, fs_1.existsSync)(output)) {
|
|
33
|
+
throw new Error(`Build output directory does not exist: ${output}. The UI build may have failed.`);
|
|
34
|
+
}
|
|
35
|
+
devkit_1.logger.info(`Copying UI build output from ${output} to ${projectDistAssetPathForUi}`);
|
|
36
|
+
(0, child_process_1.execSync)(`cp -R ${output} ${projectDistAssetPathForUi}`);
|
|
37
37
|
});
|
|
38
38
|
}
|
|
39
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;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../onix/src/executors/deploy-ecs/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,9 +10,16 @@ function pmxSpawn(context, command, env = {}) {
|
|
|
10
10
|
const envLiteral = ''; // objectToEnvExports(env);
|
|
11
11
|
const completeCommand = `${envLiteral} ${dlx} ${command}`.trim();
|
|
12
12
|
devkit_1.logger.info(completeCommand);
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
try {
|
|
14
|
+
// Use execSync instead of spawnSync for better shell command support
|
|
15
|
+
(0, child_process_1.execSync)(completeCommand, {
|
|
16
|
+
stdio: 'inherit',
|
|
17
|
+
env: Object.assign(Object.assign({}, process.env), env)
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
catch (error) {
|
|
21
|
+
throw new Error(`Command failed: ${completeCommand}. Error: ${error.message}`);
|
|
22
|
+
}
|
|
16
23
|
}
|
|
17
24
|
function pmxExec(context, command) {
|
|
18
25
|
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,
|
|
1
|
+
{"version":3,"file":"pmx.function.js","sourceRoot":"","sources":["../../../../onix/src/functions/pmx.function.ts"],"names":[],"mappings":";;AAQA,4BAkBC;AAED,0BAQC;AApCD,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,IAAI,CAAC;QACD,qEAAqE;QACrE,IAAA,wBAAQ,EAAC,eAAe,EAAE;YACtB,KAAK,EAAE,SAAS;YAChB,GAAG,kCAAO,OAAO,CAAC,GAAG,GAAK,GAAG,CAAE;SAClC,CAAC,CAAC;IACP,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,mBAAmB,eAAe,YAAY,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IACnF,CAAC;AACL,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"}
|