@wolsok/nx-aws-cdk-v2 2.1.5 → 2.2.0
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
|
@@ -20,17 +20,19 @@ function generateCommandString(command, appPath) {
|
|
|
20
20
|
const packageManager = (0, devkit_1.detectPackageManager)();
|
|
21
21
|
const packageManagerExecutor = packageManager === 'npm' ? 'npx' : packageManager;
|
|
22
22
|
const projectPath = path.join(NX_WORKSPACE_ROOT, appPath);
|
|
23
|
-
const
|
|
24
|
-
const
|
|
25
|
-
const
|
|
26
|
-
|
|
27
|
-
return `node --require ts-node/register ${NX_WORKSPACE_ROOT}/node_modules/aws-cdk/bin/cdk -a ${generatePath} ${command}`;
|
|
23
|
+
const moduleType = getModuleType(projectPath);
|
|
24
|
+
const tsNodePart = moduleType === 'module' ? '--loader ts-node/esm' : 'ts-node';
|
|
25
|
+
const generatePath = `"${packageManagerExecutor} ${tsNodePart} --require tsconfig-paths/register --project ${path.join(projectPath, 'tsconfig.app.json')} ${path.join(projectPath, '/src/main.ts')}"`;
|
|
26
|
+
return `node --require ts-node/register ${path.join(NX_WORKSPACE_ROOT, 'node_modules/aws-cdk/bin/cdk')} -a ${generatePath} ${command}`;
|
|
28
27
|
}
|
|
29
28
|
function parseArgs(options) {
|
|
30
29
|
const keys = Object.keys(options);
|
|
31
30
|
return keys
|
|
32
31
|
.filter((prop) => exports.executorPropKeys.indexOf(prop) < 0)
|
|
33
|
-
.reduce((acc, key) =>
|
|
32
|
+
.reduce((acc, key) => {
|
|
33
|
+
acc[key] = options[key];
|
|
34
|
+
return acc;
|
|
35
|
+
}, {});
|
|
34
36
|
}
|
|
35
37
|
function createCommand(command, options) {
|
|
36
38
|
console.log('OptionsParsedExecutorInterface', JSON.stringify(options));
|
|
@@ -90,4 +92,15 @@ function runCommandProcess(command, cwd) {
|
|
|
90
92
|
});
|
|
91
93
|
});
|
|
92
94
|
}
|
|
95
|
+
function getModuleType(projectPath) {
|
|
96
|
+
const packageJsonPath = path.join(NX_WORKSPACE_ROOT, projectPath, 'package.json');
|
|
97
|
+
const appPackageJson = (0, package_json_utils_1.getPackageJson)(packageJsonPath);
|
|
98
|
+
if (appPackageJson === null || appPackageJson === void 0 ? void 0 : appPackageJson.type) {
|
|
99
|
+
console.log('App Package Json', appPackageJson.type);
|
|
100
|
+
return appPackageJson.type;
|
|
101
|
+
}
|
|
102
|
+
const globalPackageJson = (0, package_json_utils_1.getPackageJson)(path.join(NX_WORKSPACE_ROOT, 'package.json'));
|
|
103
|
+
console.log('Global Package Json', globalPackageJson.type);
|
|
104
|
+
return globalPackageJson.type;
|
|
105
|
+
}
|
|
93
106
|
//# sourceMappingURL=executor.util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.util.js","sourceRoot":"","sources":["../../../../../packages/aws-cdk-v2/src/utils/executor.util.ts"],"names":[],"mappings":";;;;AAiBA,
|
|
1
|
+
{"version":3,"file":"executor.util.js","sourceRoot":"","sources":["../../../../../packages/aws-cdk-v2/src/utils/executor.util.ts"],"names":[],"mappings":"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"}
|