Skip to content
Merged
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
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
"@bazel/bazel": "^1.2.0",
"@bazel/ibazel": "^0.10.3",
"@cypress/webpack-preprocessor": "^4.1.2",
"@nestjs/common": "^6.2.4",
"@nestjs/core": "^6.2.4",
"@nestjs/platform-express": "^6.2.4",
"@nestjs/schematics": "^6.3.0",
"@nestjs/testing": "^6.2.4",
"@nestjs/common": "^7.0.0",
"@nestjs/core": "^7.0.0",
"@nestjs/platform-express": "^7.0.0",
"@nestjs/schematics": "^7.0.0",
"@nestjs/testing": "^7.0.0",
"@ngrx/effects": "9.1.0",
"@ngrx/entity": "9.1.0",
"@ngrx/router-store": "9.1.0",
Expand Down Expand Up @@ -254,4 +254,4 @@
"dependencies": {
"@nrwl/nx-cloud": "^9.3.2"
}
}
}
36 changes: 35 additions & 1 deletion packages/nest/migrations.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,16 @@
"version": "8.7.0-beta.1",
"description": "Update Nest.js libraries",
"factory": "./src/migrations/update-8-7-0/update-8-7-0"
},
"update-10-0-0": {
"version": "10.0.0-beta.1",
"description": "Update Nest.js libraries",
"factory": "./src/migrations/update-10-0-0/update-10-0-0"
}
},
"packageJsonUpdates": {
"8.7.0": {
"version": "8.7.0-beta.4",
"version": "8.7.0-beta.1",
"packages": {
"@nestjs/common": {
"version": "^6.8.3",
Expand All @@ -35,6 +40,35 @@
"alwaysAddToPackageJson": false
}
}
},
"10.0.0": {
"version": "10.0.0-beta.1",
"packages": {
"@nestjs/common": {
"version": "^7.0.0",
"alwaysAddToPackageJson": false
},
"@nestjs/core": {
"version": "^7.0.0",
"alwaysAddToPackageJson": false
},
"@nestjs/platform-express": {
"version": "^7.0.0",
"alwaysAddToPackageJson": false
},
"@nestjs/schematics": {
"version": "^7.0.0",
"alwaysAddToPackageJson": false
},
"@nestjs/testing": {
"version": "^7.0.0",
"alwaysAddToPackageJson": false
},
"rxjs": {
"version": "^6.5.4",
"alwaysAddToPackageJson": true
}
}
}
}
}
95 changes: 95 additions & 0 deletions packages/nest/src/migrations/update-10-0-0/update-10-0-0.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
import {
chain,
Rule,
SchematicContext,
Tree,
} from '@angular-devkit/schematics';
import {
formatFiles,
insert,
updateJsonInTree,
updatePackagesInPackageJson,
} from '@nrwl/workspace';
import { ReplaceChange } from '@nrwl/workspace/src/utils/ast-utils';
import { join, relative } from 'path';
import {
createSourceFile,
isDecorator,
isImportClause,
isImportDeclaration,
isStringLiteral,
ScriptTarget,
} from 'typescript';
import { getLogger } from '@nrwl/tao/src/shared/logger';
const ignore = require('ignore');

export default function update(): Rule {
return chain([
updatePackagesInPackageJson(
join(__dirname, '../../../', 'migrations.json'),
'10.0.0'
),
formatFiles(),
updateImports,
removeObsoletePackages,
(_, context: SchematicContext) => {
const logger = getLogger();
logger.info(
'NX We upgraded Nest.js to v7. Make sure to read the migration guide: https://docs.nestjs.com/migration-guide'
);
},
]);
}

function removeObsoletePackages() {
return updateJsonInTree('package.json', (json) => {
if (json.dependencies && json.dependencies['type-graphql']) {
delete json.dependencies['type-graphql'];
}
return json;
});
}

function updateImports(host: Tree) {
let ig = ignore();

if (host.exists('.gitignore')) {
ig = ig.add(host.read('.gitignore').toString());
}

host.visit((path) => {
if (ig.ignores(relative('/', path)) || !/\.ts?$/.test(path)) {
return;
}

const sourceFile = createSourceFile(
path,
host.read(path).toString(),
ScriptTarget.Latest,
true
);
const changes = [];
sourceFile.statements.forEach((statement) => {
if (
isImportDeclaration(statement) &&
isStringLiteral(statement.moduleSpecifier)
) {
const nodeText = statement.moduleSpecifier.getText(sourceFile);
const modulePath = statement.moduleSpecifier
.getText(sourceFile)
.substr(1, nodeText.length - 2);
if (modulePath === 'type-graphql') {
changes.push(
new ReplaceChange(
path,
statement.moduleSpecifier.getStart(sourceFile),
nodeText,
`'@nestjs/graphql'`
)
);
}
}
});
insert(host, path, changes);
});
}
2 changes: 2 additions & 0 deletions packages/nest/src/schematics/init/init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
nestJsVersion,
nxVersion,
reflectMetadataVersion,
rxjsVersion,
} from '../../utils/versions';

export const updateDependencies = addDepsToPackageJson(
Expand All @@ -20,6 +21,7 @@ export const updateDependencies = addDepsToPackageJson(
'@nestjs/core': nestJsVersion,
'@nestjs/platform-express': nestJsVersion,
'reflect-metadata': reflectMetadataVersion,
rxjs: rxjsVersion,
},
{
'@nestjs/schematics': nestJsSchematicsVersion,
Expand Down
6 changes: 4 additions & 2 deletions packages/nest/src/utils/versions.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
export const nxVersion = '*';

export const nestJsVersion = '^6.8.3';
export const nestJsSchematicsVersion = '^6.7.0';
export const nestJsVersion = '^7.0.0';
export const nestJsSchematicsVersion = '^7.0.0';

export const rxjsVersion = '^6.5.4';

export const reflectMetadataVersion = '^0.1.13';
Loading