Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,13 @@
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nx/typescript"],
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- develop
- v5
schedule:
- cron: "0 1 * * *"
- cron: '0 1 * * *'
jobs:
main:
runs-on: ubuntu-latest
Expand All @@ -23,7 +23,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: 20
node-version: 24

- uses: nrwl/nx-set-shas@v4

Expand Down
2 changes: 1 addition & 1 deletion create-workspace/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"url": "git+https://github.com/onecx/onecx-nx-plugins.git"
},
"dependencies": {
"create-nx-workspace": "19.8.14",
"create-nx-workspace": "^22.6.0",
"tslib": "^2.3.0"
},
"type": "commonjs",
Expand Down
6 changes: 3 additions & 3 deletions nx-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"url": "git+https://github.com/onecx/onecx-nx-plugins.git"
},
"dependencies": {
"@nx/devkit": "^19.8.14",
"@nx/angular": "^19.8.14",
"@nx/eslint-plugin": "^19.8.14",
"@nx/devkit": "^22.6.0",
"@nx/angular": "^22.6.0",
"@nx/eslint-plugin": "^22.6.0",
"ejs": "^3.1.9",
"enquirer": "^2.3.6",
"ora": "^5.3.0",
Expand Down
25 changes: 13 additions & 12 deletions nx-plugin/src/generators/angular/generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const PARAMETERS: GeneratorParameter<AngularGeneratorSchema>[] = [
type: 'boolean',
required: 'never',
default: false,
}
},
];

export async function angularGenerator(
Expand Down Expand Up @@ -61,7 +61,6 @@ export async function angularGenerator(
style: 'scss',
tags: ``,
routing: false,
projectNameAndRootFormat: 'as-provided',
e2eTestRunner: E2eTestRunner.None,
});

Expand Down Expand Up @@ -195,8 +194,8 @@ export async function angularGenerator(
log(cmd);
execSync(cmd, { cwd: tree.root, stdio: 'inherit' });

// Replace the generated solution for gitignore and jest testing,
// because they do not fit the needs of the generated application and
// Replace the generated solution for gitignore and jest testing,
// because they do not fit the needs of the generated application and
// would require manual adjustments after generation otherwise.
cmd = 'mv -f .gitignore.org .gitignore';
log(cmd);
Expand Down Expand Up @@ -260,7 +259,9 @@ function addScriptsToPackageJson(tree: Tree, options: AngularGeneratorSchema) {
'apigen'
] = `openapi-generator-cli generate -i src/assets/api/openapi-bff.yaml -c apigen.yaml -o src/app/shared/generated -g typescript-angular --type-mappings AnyType=object`;
pkgJson.scripts['start'] = 'nx serve --host 0.0.0.0 --disable-host-check';
pkgJson.scripts['build'] = `nx build && cp dist/${options['name']}/styles.*.css dist/${options['name']}/styles.css`;
pkgJson.scripts[
'build'
] = `nx build && cp dist/${options['name']}/styles.*.css dist/${options['name']}/styles.css`;
pkgJson.scripts[
'postbuild'
] = `mv "$(find dist/${options['name']} -maxdepth 1 -type f -name 'styles.*.css' | head -n 1)" dist/${options['name']}/styles.css`;
Expand Down Expand Up @@ -313,11 +314,11 @@ function adaptProjectConfiguration(
publicHost: 'http://localhost:4200',
proxyConfig: 'proxy.conf.js',
headers: {
"Allow": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
"Access-Control-Allow-Origin": "*",
"Access-Control-Allow-Headers": "*",
"Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS"
}
Allow: 'GET, POST, PUT, DELETE, PATCH, OPTIONS',
'Access-Control-Allow-Origin': '*',
'Access-Control-Allow-Headers': '*',
'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, PATCH, OPTIONS',
},
};
config.targets['build'].executor = '@nx/angular:webpack-browser';
config.targets['build'].options = {
Expand Down Expand Up @@ -345,8 +346,8 @@ function adaptProjectConfiguration(
{
input: 'src/styles.scss',
bundleName: 'styles',
inject: true
}
inject: true,
},
],
customWebpackConfig: {
path: 'webpack.config.js',
Expand Down
Loading
Loading