miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

feat(node): replace usages of @nrwl with @nx (#16379)

Browse Source
This commit is contained in:
Jason Jean 2023-04-18 17:17:55 -04:00 committed by GitHub
parent 1a49564d6f
commit ad805cb73f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/express/.eslintrc.json
View File

@ -21,7 +21,7 @@
"rules": {
"no-restricted-imports": [
"error",
"@nrwl/workspace",
"@nx/workspace",
"@angular-devkit/core",
"@angular-devkit/architect",
"@angular-devkit/schematics"

2
packages/express/generators.json
View File

@ -1,7 +1,7 @@
{
"name": "Nx Express",
"version": "0.1",
"extends": ["@nrwl/workspace"],
"extends": ["@nx/workspace"],
"generators": {
"init": {
"factory": "./src/generators/init/init#initGenerator",

7
packages/express/src/generators/application/application.ts
View File

@ -60,13 +60,8 @@ server.on('error', console.error);
toJS(tree);
}
}
// TODO (nicholas): Remove After Nx 16
// @deprecated Use `nx g @nrwl/node:app --framework=express instead.
export async function applicationGenerator(tree: Tree, schema: Schema) {
console.warn(
'As of Nx 16 using `nx g @nrwl/express:app` has been deprecated! Use `nx g @nrwl/node:app --framework=express instead.'
);
export async function applicationGenerator(tree: Tree, schema: Schema) {
const options = normalizeOptions(tree, schema);
const initTask = await initGenerator(tree, { ...options, skipFormat: true });
const applicationTask = await nodeApplicationGenerator(tree, {

8
packages/express/src/generators/init/init.spec.ts
View File

@ -20,7 +20,7 @@ describe('init', () => {
const existingVersion = '1.0.0';
addDependenciesToPackageJson(
tree,
{ '@nrwl/express': expressVersion, [existing]: existingVersion },
{ '@nx/express': expressVersion, [existing]: existingVersion },
{ [existing]: existingVersion }
);
await initGenerator(tree, {});
@ -29,9 +29,9 @@ describe('init', () => {
expect(packageJson.dependencies['express']).toBeDefined();
// add tslib
expect(packageJson.dependencies['tslib']).toBeDefined();
// move `@nrwl/express` to dev
expect(packageJson.dependencies['@nrwl/express']).toBeUndefined();
expect(packageJson.devDependencies['@nrwl/express']).toBeDefined();
// move `@nx/express` to dev
expect(packageJson.dependencies['@nx/express']).toBeUndefined();
expect(packageJson.devDependencies['@nx/express']).toBeDefined();
// add express types
expect(packageJson.devDependencies['@types/express']).toBeDefined();
// keep existing packages

4
packages/express/src/generators/init/init.ts
View File

@ -15,7 +15,7 @@ import {
import type { Schema } from './schema';
function updateDependencies(tree: Tree) {
removeDependenciesFromPackageJson(tree, ['@nrwl/express'], []);
removeDependenciesFromPackageJson(tree, ['@nx/express'], []);
return addDependenciesToPackageJson(
tree,
@ -25,7 +25,7 @@ function updateDependencies(tree: Tree) {
},
{
'@types/express': expressTypingsVersion,
'@nrwl/express': nxVersion,
'@nx/express': nxVersion,
}
);
}

2
packages/nest/.eslintrc.json
View File

@ -24,7 +24,7 @@
"@angular-devkit/architect",
"@angular-devkit/core",
"@angular-devkit/schematics",
"@nrwl/workspace"
"@nx/workspace"
]
}
},

2
packages/nest/generators.json
View File

@ -1,7 +1,7 @@
{
"name": "nx/nest",
"version": "0.1",
"extends": ["@nrwl/workspace"],
"extends": ["@nx/workspace"],
"schematics": {
"application": {
"factory": "./src/generators/application/application#applicationSchematic",

6
packages/nest/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.ts
View File

@ -24,8 +24,8 @@ export async function conversionGenerator(
* to perform in order to convert a project from TSLint to ESLint, as well as some
* extensibility points for adjusting the behavior on a per package basis.
*
* E.g. @nrwl/angular projects might need to make different changes to the final
* ESLint config when compared with @nrwl/nest projects.
* E.g. @nx/angular projects might need to make different changes to the final
* ESLint config when compared with @nx/nest projects.
*
* See the ProjectConverter implementation for a full breakdown of what it does.
*/
@ -113,7 +113,7 @@ export async function conversionGenerator(
/**
* Store user preferences for the collection
*/
projectConverter.setDefaults('@nrwl/nest', defaults);
projectConverter.setDefaults('@nx/nest', defaults);
/**
* Based on user preference and remaining usage, remove TSLint from the workspace entirely.

4
packages/nest/src/generators/init/init.spec.ts
View File

@ -24,12 +24,12 @@ describe('init generator', () => {
expect(packageJson.dependencies['reflect-metadata']).toBeDefined();
expect(packageJson.dependencies['rxjs']).toBeDefined();
expect(packageJson.dependencies['tslib']).toBeDefined();
expect(packageJson.dependencies['@nrwl/nest']).toBeUndefined();
expect(packageJson.dependencies['@nx/nest']).toBeUndefined();
expect(packageJson.devDependencies['@nestjs/schematics']).toBe(
nestJsVersion
);
expect(packageJson.devDependencies['@nestjs/testing']).toBe(nestJsVersion);
expect(packageJson.devDependencies['@nrwl/nest']).toBe(nxVersion);
expect(packageJson.devDependencies['@nx/nest']).toBe(nxVersion);
});
it('should add jest config when unitTestRunner is jest', async () => {

2
packages/nest/src/generators/init/lib/add-dependencies.ts
View File

@ -22,7 +22,7 @@ export function addDependencies(tree: Tree): GeneratorCallback {
{
'@nestjs/schematics': nestJsVersion,
'@nestjs/testing': nestJsVersion,
'@nrwl/nest': nxVersion,
'@nx/nest': nxVersion,
}
);
}

2
packages/nest/src/generators/library/lib/add-project.ts
View File

@ -12,7 +12,7 @@ export function addProject(tree: Tree, options: NormalizedOptions): void {
const project = readProjectConfiguration(tree, options.projectName);
project.targets.build = {
executor: '@nrwl/js:tsc',
executor: '@nx/js:tsc',
outputs: ['{options.outputPath}'],
options: {
outputPath:

2
packages/nest/src/generators/library/library.spec.ts
View File

@ -71,7 +71,7 @@ describe('lib', () => {
).toMatchSnapshot();
});
it('should remove the default file from @nrwl/node:lib', async () => {
it('should remove the default file from @nx/node:lib', async () => {
await libraryGenerator(tree, { name: libName, global: true });
expect(

2
packages/node/.eslintrc.json
View File

@ -21,7 +21,7 @@
"rules": {
"no-restricted-imports": [
"error",
"@nrwl/workspace",
"@nx/workspace",
"@angular-devkit/core",
"@angular-devkit/architect",
"@angular-devkit/schematics"

2
packages/node/generators.json
View File

@ -1,7 +1,7 @@
{
"name": "nx/node",
"version": "0.1",
"extends": ["@nrwl/workspace"],
"extends": ["@nx/workspace"],
"generators": {
"init": {
"factory": "./src/generators/init/init",

2
packages/node/src/executors/webpack/webpack.impl.ts
View File

@ -11,7 +11,7 @@ export async function* webpackExecutor(
context: ExecutorContext
) {
logger.warn(
'"@nrwl/node:webpack" executor is deprecated. Use "@nrwl/webpack:webpack" instead in your project.json.'
'"@nx/node:webpack" executor is deprecated. Use "@nx/webpack:webpack" instead in your project.json.'
);
yield* baseWebpackExecutor(
{

2
packages/node/src/generators/application/application.spec.ts
View File

@ -51,7 +51,7 @@ describe('app', () => {
},
},
serve: {
executor: '@nrwl/js:node',
executor: '@nx/js:node',
defaultConfiguration: 'development',
options: {
buildTarget: 'my-node-app:build',

4
packages/node/src/generators/application/application.ts
View File

@ -134,7 +134,7 @@ function getEsBuildConfig(
function getServeConfig(options: NormalizedSchema): TargetConfiguration {
return {
executor: '@nrwl/js:node',
executor: '@nx/js:node',
defaultConfiguration: 'development',
options: {
buildTarget: `${options.name}:build`,
@ -298,7 +298,7 @@ function addProjectDependencies(
'@nx/webpack': nxVersion,
},
esbuild: {
'@nrwl/esbuild': nxVersion,
'@nx/esbuild': nxVersion,
esbuild: esbuildVersion,
},
};

2
packages/node/src/generators/application/files/common/webpack.config.js__tmpl__
View File

@ -1,4 +1,4 @@
const { composePlugins, withNx} = require('@nrwl/webpack');
const { composePlugins, withNx} = require('@nx/webpack');
// Nx plugins for webpack.
module.exports = composePlugins(withNx(), (config) => {

6
packages/node/src/generators/init/init.spec.ts
View File

@ -23,7 +23,7 @@ describe('init', () => {
addDependenciesToPackageJson(
tree,
{
'@nrwl/node': nxVersion,
'@nx/node': nxVersion,
[existing]: existingVersion,
},
{
@ -33,10 +33,10 @@ describe('init', () => {
await initGenerator(tree, {});
const packageJson = readJson(tree, 'package.json');
expect(packageJson.dependencies['@nrwl/node']).toBeUndefined();
expect(packageJson.dependencies['@nx/node']).toBeUndefined();
expect(packageJson.dependencies['tslib']).toBeDefined();
expect(packageJson.dependencies[existing]).toBeDefined();
expect(packageJson.devDependencies['@nrwl/node']).toBeDefined();
expect(packageJson.devDependencies['@nx/node']).toBeDefined();
expect(packageJson.devDependencies[existing]).toBeDefined();
});

4
packages/node/src/generators/init/init.ts
View File

@ -18,14 +18,14 @@ import {
import { Schema } from './schema';
function updateDependencies(tree: Tree) {
removeDependenciesFromPackageJson(tree, ['@nrwl/node'], []);
removeDependenciesFromPackageJson(tree, ['@nx/node'], []);
return addDependenciesToPackageJson(
tree,
{
tslib: tslibVersion,
},
{ '@nrwl/node': nxVersion, '@types/node': typesNodeVersion }
{ '@nx/node': nxVersion, '@types/node': typesNodeVersion }
);
}

6
packages/node/src/generators/library/library.spec.ts
View File

@ -311,7 +311,7 @@ describe('lib', () => {
const { build } = readProjectConfiguration(tree, 'my-lib').targets;
expect(build.executor).toEqual('@nrwl/js:tsc');
expect(build.executor).toEqual('@nx/js:tsc');
});
it('should specify swc as compiler', async () => {
@ -323,7 +323,7 @@ describe('lib', () => {
const { build } = readProjectConfiguration(tree, 'my-lib').targets;
expect(build.executor).toEqual('@nrwl/js:swc');
expect(build.executor).toEqual('@nx/js:swc');
});
});
@ -361,7 +361,7 @@ describe('lib', () => {
expect(projectConfiguration.targets.build).toMatchInlineSnapshot(`
{
"executor": "@nrwl/js:tsc",
"executor": "@nx/js:tsc",
"options": {
"assets": [
"libs/my-lib/*.md",

2
packages/node/src/generators/library/library.ts
View File

@ -159,7 +159,7 @@ function updateProject(tree: Tree, options: NormalizedSchema) {
project.targets = project.targets || {};
project.targets.build = {
executor: `@nrwl/js:${options.compiler}`,
executor: `@nx/js:${options.compiler}`,
outputs: ['{options.outputPath}'],
options: {
outputPath: joinPathFragments(