@nrwl/workspace - npm Package Compare versions

Comparing version 8.1.2 to 8.2.0-beta.1

bin/create-nx-workspace.js

@@ -22,9 +22,21 @@ #!/usr/bin/env node
 };
-var useYarn = true;
+var packageManager;
 try {
-    child_process_1.execSync('yarn --version', { stdio: ['ignore', 'ignore', 'ignore'] });
+    packageManager = child_process_1.execSync('ng config -g cli.packageManager', {
+        stdio: ['ignore', 'pipe', 'ignore']
+    })
+        .toString()
+        .trim();
 }
 catch (e) {
-    useYarn = false;
+    packageManager = 'yarn';
 }
+try {
+    child_process_1.execSync(packageManager + " --version", {
+        stdio: ['ignore', 'ignore', 'ignore']
+    });
+}
+catch (e) {
+    packageManager = 'npm';
+}
 var projectName = parsedArgs._[2];
@@ -39,3 +51,3 @@ // check that the workspace name is passed in
 var tmpDir = tmp_1.dirSync().name;
-var nxVersion = '8.1.2';
+var nxVersion = '8.2.0-beta.1';
 var cliVersion = '8.0.1';
@@ -51,8 +63,6 @@ var typescriptVersion = '~3.4.5';
 }));
-if (useYarn) {
-    child_process_1.execSync('yarn install --silent', { cwd: tmpDir, stdio: [0, 1, 2] });
-}
-else {
-    child_process_1.execSync('npm install --silent', { cwd: tmpDir, stdio: [0, 1, 2] });
-}
+child_process_1.execSync(packageManager + " install --silent", {
+    cwd: tmpDir,
+    stdio: [0, 1, 2]
+});
 var ɵ0 = function (a) { return "\"" + a + "\""; };
@@ -59,0 +69,0 @@ exports.ɵ0 = ɵ0;

bin/create-nx-workspace.metadata.json

@@ -1,1 +0,1 @@
-[{"__symbolic":"module","version":4,"metadata":{"ɵ0":{"__symbolic":"error","message":"Lambda not supported","line":80,"character":7}}}]
+[{"__symbolic":"module","version":4,"metadata":{"ɵ0":{"__symbolic":"error","message":"Lambda not supported","line":90,"character":7}}}]

migrations.json

 {
-  "schematics": {}
+  "schematics": {
+    "update-8.2.0": {
+      "version": "8.2.0-beta.1",
+      "description": "Add exclusions to lint config",
+      "factory": "./src/migrations/update-8-2-0/update-8-2-0"
+    }
+  }
 }

package.json

 {
   "name": "@nrwl/workspace",
-  "version": "8.1.2",
+  "version": "8.2.0-beta.1",
   "description": "Power-ups for Angular CLI",
@@ -47,3 +47,2 @@ "repository": {
     "@angular-devkit/schematics": "8.0.1",
-    "app-root-path": "^2.0.1",
     "cosmiconfig": "4.0.0",
@@ -50,0 +49,0 @@ "fs-extra": "6.0.0",

README.md

@@ -165,3 +165,3 @@ <p align="center"><img src="https://raw.githubusercontent.com/nrwl/nx/master/nx-logo.png" width="450"></p>
 
-- [5-minute video on how to get started with Nx.](http://nrwl.io/nx)
+- [Nx Quickstart - How to Scale a JavaScript Project](https://www.youtube.com/watch?v=VUyBY72mwrQ)
 - [Video course on using Nx Workspaces](https://angularplaybook.com/p/nx-workspaces)
@@ -168,0 +168,0 @@

src/command-line/deps-calculator.js

@@ -16,3 +16,2 @@ "use strict";
 var ts = require("typescript");
-var appRoot = require("app-root-path");
 var shared_1 = require("./shared");
@@ -22,2 +21,3 @@ var fs_1 = require("fs");
 var strip_source_code_1 = require("../utils/strip-source-code");
+var app_root_1 = require("../utils/app-root");
 var DependencyType;
@@ -30,6 +30,6 @@ (function (DependencyType) {
 function readDependencies(npmScope, projectNodes) {
-    var nxDepsPath = appRoot.path + "/dist/nxdeps.json";
+    var nxDepsPath = app_root_1.appRootPath + "/dist/nxdeps.json";
     var m = shared_1.lastModifiedAmongProjectFiles(projectNodes);
-    if (!fileutils_1.directoryExists(appRoot.path + "/dist")) {
-        fs_1.mkdirSync(appRoot.path + "/dist");
+    if (!fileutils_1.directoryExists(app_root_1.appRootPath + "/dist")) {
+        fs_1.mkdirSync(app_root_1.appRootPath + "/dist");
     }
@@ -39,3 +39,3 @@ var existingDeps = fileutils_1.fileExists(nxDepsPath) ? fileutils_1.readJsonFile(nxDepsPath) : null;
         return dependencies(npmScope, projectNodes, existingDeps, function (f) {
-            return fs_1.readFileSync(appRoot.path + "/" + f, 'UTF-8');
+            return fs_1.readFileSync(app_root_1.appRootPath + "/" + f, 'UTF-8');
         });
@@ -55,3 +55,3 @@ }
 function dependencies(npmScope, projects, existingDependencies, fileRead) {
-    var nxDepsPath = appRoot.path + "/dist/nxdeps.json";
+    var nxDepsPath = app_root_1.appRootPath + "/dist/nxdeps.json";
     var nxDepsExists = fileutils_1.fileExists(nxDepsPath);
@@ -58,0 +58,0 @@ var nxDepsMTime = nxDepsExists ? shared_1.mtime(nxDepsPath) : -Infinity;

src/command-line/format.js

@@ -53,3 +53,5 @@ "use strict";
         var libsAndApp = args.libsAndApps;
-        return libsAndApp ? getPatternsFromApps(patterns) : patterns;
+        return libsAndApp
+            ? getPatternsFromApps(patterns)
+            : patterns.map(function (f) { return "\"" + f + "\""; });
     }
@@ -56,0 +58,0 @@ catch (e) {

src/command-line/lint.js

@@ -5,4 +5,4 @@ "use strict";
 var workspace_integrity_checks_1 = require("./workspace-integrity-checks");
-var appRoot = require("app-root-path");
 var path = require("path");
+var app_root_1 = require("../utils/app-root");
 function lint() {
@@ -22,3 +22,3 @@ var nodes = shared_1.getProjectNodes(shared_1.readAngularJson(), shared_1.readNxJson());
 function readAllFilesFromAppsAndLibs() {
-    return shared_1.allFilesInDir(appRoot.path + "/apps").map(function (f) { return f.file; }).concat(shared_1.allFilesInDir(appRoot.path + "/libs").map(function (f) { return f.file; })).filter(function (f) { return !path.basename(f).startsWith('.'); });
+    return shared_1.allFilesInDir(app_root_1.appRootPath + "/apps").map(function (f) { return f.file; }).concat(shared_1.allFilesInDir(app_root_1.appRootPath + "/libs").map(function (f) { return f.file; })).filter(function (f) { return !path.basename(f).startsWith('.'); });
 }

src/command-line/shared.js

@@ -18,6 +18,6 @@ "use strict";
 var fs = require("fs");
-var appRoot = require("app-root-path");
 var fileutils_1 = require("../utils/fileutils");
 var deps_calculator_1 = require("./deps-calculator");
 var touched_1 = require("./touched");
+var app_root_1 = require("../utils/app-root");
 var ignore = require('ignore');
@@ -28,5 +28,5 @@ function readFileIfExisting(path) {
 var ig = ignore();
-ig.add(readFileIfExisting(appRoot.path + "/.gitignore"));
+ig.add(readFileIfExisting(app_root_1.appRootPath + "/.gitignore"));
 function printArgsWarning(options) {
-    var files = options.files, uncommitted = options.uncommitted, untracked = options.untracked, base = options.base, head = options.head;
+    var files = options.files, uncommitted = options.uncommitted, untracked = options.untracked, base = options.base, head = options.head, all = options.all;
     if (!files &&
@@ -37,5 +37,15 @@ !uncommitted &&
         !head &&
+        !all &&
         options._.length < 2) {
         console.log('Note: Nx defaulted to --base=master --head=HEAD');
     }
+    if (all) {
+        console.warn('****************************************************************************************');
+        console.warn('WARNING:');
+        console.warn('Running affected:* commands with --all can result in very slow builds.');
+        console.warn('It is not meant to be used for any sizable project or to be used in CI.');
+        console.warn('Read about rebuilding and retesting only what is affected here:');
+        console.warn('https://nx.dev/guides/monorepo-affected.');
+        console.warn('****************************************************************************************');
+    }
 }
@@ -207,3 +217,3 @@ exports.printArgsWarning = printArgsWarning;
         }
-        var filesWithMTimes = allFilesInDir(appRoot.path + "/" + p.root);
+        var filesWithMTimes = allFilesInDir(app_root_1.appRootPath + "/" + p.root);
         var fileMTimes = {};
@@ -236,7 +246,7 @@ filesWithMTimes.forEach(function (f) {
 function readAngularJson() {
-    return fileutils_1.readJsonFile(appRoot.path + "/angular.json");
+    return fileutils_1.readJsonFile(app_root_1.appRootPath + "/angular.json");
 }
 exports.readAngularJson = readAngularJson;
 function readNxJson() {
-    var config = fileutils_1.readJsonFile(appRoot.path + "/nx.json");
+    var config = fileutils_1.readJsonFile(app_root_1.appRootPath + "/nx.json");
     if (!config.npmScope) {
@@ -301,3 +311,3 @@ throw new Error("nx.json must define the npmScope property.");
     // Ignore .gitignored files
-    if (ig.ignores(path.relative(appRoot.path, dirName))) {
+    if (ig.ignores(path.relative(app_root_1.appRootPath, dirName))) {
         return [];
@@ -309,3 +319,3 @@ }
             var child = path.join(dirName, c);
-            if (ig.ignores(path.relative(appRoot.path, child))) {
+            if (ig.ignores(path.relative(app_root_1.appRootPath, child))) {
                 return;
@@ -318,3 +328,3 @@ }
                     res.push({
-                        file: normalizePath(path.relative(appRoot.path, child)),
+                        file: normalizePath(path.relative(app_root_1.appRootPath, child)),
                         mtime: s.mtimeMs
@@ -336,6 +346,6 @@ });
     return Math.max.apply(Math, projects.map(function (project) { return getProjectMTime(project); }).concat([
-        mtime(appRoot.path + "/angular.json"),
-        mtime(appRoot.path + "/nx.json"),
-        mtime(appRoot.path + "/tslint.json"),
-        mtime(appRoot.path + "/package.json")
+        mtime(app_root_1.appRootPath + "/angular.json"),
+        mtime(app_root_1.appRootPath + "/nx.json"),
+        mtime(app_root_1.appRootPath + "/tslint.json"),
+        mtime(app_root_1.appRootPath + "/package.json")
     ]));
@@ -342,0 +352,0 @@ }

src/command-line/shared.metadata.json

@@ -1,1 +0,1 @@
-[{"__symbolic":"module","version":4,"metadata":{"ImplicitDependencyEntry":{"__symbolic":"interface"},"NormalizedImplicitDependencyEntry":{"__symbolic":"interface"},"ImplicitDependencies":{"__symbolic":"interface"},"NxJson":{"__symbolic":"interface"},"NxJsonProjectConfig":{"__symbolic":"interface"},"printArgsWarning":{"__symbolic":"function"},"parseFiles":{"__symbolic":"function"},"getImplicitDependencies":{"__symbolic":"function"},"assertWorkspaceValidity":{"__symbolic":"function"},"getProjectNodes":{"__symbolic":"function"},"readAngularJson":{"__symbolic":"function","parameters":[],"value":{"__symbolic":"call","expression":{"__symbolic":"reference","module":"../utils/fileutils","name":"readJsonFile","line":331,"character":9},"arguments":[{"__symbolic":"binop","operator":"+","left":{"__symbolic":"reference","module":"app-root-path","name":"path","line":331,"character":25},"right":"/angular.json"}]}},"readNxJson":{"__symbolic":"function"},"getAffected":{"__symbolic":"error","message":"Lambda not supported","line":342,"character":27},"getAffectedProjectsWithTarget":{"__symbolic":"function","parameters":["target"],"value":{"__symbolic":"call","expression":{"__symbolic":"reference","name":"getAffected"},"arguments":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"./affected-apps","name":"affectedProjectNamesWithTarget","line":356,"character":21},"arguments":[{"__symbolic":"reference","name":"target"}]}]}},"getAffectedApps":{"__symbolic":"call","expression":{"__symbolic":"reference","name":"getAffected"},"arguments":[{"__symbolic":"reference","module":"./affected-apps","name":"affectedAppNames","line":358,"character":43}]},"getAffectedProjects":{"__symbolic":"call","expression":{"__symbolic":"reference","name":"getAffected"},"arguments":[{"__symbolic":"reference","module":"./affected-apps","name":"affectedProjectNames","line":359,"character":47}]},"getAffectedLibs":{"__symbolic":"call","expression":{"__symbolic":"reference","name":"getAffected"},"arguments":[{"__symbolic":"reference","module":"./affected-apps","name":"affectedLibNames","line":360,"character":43}]},"getAllAppNames":{"__symbolic":"function","parameters":[],"value":{"__symbolic":"call","expression":{"__symbolic":"reference","name":"getProjectNames"},"arguments":[{"__symbolic":"error","message":"Lambda not supported","line":363,"character":25}]}},"getAllLibNames":{"__symbolic":"function","parameters":[],"value":{"__symbolic":"call","expression":{"__symbolic":"reference","name":"getProjectNames"},"arguments":[{"__symbolic":"error","message":"Lambda not supported","line":367,"character":25}]}},"getAllProjectNamesWithTarget":{"__symbolic":"function","parameters":["target"],"value":{"__symbolic":"call","expression":{"__symbolic":"reference","name":"getProjectNames"},"arguments":[{"__symbolic":"error","message":"Lambda not supported","line":371,"character":25}]}},"getAllProjectsWithTarget":{"__symbolic":"function"},"getProjectNames":{"__symbolic":"function"},"getProjectRoots":{"__symbolic":"function"},"allFilesInDir":{"__symbolic":"function"},"lastModifiedAmongProjectFiles":{"__symbolic":"function","parameters":["projects"],"value":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"Math"},"member":"max"},"arguments":[{"__symbolic":"spread","expression":[{"__symbolic":"spread","expression":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"projects"},"member":"map"},"arguments":[{"__symbolic":"error","message":"Lambda not supported","line":435,"character":22}]}},{"__symbolic":"call","expression":{"__symbolic":"reference","name":"mtime"},"arguments":[{"__symbolic":"binop","operator":"+","left":{"__symbolic":"reference","module":"app-root-path","name":"path","line":436,"character":15},"right":"/angular.json"}]},{"__symbolic":"call","expression":{"__symbolic":"reference","name":"mtime"},"arguments":[{"__symbolic":"binop","operator":"+","left":{"__symbolic":"reference","module":"app-root-path","name":"path","line":437,"character":15},"right":"/nx.json"}]},{"__symbolic":"call","expression":{"__symbolic":"reference","name":"mtime"},"arguments":[{"__symbolic":"binop","operator":"+","left":{"__symbolic":"reference","module":"app-root-path","name":"path","line":438,"character":15},"right":"/tslint.json"}]},{"__symbolic":"call","expression":{"__symbolic":"reference","name":"mtime"},"arguments":[{"__symbolic":"binop","operator":"+","left":{"__symbolic":"reference","module":"app-root-path","name":"path","line":439,"character":15},"right":"/package.json"}]}]}]}},"getProjectMTime":{"__symbolic":"function","parameters":["project"],"value":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"Math"},"member":"max"},"arguments":[{"__symbolic":"spread","expression":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"Object"},"member":"values"},"arguments":[{"__symbolic":"select","expression":{"__symbolic":"reference","name":"project"},"member":"fileMTimes"}]}}]}},"mtime":{"__symbolic":"function"},"normalizedProjectRoot":{"__symbolic":"function","parameters":["p"],"value":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"p"},"member":"root"},"member":"split"},"arguments":["/"]},"member":"filter"},"arguments":[{"__symbolic":"error","message":"Lambda not supported","line":466,"character":12}]},"member":"slice"},"arguments":[1]},"member":"join"},"arguments":["/"]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"ImplicitDependencyEntry":{"__symbolic":"interface"},"NormalizedImplicitDependencyEntry":{"__symbolic":"interface"},"ImplicitDependencies":{"__symbolic":"interface"},"NxJson":{"__symbolic":"interface"},"NxJsonProjectConfig":{"__symbolic":"interface"},"printArgsWarning":{"__symbolic":"function"},"parseFiles":{"__symbolic":"function"},"getImplicitDependencies":{"__symbolic":"function"},"assertWorkspaceValidity":{"__symbolic":"function"},"getProjectNodes":{"__symbolic":"function"},"readAngularJson":{"__symbolic":"function","parameters":[],"value":{"__symbolic":"call","expression":{"__symbolic":"reference","module":"../utils/fileutils","name":"readJsonFile","line":352,"character":9},"arguments":[{"__symbolic":"binop","operator":"+","left":{"__symbolic":"reference","module":"../utils/app-root","name":"appRootPath","line":352,"character":25},"right":"/angular.json"}]}},"readNxJson":{"__symbolic":"function"},"getAffected":{"__symbolic":"error","message":"Lambda not supported","line":363,"character":27},"getAffectedProjectsWithTarget":{"__symbolic":"function","parameters":["target"],"value":{"__symbolic":"call","expression":{"__symbolic":"reference","name":"getAffected"},"arguments":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"./affected-apps","name":"affectedProjectNamesWithTarget","line":377,"character":21},"arguments":[{"__symbolic":"reference","name":"target"}]}]}},"getAffectedApps":{"__symbolic":"call","expression":{"__symbolic":"reference","name":"getAffected"},"arguments":[{"__symbolic":"reference","module":"./affected-apps","name":"affectedAppNames","line":379,"character":43}]},"getAffectedProjects":{"__symbolic":"call","expression":{"__symbolic":"reference","name":"getAffected"},"arguments":[{"__symbolic":"reference","module":"./affected-apps","name":"affectedProjectNames","line":380,"character":47}]},"getAffectedLibs":{"__symbolic":"call","expression":{"__symbolic":"reference","name":"getAffected"},"arguments":[{"__symbolic":"reference","module":"./affected-apps","name":"affectedLibNames","line":381,"character":43}]},"getAllAppNames":{"__symbolic":"function","parameters":[],"value":{"__symbolic":"call","expression":{"__symbolic":"reference","name":"getProjectNames"},"arguments":[{"__symbolic":"error","message":"Lambda not supported","line":384,"character":25}]}},"getAllLibNames":{"__symbolic":"function","parameters":[],"value":{"__symbolic":"call","expression":{"__symbolic":"reference","name":"getProjectNames"},"arguments":[{"__symbolic":"error","message":"Lambda not supported","line":388,"character":25}]}},"getAllProjectNamesWithTarget":{"__symbolic":"function","parameters":["target"],"value":{"__symbolic":"call","expression":{"__symbolic":"reference","name":"getProjectNames"},"arguments":[{"__symbolic":"error","message":"Lambda not supported","line":392,"character":25}]}},"getAllProjectsWithTarget":{"__symbolic":"function"},"getProjectNames":{"__symbolic":"function"},"getProjectRoots":{"__symbolic":"function"},"allFilesInDir":{"__symbolic":"function"},"lastModifiedAmongProjectFiles":{"__symbolic":"function","parameters":["projects"],"value":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"Math"},"member":"max"},"arguments":[{"__symbolic":"spread","expression":[{"__symbolic":"spread","expression":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"projects"},"member":"map"},"arguments":[{"__symbolic":"error","message":"Lambda not supported","line":456,"character":22}]}},{"__symbolic":"call","expression":{"__symbolic":"reference","name":"mtime"},"arguments":[{"__symbolic":"binop","operator":"+","left":{"__symbolic":"reference","module":"../utils/app-root","name":"appRootPath","line":457,"character":15},"right":"/angular.json"}]},{"__symbolic":"call","expression":{"__symbolic":"reference","name":"mtime"},"arguments":[{"__symbolic":"binop","operator":"+","left":{"__symbolic":"reference","module":"../utils/app-root","name":"appRootPath","line":458,"character":15},"right":"/nx.json"}]},{"__symbolic":"call","expression":{"__symbolic":"reference","name":"mtime"},"arguments":[{"__symbolic":"binop","operator":"+","left":{"__symbolic":"reference","module":"../utils/app-root","name":"appRootPath","line":459,"character":15},"right":"/tslint.json"}]},{"__symbolic":"call","expression":{"__symbolic":"reference","name":"mtime"},"arguments":[{"__symbolic":"binop","operator":"+","left":{"__symbolic":"reference","module":"../utils/app-root","name":"appRootPath","line":460,"character":15},"right":"/package.json"}]}]}]}},"getProjectMTime":{"__symbolic":"function","parameters":["project"],"value":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"Math"},"member":"max"},"arguments":[{"__symbolic":"spread","expression":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"Object"},"member":"values"},"arguments":[{"__symbolic":"select","expression":{"__symbolic":"reference","name":"project"},"member":"fileMTimes"}]}}]}},"mtime":{"__symbolic":"function"},"normalizedProjectRoot":{"__symbolic":"function","parameters":["p"],"value":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"p"},"member":"root"},"member":"split"},"arguments":["/"]},"member":"filter"},"arguments":[{"__symbolic":"error","message":"Lambda not supported","line":487,"character":12}]},"member":"slice"},"arguments":[1]},"member":"join"},"arguments":["/"]}}}}]

src/command-line/workspace-schematic.js

@@ -53,3 +53,2 @@ "use strict";
 var tools_1 = require("@angular-devkit/schematics/tools");
-var appRoot = require("app-root-path");
 var child_process_1 = require("child_process");
@@ -62,3 +61,5 @@ var fs = require("fs");
 var yargsParser = require("yargs-parser");
-var rootDirectory = appRoot.path;
+var fileutils_1 = require("../utils/fileutils");
+var app_root_1 = require("../utils/app-root");
+var rootDirectory = app_root_1.appRootPath;
 function workspaceSchematic(args) {
@@ -129,3 +130,3 @@ var parsedArgs = parseOptions(args);
     return new tools_1.NodeWorkflow(host, {
-        packageManager: fileExists('yarn.lock') ? 'yarn' : 'npm',
+        packageManager: detectPackageManager(),
         root: root,
@@ -135,2 +136,19 @@ dryRun: dryRun
 }
+function detectPackageManager() {
+    try {
+        var packageManager = child_process_1.execSync("ng config cli.packageManager", {
+            stdio: ['ignore', 'pipe', 'ignore']
+        })
+            .toString()
+            .trim();
+        return packageManager;
+    }
+    catch (e) {
+        return fileutils_1.fileExists('yarn.lock')
+            ? 'yarn'
+            : fileutils_1.fileExists('pnpm-lock.yaml')
+                ? 'pnpm'
+                : 'npm';
+    }
+}
 function listSchematics(collectionName, logger) {
@@ -287,9 +305,1 @@ try {
 }
-function fileExists(filePath) {
-    try {
-        return fs_1.statSync(filePath).isFile();
-    }
-    catch (err) {
-        return false;
-    }
-}

src/schematics/library/library.js

@@ -27,3 +27,6 @@ "use strict";
                 tsConfig: [path_1.join(path_1.normalize(options.projectRoot), 'tsconfig.lib.json')],
-                exclude: ['**/node_modules/**']
+                exclude: [
+                    '**/node_modules/**',
+                    '!' + path_1.join(path_1.normalize(options.projectRoot), '**')
+                ]
             }
@@ -30,0 +33,0 @@ };

src/schematics/library/library.spec.js

@@ -63,3 +63,3 @@ "use strict";
                             options: {
-                                exclude: ['**/node_modules/**'],
+                                exclude: ['**/node_modules/**', '!libs/my-lib/**'],
                                 tsConfig: [
@@ -243,3 +243,3 @@ 'libs/my-lib/tsconfig.lib.json',
                             options: {
-                                exclude: ['**/node_modules/**'],
+                                exclude: ['**/node_modules/**', '!libs/my-dir/my-lib/**'],
                                 tsConfig: [
@@ -246,0 +246,0 @@ 'libs/my-dir/my-lib/tsconfig.lib.json',

src/schematics/library/schema.json

 {
   "$schema": "http://json-schema.org/schema",
-  "id": "NxReactLibrary",
-  "title": "Create a React Library for Nx",
+  "id": "Typescript library",
+  "title": "Create a TypeScript Library",
   "type": "object",
@@ -29,4 +29,3 @@ "properties": {
       "type": "string",
-      "description": "Add tags to the library (used for linting)",
-      "x-prompt": "Which tags would you like to add to the library? (used for linting)"
+      "description": "Add tags to the library (used for linting)"
     },
@@ -33,0 +32,0 @@ "skipFormat": {

src/schematics/ng-add/ng-add.js

@@ -245,2 +245,3 @@ "use strict";
     tsconfig.compilerOptions.baseUrl = '.';
+    tsconfig.compilerOptions.rootDir = '.';
     return tsconfig;
@@ -247,0 +248,0 @@ }

src/tslint/nxEnforceModuleBoundariesRule.js

@@ -29,6 +29,6 @@ "use strict";
 var Lint = require("tslint");
-var appRoot = require("app-root-path");
 var shared_1 = require("../command-line/shared");
 var affected_apps_1 = require("../command-line/affected-apps");
 var deps_calculator_1 = require("../command-line/deps-calculator");
+var app_root_1 = require("../utils/app-root");
 var Rule = /** @class */ (function (_super) {
@@ -43,3 +43,3 @@ __extends(Rule, _super);
         if (!projectPath) {
-            _this.projectPath = appRoot.path;
+            _this.projectPath = app_root_1.appRootPath;
             if (!global.projectNodes) {
@@ -46,0 +46,0 @@ var angularJson = shared_1.readAngularJson();

src/utils/ast-utils.js

@@ -15,2 +15,3 @@ "use strict";
 var ts = require("typescript");
+var stripJsonComments = require("strip-json-comments");
 var fileutils_1 = require("./fileutils");
@@ -300,3 +301,3 @@ var tasks_1 = require("@angular-devkit/schematics/tasks");
     }
-    var contents = host.read(path).toString('utf-8');
+    var contents = stripJsonComments(host.read(path).toString('utf-8'));
     try {
@@ -303,0 +304,0 @@ return JSON.parse(contents);

src/utils/ast-utils.metadata.json

@@ -1,1 +0,1 @@
-[{"__symbolic":"module","version":4,"metadata":{"findNodes":{"__symbolic":"function"},"getSourceNodes":{"__symbolic":"function"},"Change":{"__symbolic":"interface"},"NoopChange":{"__symbolic":"class","members":{"apply":[{"__symbolic":"method"}]}},"InsertChange":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"string"}]}],"apply":[{"__symbolic":"method"}]}},"RemoveChange":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"string"}]}],"apply":[{"__symbolic":"method"}]}},"ReplaceChange":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"string"}]}],"apply":[{"__symbolic":"method"}]}},"addParameterToConstructor":{"__symbolic":"function"},"addMethod":{"__symbolic":"function"},"findClass":{"__symbolic":"function"},"offset":{"__symbolic":"function"},"addIncludeToTsConfig":{"__symbolic":"function"},"getImport":{"__symbolic":"function"},"addGlobal":{"__symbolic":"function"},"insert":{"__symbolic":"function"},"readJsonInTree":{"__symbolic":"function"},"updateJsonInTree":{"__symbolic":"function","parameters":["path","callback"],"value":{"__symbolic":"error","message":"Lambda not supported","line":381,"character":9}},"addDepsToPackageJson":{"__symbolic":"function","parameters":["deps","devDeps","addInstall"],"value":{"__symbolic":"call","expression":{"__symbolic":"reference","name":"updateJsonInTree"},"arguments":["package.json",{"__symbolic":"error","message":"Lambda not supported","line":401,"character":42}]},"defaults":[null,null,true]},"getProjectConfig":{"__symbolic":"function"},"createOrUpdate":{"__symbolic":"function"},"insertImport":{"__symbolic":"function"},"replaceNodeValue":{"__symbolic":"function"}}}]
+[{"__symbolic":"module","version":4,"metadata":{"findNodes":{"__symbolic":"function"},"getSourceNodes":{"__symbolic":"function"},"Change":{"__symbolic":"interface"},"NoopChange":{"__symbolic":"class","members":{"apply":[{"__symbolic":"method"}]}},"InsertChange":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"string"}]}],"apply":[{"__symbolic":"method"}]}},"RemoveChange":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"string"}]}],"apply":[{"__symbolic":"method"}]}},"ReplaceChange":{"__symbolic":"class","members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"number"},{"__symbolic":"reference","name":"string"},{"__symbolic":"reference","name":"string"}]}],"apply":[{"__symbolic":"method"}]}},"addParameterToConstructor":{"__symbolic":"function"},"addMethod":{"__symbolic":"function"},"findClass":{"__symbolic":"function"},"offset":{"__symbolic":"function"},"addIncludeToTsConfig":{"__symbolic":"function"},"getImport":{"__symbolic":"function"},"addGlobal":{"__symbolic":"function"},"insert":{"__symbolic":"function"},"readJsonInTree":{"__symbolic":"function"},"updateJsonInTree":{"__symbolic":"function","parameters":["path","callback"],"value":{"__symbolic":"error","message":"Lambda not supported","line":382,"character":9}},"addDepsToPackageJson":{"__symbolic":"function","parameters":["deps","devDeps","addInstall"],"value":{"__symbolic":"call","expression":{"__symbolic":"reference","name":"updateJsonInTree"},"arguments":["package.json",{"__symbolic":"error","message":"Lambda not supported","line":402,"character":42}]},"defaults":[null,null,true]},"getProjectConfig":{"__symbolic":"function"},"createOrUpdate":{"__symbolic":"function"},"insertImport":{"__symbolic":"function"},"replaceNodeValue":{"__symbolic":"function"}}}]

src/utils/ast-utils.spec.js

@@ -19,2 +19,6 @@ "use strict";
     });
+    it('should handle json files with comments', function () {
+        tree.create('data.json', "{\n      // data: 'data'\n      }");
+        expect(ast_utils_1.readJsonInTree(tree, 'data.json')).toEqual({});
+    });
     it('should throw an error if the file does not exist', function () {
@@ -21,0 +25,0 @@ expect(function () { return ast_utils_1.readJsonInTree(tree, 'data.json'); }).toThrow('Cannot find data.json');

src/utils/rules/format-files.js

@@ -51,5 +51,6 @@ "use strict";
 var prettier_1 = require("prettier");
-var appRoot = require("app-root-path");
 var rxjs_1 = require("rxjs");
 var operators_1 = require("rxjs/operators");
+var path = require("path");
+var app_root_1 = require("../app-root");
 function formatFiles(options) {
@@ -76,3 +77,3 @@ var _this = this;
                     case 0:
-                        systemPath = appRoot.resolve(file.path);
+                        systemPath = path.join(app_root_1.appRootPath, file.path);
                         options = {
@@ -79,0 +80,0 @@ filepath: systemPath

src/utils/testing.d.ts

@@ -1,2 +0,4 @@
-import { Tree } from '@angular-devkit/schematics';
+import { Rule, Tree } from '@angular-devkit/schematics';
 export declare function runSchematic(schematicName: string, options: any, tree: Tree): Promise<import("@angular-devkit/schematics/testing").UnitTestTree>;
+export declare function callRule(rule: Rule, tree: Tree): Promise<import("@angular-devkit/schematics/src/tree/interface").Tree>;
+export declare function runMigration(migrationName: string, options: any, tree: Tree): Promise<import("@angular-devkit/schematics/testing").UnitTestTree>;

src/utils/testing.js

@@ -6,2 +6,3 @@ "use strict";
 var testRunner = new testing_1.SchematicTestRunner('@nrwl/workspace', path_1.join(__dirname, '../../collection.json'));
+var migrationTestRunner = new testing_1.SchematicTestRunner('@nrwl/workspace/migrations', path_1.join(__dirname, '../../migrations.json'));
 function runSchematic(schematicName, options, tree) {
@@ -11,1 +12,11 @@ return testRunner.runSchematicAsync(schematicName, options, tree).toPromise();
 exports.runSchematic = runSchematic;
+function callRule(rule, tree) {
+    return testRunner.callRule(rule, tree).toPromise();
+}
+exports.callRule = callRule;
+function runMigration(migrationName, options, tree) {
+    return migrationTestRunner
+        .runSchematicAsync(migrationName, options, tree)
+        .toPromise();
+}
+exports.runMigration = runMigration;

src/utils/testing.metadata.json

@@ -1,1 +0,1 @@
-[{"__symbolic":"module","version":4,"metadata":{"runSchematic":{"__symbolic":"function","parameters":["schematicName","options","tree"],"value":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular-devkit/schematics/testing","name":"SchematicTestRunner","line":4,"character":23},"arguments":["@nrwl/workspace",{"__symbolic":"call","expression":{"__symbolic":"reference","module":"path","name":"join","line":6,"character":2},"arguments":[{"__symbolic":"reference","name":"__dirname"},"../../collection.json"]}]},"member":"runSchematicAsync"},"arguments":[{"__symbolic":"reference","name":"schematicName"},{"__symbolic":"reference","name":"options"},{"__symbolic":"reference","name":"tree"}]},"member":"toPromise"}}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"runSchematic":{"__symbolic":"function","parameters":["schematicName","options","tree"],"value":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular-devkit/schematics/testing","name":"SchematicTestRunner","line":4,"character":23},"arguments":["@nrwl/workspace",{"__symbolic":"call","expression":{"__symbolic":"reference","module":"path","name":"join","line":6,"character":2},"arguments":[{"__symbolic":"reference","name":"__dirname"},"../../collection.json"]}]},"member":"runSchematicAsync"},"arguments":[{"__symbolic":"reference","name":"schematicName"},{"__symbolic":"reference","name":"options"},{"__symbolic":"reference","name":"tree"}]},"member":"toPromise"}}},"callRule":{"__symbolic":"function","parameters":["rule","tree"],"value":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular-devkit/schematics/testing","name":"SchematicTestRunner","line":4,"character":23},"arguments":["@nrwl/workspace",{"__symbolic":"call","expression":{"__symbolic":"reference","module":"path","name":"join","line":6,"character":2},"arguments":[{"__symbolic":"reference","name":"__dirname"},"../../collection.json"]}]},"member":"callRule"},"arguments":[{"__symbolic":"reference","name":"rule"},{"__symbolic":"reference","name":"tree"}]},"member":"toPromise"}}},"runMigration":{"__symbolic":"function","parameters":["migrationName","options","tree"],"value":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"call","expression":{"__symbolic":"select","expression":{"__symbolic":"new","expression":{"__symbolic":"reference","module":"@angular-devkit/schematics/testing","name":"SchematicTestRunner","line":9,"character":32},"arguments":["@nrwl/workspace/migrations",{"__symbolic":"call","expression":{"__symbolic":"reference","module":"path","name":"join","line":11,"character":2},"arguments":[{"__symbolic":"reference","name":"__dirname"},"../../migrations.json"]}]},"member":"runSchematicAsync"},"arguments":[{"__symbolic":"reference","name":"migrationName"},{"__symbolic":"reference","name":"options"},{"__symbolic":"reference","name":"tree"}]},"member":"toPromise"}}}}}]

src/utils/versions.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nxVersion = '8.1.2';
+exports.nxVersion = '8.2.0-beta.1';
 exports.angularCliVersion = '8.0.0';
 exports.typescriptVersion = '~3.4.5';
 exports.prettierVersion = '1.16.4';

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

487963

increased by2.39%

Dependency count

16

decreased by-5.88%

Number of package files

210

increased by3.96%

Lines of code

10618

increased by1.87%

Worsened metrics

Number of low quality alerts

1

increased byInfinity%

Dependency changes

• - Removedapp-root-path@^2.0.1

• - Removedapp-root-path@2.2.1(transitive)