@nrwl/angular 14.4.0-beta.1 → 14.4.0-beta.6

package/src/generators/utils/path.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pathStartsWith = void 0;
+exports.getRelativeImportToFile = exports.pathStartsWith = void 0;
+const devkit_1 = require("@nrwl/devkit");
 const path_1 = require("path");
 function pathStartsWith(path1, path2) {
     path1 = (0, path_1.normalize)(path1).replace(/\\/g, '/');
@@ -8,4 +9,9 @@ function pathStartsWith(path1, path2) {
     return path1.startsWith(path2);
 }
 exports.pathStartsWith = pathStartsWith;
+function getRelativeImportToFile(sourceFilePath, targetFilePath) {
+    const relativeDirToTarget = (0, path_1.relative)((0, path_1.dirname)(sourceFilePath), (0, path_1.dirname)(targetFilePath));
+    return `./${(0, devkit_1.joinPathFragments)(relativeDirToTarget, (0, path_1.basename)(targetFilePath, '.ts'))}`;
+}
+exports.getRelativeImportToFile = getRelativeImportToFile;
 //# sourceMappingURL=path.js.map

package/src/generators/utils/path.js.map

@@ -1 +1 @@
-{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/path.ts"],"names":[],"mappings":";;;AAAA,+BAAiC;AAEjC,SAAgB,cAAc,CAAC,KAAa,EAAE,KAAa;IACzD,KAAK,GAAG,IAAA,gBAAS,EAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC7C,KAAK,GAAG,IAAA,gBAAS,EAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAE7C,OAAO,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC;AALD,wCAKC"}
+{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/path.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AACjD,+BAA8D;AAE9D,SAAgB,cAAc,CAAC,KAAa,EAAE,KAAa;IACzD,KAAK,GAAG,IAAA,gBAAS,EAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC7C,KAAK,GAAG,IAAA,gBAAS,EAAC,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAE7C,OAAO,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC;AALD,wCAKC;AAED,SAAgB,uBAAuB,CACrC,cAAsB,EACtB,cAAsB;IAEtB,MAAM,mBAAmB,GAAG,IAAA,eAAQ,EAClC,IAAA,cAAO,EAAC,cAAc,CAAC,EACvB,IAAA,cAAO,EAAC,cAAc,CAAC,CACxB,CAAC;IAEF,OAAO,KAAK,IAAA,0BAAiB,EAC3B,mBAAmB,EACnB,IAAA,eAAQ,EAAC,cAAc,EAAE,KAAK,CAAC,CAChC,EAAE,CAAC;AACN,CAAC;AAbD,0DAaC"}

package/src/utils/versions.d.ts

@@ -6,7 +6,7 @@ export declare const angularJsVersion = "1.7.9";
 export declare const ngrxVersion = "~14.0.0";
 export declare const rxjsVersion = "~7.4.0";
 export declare const jestPresetAngularVersion = "~11.1.2";
-export declare const angularEslintVersion = "~13.2.1";
+export declare const angularEslintVersion = "~14.0.0";
 export declare const tailwindVersion = "^3.0.2";
 export declare const postcssVersion = "^8.4.5";
 export declare const autoprefixerVersion = "^10.4.0";

package/src/utils/versions.js

@@ -9,7 +9,7 @@ exports.angularJsVersion = '1.7.9';
 exports.ngrxVersion = '~14.0.0';
 exports.rxjsVersion = '~7.4.0';
 exports.jestPresetAngularVersion = '~11.1.2';
-exports.angularEslintVersion = '~13.2.1';
+exports.angularEslintVersion = '~14.0.0';
 exports.tailwindVersion = '^3.0.2';
 exports.postcssVersion = '^8.4.5';
 exports.autoprefixerVersion = '^10.4.0';

package/src/generators/component/lib/path.d.ts

@@ -1 +0,0 @@
-export declare function getRelativeImportToFile(sourceFilePath: string, targetFilePath: string): string;

package/src/generators/component/lib/path.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRelativeImportToFile = void 0;
-const devkit_1 = require("@nrwl/devkit");
-const path_1 = require("path");
-function getRelativeImportToFile(sourceFilePath, targetFilePath) {
-    const relativeDirToTarget = (0, path_1.relative)((0, path_1.dirname)(sourceFilePath), (0, path_1.dirname)(targetFilePath));
-    return `./${(0, devkit_1.joinPathFragments)(relativeDirToTarget, (0, path_1.basename)(targetFilePath, '.ts'))}`;
-}
-exports.getRelativeImportToFile = getRelativeImportToFile;
-//# sourceMappingURL=path.js.map

package/src/generators/component/lib/path.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/lib/path.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AACjD,+BAAmD;AAEnD,SAAgB,uBAAuB,CACrC,cAAsB,EACtB,cAAsB;IAEtB,MAAM,mBAAmB,GAAG,IAAA,eAAQ,EAClC,IAAA,cAAO,EAAC,cAAc,CAAC,EACvB,IAAA,cAAO,EAAC,cAAc,CAAC,CACxB,CAAC;IAEF,OAAO,KAAK,IAAA,0BAAiB,EAC3B,mBAAmB,EACnB,IAAA,eAAQ,EAAC,cAAc,EAAE,KAAK,CAAC,CAChC,EAAE,CAAC;AACN,CAAC;AAbD,0DAaC"}

package/src/generators/scam/lib/create-module.d.ts

@@ -1,3 +0,0 @@
-import { Tree } from '@nrwl/devkit';
-import type { Schema } from '../schema';
-export declare function createScam(tree: Tree, schema: Schema): void;

package/src/generators/scam/lib/create-module.js

@@ -1,90 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createScam = void 0;
-const devkit_1 = require("@nrwl/devkit");
-const devkit_2 = require("@nrwl/devkit");
-const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
-const typescript_1 = require("typescript");
-function createScam(tree, schema) {
-    var _a, _b, _c;
-    const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0, devkit_2.readWorkspaceConfiguration)(tree).defaultProject;
-    const projectConfig = (0, devkit_2.readProjectConfiguration)(tree, project);
-    const componentNames = (0, devkit_2.names)(schema.name);
-    const typeNames = (0, devkit_2.names)((_b = schema.type) !== null && _b !== void 0 ? _b : 'component');
-    const componentFileName = `${componentNames.fileName}.${(_c = schema.type) !== null && _c !== void 0 ? _c : 'component'}`;
-    let componentDirectory = schema.flat
-        ? (0, devkit_2.joinPathFragments)(projectConfig.sourceRoot, projectConfig.projectType === 'application' ? 'app' : 'lib')
-        : (0, devkit_2.joinPathFragments)(projectConfig.sourceRoot, projectConfig.projectType === 'application' ? 'app' : 'lib', componentNames.fileName);
-    if (schema.path) {
-        componentDirectory = schema.flat
-            ? (0, devkit_2.normalizePath)(schema.path)
-            : (0, devkit_2.joinPathFragments)(schema.path, componentNames.fileName);
-    }
-    const componentFilePath = (0, devkit_2.joinPathFragments)(componentDirectory, `${componentFileName}.ts`);
-    if (!tree.exists(componentFilePath)) {
-        throw new Error(`Couldn't find component at path ${componentFilePath} to add SCAM setup.`);
-    }
-    if (schema.inlineScam) {
-        const currentComponentContents = tree.read(componentFilePath, 'utf-8');
-        let source = (0, typescript_1.createSourceFile)(componentFilePath, currentComponentContents, typescript_1.ScriptTarget.Latest, true);
-        source = (0, ast_utils_1.insertImport)(tree, source, componentFilePath, 'NgModule', '@angular/core');
-        source = (0, ast_utils_1.insertImport)(tree, source, componentFilePath, 'CommonModule', '@angular/common');
-        let updatedComponentSource = source.getText();
-        updatedComponentSource = `${updatedComponentSource}${createAngularComponentModule(`${componentNames.className}${typeNames.className}`)}`;
-        tree.write(componentFilePath, updatedComponentSource);
-        exportScam(tree, schema, componentFilePath);
-        return;
-    }
-    const scamFilePath = (0, devkit_2.joinPathFragments)(componentDirectory, `${componentNames.fileName}.module.ts`);
-    tree.write(scamFilePath, createSeparateAngularComponentModuleFile(`${componentNames.className}${typeNames.className}`, componentFileName));
-    exportScam(tree, schema, scamFilePath);
-}
-exports.createScam = createScam;
-function exportScam(tree, schema, scamFilePath) {
-    var _a, _b;
-    if (!schema.export) {
-        return;
-    }
-    const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0, devkit_2.readWorkspaceConfiguration)(tree).defaultProject;
-    const { root, sourceRoot, projectType } = (0, devkit_2.readProjectConfiguration)(tree, project);
-    if (projectType === 'application') {
-        devkit_1.logger.warn('--export=true was ignored as the project the SCAM is being generated in is not a library.');
-        return;
-    }
-    const ngPackageJsonPath = (0, devkit_2.joinPathFragments)(root, 'ng-package.json');
-    const ngPackageEntryPoint = tree.exists(ngPackageJsonPath)
-        ? (_b = (0, devkit_1.readJson)(tree, ngPackageJsonPath).lib) === null || _b === void 0 ? void 0 : _b.entryFile
-        : undefined;
-    const projectEntryPoint = ngPackageEntryPoint
-        ? (0, devkit_2.joinPathFragments)(root, ngPackageEntryPoint)
-        : (0, devkit_2.joinPathFragments)(sourceRoot, `index.ts`);
-    if (!tree.exists(projectEntryPoint)) {
-        // Let's not error, simply warn the user
-        // It's not too much effort to manually do this
-        // It would be more frustrating to have to find the correct path and re-run the command
-        devkit_1.logger.warn(`Could not export SCAM. Unable to determine project's entry point. Path ${projectEntryPoint} does not exist. SCAM has still been created.`);
-        return;
-    }
-    const relativePathFromEntryPoint = `.${scamFilePath
-        .split(sourceRoot)[1]
-        .replace('.ts', '')}`;
-    const updateEntryPointContent = `${tree.read(projectEntryPoint, 'utf-8')}
-  export * from "${relativePathFromEntryPoint}";`;
-    tree.write(projectEntryPoint, updateEntryPointContent);
-}
-function createAngularComponentModule(name) {
-    return `
-@NgModule({
-  imports: [CommonModule],
-  declarations: [${name}],
-  exports: [${name}],
-})
-export class ${name}Module {}`;
-}
-function createSeparateAngularComponentModuleFile(name, componentFileName) {
-    return `import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { ${name} } from './${componentFileName}';
-${createAngularComponentModule(name)}`;
-}
-//# sourceMappingURL=create-module.js.map

package/src/generators/scam/lib/create-module.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"create-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam/lib/create-module.ts"],"names":[],"mappings":"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"}