Skip to content

Commit 518e734

Browse files
committed
fix(nx-plugin): build for CommonJS to use generators
1 parent 3b8ca38 commit 518e734

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

packages/nx-plugin/src/generators/configuration/generator.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import {
55
readProjectConfiguration,
66
updateProjectConfiguration,
77
} from '@nx/devkit';
8-
import { dirname, join } from 'node:path';
9-
import { fileURLToPath } from 'node:url';
8+
import { join } from 'node:path';
109
import { ui } from '@code-pushup/utils';
1110
import { AddToProjectGeneratorSchema } from './schema';
1211

@@ -23,12 +22,7 @@ export async function addToProjectGenerator(
2322
return;
2423
}
2524

26-
generateFiles(
27-
tree,
28-
join(fileURLToPath(dirname(import.meta.url)), 'files'),
29-
root,
30-
options,
31-
);
25+
generateFiles(tree, join(__dirname, 'files'), root, options);
3226

3327
updateProjectConfiguration(tree, options.project, {
3428
...projectConfiguration,

packages/nx-plugin/src/generators/init/generator.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
cpModelVersion,
1717
cpNxPluginVersion,
1818
cpUtilsVersion,
19-
} from '../../utils/versions';
19+
} from '../versions';
2020
import { InitGeneratorSchema } from './schema';
2121

2222
const nxPluginPackageName = '@code-pushup/nx-plugin';
@@ -29,10 +29,10 @@ function checkDependenciesInstalled(host: Tree) {
2929
packageJson.devDependencies = packageJson.devDependencies ?? {};
3030

3131
// base deps
32-
devDependencies[nxPluginPackageName] = cpNxPluginVersion;
33-
devDependencies['@code-pushup/models'] = cpModelVersion;
34-
devDependencies['@code-pushup/utils'] = cpUtilsVersion;
35-
devDependencies['@code-pushup/cli'] = cpCliVersion;
32+
devDependencies[nxPluginPackageName] = cpNxPluginVersion();
33+
devDependencies['@code-pushup/models'] = cpModelVersion();
34+
devDependencies['@code-pushup/utils'] = cpUtilsVersion();
35+
devDependencies['@code-pushup/cli'] = cpCliVersion();
3636

3737
return addDependenciesToPackageJson(host, dependencies, devDependencies);
3838
}

packages/nx-plugin/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../tsconfig.base.json",
33
"compilerOptions": {
4-
"module": "ESNext"
4+
"module": "CommonJS"
55
},
66
"files": [],
77
"include": [],

0 commit comments

Comments
 (0)