@nx/angular 16.8.0-beta.3 → 16.8.0-beta.5

package/src/utils/nx-devkit/ast-utils.js

@@ -385,7 +385,7 @@ function getListOfRoutes(source) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
     const imports = getMatchingProperty(source, 'imports', 'NgModule', '@angular/core');
-    if ((imports === null || imports === void 0 ? void 0 : imports.initializer.kind) === tsModule.SyntaxKind.ArrayLiteralExpression) {
+    if (imports?.initializer.kind === tsModule.SyntaxKind.ArrayLiteralExpression) {
         const a = imports.initializer;
         for (const e of a.elements) {
             if (e.kind === tsModule.SyntaxKind.CallExpression) {
@@ -415,9 +415,8 @@ function getListOfRoutes(source) {
     return null;
 }
 function isNgStandaloneApp(tree, projectName) {
-    var _a, _b, _c;
     const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-    const mainFile = (_c = (_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.main;
+    const mainFile = project.targets?.build?.options?.main;
     if (project.projectType !== 'application' || !mainFile) {
         return false;
     }

package/src/utils/nx-devkit/testing.js

@@ -17,7 +17,7 @@ function createApp(tree, appName, routing = true) {
     // save for getAppDir() lookup by external *.spec.ts tests
     appConfig = {
         appName,
-        appModule: `/apps/${appName}/src/app/app.module.ts`,
+        appModule: `${appName}/src/app/app.module.ts`,
     };
     tree.write(appConfig.appModule, `
      import { NgModule } from '@angular/core';
@@ -31,7 +31,7 @@ function createApp(tree, appName, routing = true) {
      })
      export class AppModule {}
   `);
-    tree.write(`/apps/${appName}/src/main.ts`, `
+    tree.write(`${appName}/src/main.ts`, `
     import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
     import { AppModule } from './app/app.module';
@@ -40,19 +40,19 @@ function createApp(tree, appName, routing = true) {
       .bootstrapModule(AppModule)
       .catch(err => console.log(err));
   `);
-    tree.write(`/apps/${appName}/tsconfig.app.json`, JSON.stringify({
+    tree.write(`${appName}/tsconfig.app.json`, JSON.stringify({
         include: ['**/*.ts'],
     }));
-    tree.write(`/apps/${appName}-e2e/tsconfig.e2e.json`, JSON.stringify({
+    tree.write(`${appName}-e2e/tsconfig.e2e.json`, JSON.stringify({
         include: ['../**/*.ts'],
     }));
     (0, devkit_1.addProjectConfiguration)(tree, appName, {
-        root: `apps/${appName}`,
-        sourceRoot: `apps/${appName}/src`,
+        root: `${appName}`,
+        sourceRoot: `${appName}/src`,
         targets: {
             build: {
                 options: {
-                    main: `apps/${appName}/src/main.ts`,
+                    main: `${appName}/src/main.ts`,
                 },
             },
             serve: {
@@ -67,8 +67,8 @@ function createLib(tree, libName) {
     const { name, className, fileName, propertyName } = (0, devkit_1.names)(libName);
     libConfig = {
         name,
-        module: `/libs/${propertyName}/src/lib/${fileName}.module.ts`,
-        barrel: `/libs/${propertyName}/src/index.ts`,
+        module: `${propertyName}/src/lib/${fileName}.module.ts`,
+        barrel: `${propertyName}/src/index.ts`,
     };
     tree.write(libConfig.module, `
       import { NgModule } from '@angular/core';

package/src/utils/version-utils.js

@@ -6,16 +6,14 @@ const backward_compatible_versions_1 = require("./backward-compatible-versions")
 const versions = require("./versions");
 const versions_1 = require("./versions");
 function getPkgVersionForAngularMajorVersion(pkgVersionName, angularMajorVersion) {
-    var _a, _b;
     return angularMajorVersion < (0, semver_1.major)((0, semver_1.coerce)(versions_1.angularVersion))
-        ? (_b = (_a = backward_compatible_versions_1.backwardCompatibleVersions[`angularV${angularMajorVersion}`]) === null || _a === void 0 ? void 0 : _a[pkgVersionName]) !== null && _b !== void 0 ? _b : versions[pkgVersionName]
+        ? backward_compatible_versions_1.backwardCompatibleVersions[`angularV${angularMajorVersion}`]?.[pkgVersionName] ?? versions[pkgVersionName]
         : versions[pkgVersionName];
 }
 exports.getPkgVersionForAngularMajorVersion = getPkgVersionForAngularMajorVersion;
 function getPkgVersionsForAngularMajorVersion(angularMajorVersion) {
-    var _a;
     return angularMajorVersion < (0, semver_1.major)((0, semver_1.coerce)(versions_1.angularVersion))
-        ? (_a = backward_compatible_versions_1.backwardCompatibleVersions[`angularV${angularMajorVersion}`]) !== null && _a !== void 0 ? _a : versions
+        ? backward_compatible_versions_1.backwardCompatibleVersions[`angularV${angularMajorVersion}`] ?? versions
         : versions;
 }
 exports.getPkgVersionsForAngularMajorVersion = getPkgVersionsForAngularMajorVersion;

package/src/utils/versions.d.ts

@@ -24,3 +24,4 @@ export declare const tsNodeVersion = "10.9.1";
 export declare const jestPresetAngularVersion = "~13.1.0";
 export declare const typesNodeVersion = "16.11.7";
 export declare const jasmineMarblesVersion = "^0.9.2";
+export declare const jsoncEslintParserVersion = "^2.1.0";

package/src/utils/versions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssPresetEnvVersion = exports.postcssImportVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.moduleFederationNodeVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.ngUniversalVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
+exports.jsoncEslintParserVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssPresetEnvVersion = exports.postcssImportVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.moduleFederationNodeVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.ngUniversalVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.angularVersion = '~16.2.0';
 exports.angularDevkitVersion = '~16.2.0';
@@ -27,3 +27,4 @@ exports.tsNodeVersion = '10.9.1';
 exports.jestPresetAngularVersion = '~13.1.0';
 exports.typesNodeVersion = '16.11.7';
 exports.jasmineMarblesVersion = '^0.9.2';
+exports.jsoncEslintParserVersion = '^2.1.0';