@nestjs/schematics 9.0.3 → 9.1.0

package/dist/lib/application/files/js/jsconfig.json

@@ -1,10 +1,10 @@
 {
   "compilerOptions": {
-      "target": "ES6",
-      "experimentalDecorators": true
+    "target": "ES6",
+    "experimentalDecorators": true
   },
   "exclude": [
-      "node_modules",
-      "dist"
+    "node_modules",
+    "dist"
   ]
 }

package/dist/lib/application/files/js/package.json

@@ -22,17 +22,17 @@
   },
   "devDependencies": {
     "@nestjs/testing": "^9.0.0",
-    "@babel/core": "7.18.13",
-    "@babel/node": "7.18.10",
-    "@babel/plugin-proposal-decorators": "7.18.10",
-    "@babel/plugin-transform-runtime": "7.18.10",
-    "@babel/preset-env": "7.18.10",
-    "@babel/register": "7.18.9",
-    "@babel/runtime": "7.18.9",
-    "jest": "28.1.3",
-    "nodemon": "2.0.19",
-    "prettier": "2.7.1",
-    "supertest": "6.2.4"
+    "@babel/core": "7.21.3",
+    "@babel/node": "7.20.7",
+    "@babel/plugin-proposal-decorators": "7.21.0",
+    "@babel/plugin-transform-runtime": "7.21.0",
+    "@babel/preset-env": "7.20.2",
+    "@babel/register": "7.21.0",
+    "@babel/runtime": "7.21.0",
+    "jest": "29.5.0",
+    "nodemon": "2.0.22",
+    "prettier": "2.8.7",
+    "supertest": "6.3.3"
   },
   "jest": {
     "moduleFileExtensions": [

package/dist/lib/application/files/ts/.eslintrc.js

@@ -2,7 +2,7 @@ module.exports = {
   parser: '@typescript-eslint/parser',
   parserOptions: {
     project: 'tsconfig.json',
-    tsconfigRootDir : __dirname, 
+    tsconfigRootDir: __dirname,
     sourceType: 'module',
   },
   plugins: ['@typescript-eslint/eslint-plugin'],

package/dist/lib/application/files/ts/nest-cli.json

@@ -1,5 +1,8 @@
 {
   "$schema": "https://json.schemastore.org/nest-cli",
   "collection": "@nestjs/schematics",
-  "sourceRoot": "src"
+  "sourceRoot": "src",
+  "compilerOptions": {
+    "deleteOutDir": true
+  }
 }

package/dist/lib/application/files/ts/package.json

@@ -6,7 +6,6 @@
   "private": true,
   "license": "UNLICENSED",
   "scripts": {
-    "prebuild": "rimraf dist",
     "build": "nest build",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
     "start": "nest start",
@@ -25,7 +24,6 @@
     "@nestjs/core": "^9.0.0",
     "@nestjs/platform-express": "^9.0.0",
     "reflect-metadata": "^0.1.13",
-    "rimraf": "^3.0.2",
     "rxjs": "^7.2.0"
   },
   "devDependencies": {
@@ -33,22 +31,22 @@
     "@nestjs/schematics": "^9.0.0",
     "@nestjs/testing": "^9.0.0",
     "@types/express": "^4.17.13",
-    "@types/jest": "28.1.8",
-    "@types/node": "^16.0.0",
+    "@types/jest": "29.5.0",
+    "@types/node": "18.15.11",
     "@types/supertest": "^2.0.11",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
     "eslint": "^8.0.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "jest": "28.1.3",
+    "jest": "29.5.0",
     "prettier": "^2.3.2",
     "source-map-support": "^0.5.20",
     "supertest": "^6.1.3",
-    "ts-jest": "28.0.8",
+    "ts-jest": "29.0.5",
     "ts-loader": "^9.2.3",
     "ts-node": "^10.0.0",
-    "tsconfig-paths": "4.1.0",
+    "tsconfig-paths": "4.2.0",
     "typescript": "^4.7.4"
   },
   "jest": {

package/dist/lib/library/files/js/jsconfig.json

@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
-      "target": "ES6",
-      "experimentalDecorators": true
+    "target": "ES6",
+    "experimentalDecorators": true
   },
   "exclude": [
-      "node_modules"
+    "node_modules"
   ]
-}
+}

package/dist/lib/sub-app/sub-app.factory.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.main = void 0;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
-const fse = require("fs-extra");
+const fs_1 = require("fs");
 const jsonc_parser_1 = require("jsonc-parser");
 const formatting_1 = require("../../utils/formatting");
 const defaults_1 = require("../defaults");
@@ -26,10 +26,10 @@ function main(options) {
 exports.main = main;
 function getAppNameFromPackageJson() {
     try {
-        if (!fse.existsSync('./package.json')) {
+        if (!(0, fs_1.existsSync)('./package.json')) {
             return defaults_1.DEFAULT_DIR_ENTRY_APP;
         }
-        const packageJson = fse.readJsonSync('./package.json');
+        const packageJson = JSON.parse(stripBom((0, fs_1.readFileSync)('./package.json', 'utf-8')));
         if (!packageJson.name) {
             return defaults_1.DEFAULT_DIR_ENTRY_APP;
         }
@@ -41,6 +41,12 @@ function getAppNameFromPackageJson() {
         return defaults_1.DEFAULT_DIR_ENTRY_APP;
     }
 }
+function stripBom(value) {
+    if (value.charCodeAt(0) === 0xfeff) {
+        return value.slice(1);
+    }
+    return value;
+}
 function transform(options) {
     const target = Object.assign({}, options);
     const defaultSourceRoot = options.rootDir !== undefined ? options.rootDir : defaults_1.DEFAULT_APPS_PATH;
@@ -114,8 +120,11 @@ function updateNpmScripts(scripts, options, defaultAppName) {
         return;
     }
     const defaultFormatScriptName = 'format';
+    const defaultStartScriptName = 'start:prod';
     const defaultTestScriptName = 'test:e2e';
-    if (!scripts[defaultTestScriptName] && !scripts[defaultFormatScriptName]) {
+    if (!scripts[defaultTestScriptName] &&
+        !scripts[defaultFormatScriptName] &&
+        !scripts[defaultStartScriptName]) {
         return;
     }
     if (scripts[defaultTestScriptName] &&
@@ -129,6 +138,11 @@ function updateNpmScripts(scripts, options, defaultAppName) {
         const defaultSourceRoot = options.rootDir !== undefined ? options.rootDir : defaults_1.DEFAULT_APPS_PATH;
         scripts[defaultFormatScriptName] = `prettier --write "${defaultSourceRoot}/**/*.ts" "${defaults_1.DEFAULT_LIB_PATH}/**/*.ts"`;
     }
+    if (scripts[defaultStartScriptName] &&
+        scripts[defaultStartScriptName].indexOf('dist/main') >= 0) {
+        const defaultSourceRoot = options.rootDir !== undefined ? options.rootDir : defaults_1.DEFAULT_APPS_PATH;
+        scripts[defaultStartScriptName] = `node dist/${defaultSourceRoot}/${defaultAppName}/main`;
+    }
 }
 function updateJestOptions(jestOptions, options) {
     if (!jestOptions) {
@@ -157,21 +171,20 @@ function moveDefaultAppToApps(projectRoot, appName, sourceRoot = defaults_1.DEFA
         if (process.env.NODE_ENV === defaults_1.TEST_ENV) {
             return host;
         }
-        try {
-            if (fse.existsSync(sourceRoot)) {
-                fse.moveSync(sourceRoot, (0, core_1.join)(projectRoot, appName, sourceRoot));
-            }
-            const testDir = 'test';
-            if (fse.existsSync(testDir)) {
-                fse.moveSync(testDir, (0, core_1.join)(projectRoot, appName, testDir));
-            }
-        }
-        catch (err) {
-            throw new schematics_1.SchematicsException(`The "${projectRoot}" directory exists already.`);
-        }
+        const appDestination = (0, core_1.join)(projectRoot, appName);
+        moveDirectoryTo(sourceRoot, appDestination, host);
+        moveDirectoryTo('test', appDestination, host);
         return host;
     };
 }
+function moveDirectoryTo(srcDir, destination, tree) {
+    tree.getDir(srcDir).visit((filePath, file) => {
+        const newFilePath = (0, core_1.join)(destination, filePath);
+        tree.create(newFilePath, file.content);
+        tree.delete(filePath);
+    });
+    tree.delete(srcDir);
+}
 function addAppsToCliOptions(projectRoot, projectName, appName) {
     const rootPath = (0, core_1.join)(projectRoot, projectName);
     const project = {

package/dist/utils/json-file.util.d.ts

@@ -1,7 +1,7 @@
 import { JsonValue } from '@angular-devkit/core';
 import { Tree } from '@angular-devkit/schematics';
-export declare type InsertionIndex = (properties: string[]) => number;
-export declare type JSONPath = (string | number)[];
+export type InsertionIndex = (properties: string[]) => number;
+export type JSONPath = (string | number)[];
 export declare class JSONFile {
     private readonly host;
     private readonly path;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/schematics",
-  "version": "9.0.3",
+  "version": "9.1.0",
   "description": "Nest - modern, fast, powerful node.js web framework (@schematics)",
   "main": "dist/index.js",
   "files": [
@@ -41,36 +41,34 @@
   },
   "homepage": "https://github.com/nestjs/schematics#readme",
   "dependencies": {
-    "@angular-devkit/core": "14.2.1",
-    "@angular-devkit/schematics": "14.2.1",
-    "fs-extra": "10.1.0",
+    "@angular-devkit/core": "15.2.4",
+    "@angular-devkit/schematics": "15.2.4",
     "jsonc-parser": "3.2.0",
     "pluralize": "8.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "17.1.2",
-    "@commitlint/config-angular": "17.1.0",
-    "@types/fs-extra": "9.0.13",
-    "@types/jest": "28.1.8",
-    "@types/node": "16.11.56",
-    "@typescript-eslint/eslint-plugin": "5.36.1",
-    "@typescript-eslint/parser": "5.36.1",
+    "@commitlint/cli": "17.5.1",
+    "@commitlint/config-angular": "17.4.4",
+    "@types/jest": "29.5.0",
+    "@types/node": "18.15.11",
+    "@typescript-eslint/eslint-plugin": "5.57.0",
+    "@typescript-eslint/parser": "5.57.0",
     "cpx": "1.5.0",
-    "eslint": "8.23.0",
-    "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-import": "2.26.0",
+    "eslint": "8.37.0",
+    "eslint-config-prettier": "8.8.0",
+    "eslint-plugin-import": "2.27.5",
     "gulp": "4.0.2",
     "gulp-clean": "0.4.0",
-    "husky": "8.0.1",
-    "jest": "28.1.3",
+    "husky": "8.0.3",
+    "jest": "29.5.0",
     "nyc": "15.1.0",
-    "release-it": "15.4.1",
-    "ts-jest": "28.0.8",
+    "release-it": "15.9.3",
+    "ts-jest": "29.0.5",
     "ts-node": "10.9.1",
-    "typescript": "~4.7.4"
+    "typescript": "4.9.5"
   },
   "peerDependencies": {
-    "typescript": "^4.3.5"
+    "typescript": ">=4.3.5"
   },
   "schematics": "./dist/collection.json",
   "nyc": {