feat(core): remove angular devkit deps

nrwl · Jan 25, 2021 · a25e081 · a25e081
1 parent 7dd44c1
commit a25e081
Show file tree

Hide file tree

Showing 211 changed files with 334 additions and 281 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -3,7 +3,7 @@ tmp
 /build
 node_modules
 /package.json
-packages/workspace/src/schematics/**/files/**/*.json
+packages/workspace/src/generators/**/files/**/*.json
 packages/workspace/src/core/dep-graph/vendor.js
 packages/angular/src/schematics/**/files/**/*.json
 packages/angular/src/migrations/**/files/**/*.json

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/nx-source",
-  "version": "11.99.0",
+  "version": "11.1.5",
   "description": "Extensible Dev Tools for Monorepos",
   "homepage": "https://nx.dev",
   "main": "index.js",
@@ -281,4 +281,4 @@
   "resolutions": {
     "ng-packagr/rxjs": "6.6.3"
   }
-}
+}
diff --git a/packages/angular/src/schematics/move/lib/update-module-name.ts b/packages/angular/src/schematics/move/lib/update-module-name.ts
@@ -1,7 +1,7 @@
 import { classify } from '@angular-devkit/core/src/utils/strings';
 import { SchematicContext, Tree } from '@angular-devkit/schematics';
 import { getWorkspace } from '@nrwl/workspace';
-import { getNewProjectName } from '@nrwl/workspace/src/schematics/move/lib/utils';
+import { getNewProjectName } from '@nrwl/workspace/src/generators/move/lib/utils';
 import { from, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { Schema } from '../schema';

diff --git a/packages/cli/lib/init-local.ts b/packages/cli/lib/init-local.ts
@@ -11,7 +11,7 @@ import { parseRunOneOptions } from './parse-run-one-options';
 process.env.NX_CLI_SET = 'true';
 
 export function initLocal(workspace: Workspace) {
-  require('@nrwl/workspace/' + 'src/utils/perf-logging');
+  require('@nrwl/workspace/' + 'src/utilities/perf-logging');
   require('@nrwl/tao/src/compat/compat.js');
 
   const supportedNxCommands = require('@nrwl/workspace/' +

diff --git a/packages/create-nx-plugin/bin/create-nx-plugin.ts b/packages/create-nx-plugin/bin/create-nx-plugin.ts
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // we can't import from '@nrwl/workspace' because it will require typescript
-import { output } from '@nrwl/workspace/src/utils/output';
+import { output } from '@nrwl/workspace/src/utilities/output';
 import { getPackageManagerCommand } from '@nrwl/tao/src/shared/package-manager';
 import { dirSync } from 'tmp';
 import { writeFileSync, readFileSync, removeSync } from 'fs-extra';

diff --git a/packages/create-nx-plugin/bin/shared.ts b/packages/create-nx-plugin/bin/shared.ts
@@ -1,6 +1,6 @@
 import * as path from 'path';
 import { execSync } from 'child_process';
-import { output } from '@nrwl/workspace/src/utils/output';
+import { output } from '@nrwl/workspace/src/utilities/output';
 
 export function showNxWarning(workspaceName: string) {
   try {

diff --git a/packages/create-nx-workspace/bin/create-nx-workspace.ts b/packages/create-nx-workspace/bin/create-nx-workspace.ts
@@ -1,7 +1,8 @@
 #!/usr/bin/env node
 
-import { output, unparse } from '@nrwl/workspace';
-import { Schema, Preset } from '@nrwl/workspace/src/schematics/new/new';
+import { output } from '@nrwl/workspace/src/utilities/output';
+import { unparse } from '@nrwl/workspace/src/tasks-runner/utils';
+import { Schema, Preset } from '@nrwl/workspace/src/generators/new/new';
 import { getPackageManagerCommand } from '@nrwl/tao/src/shared/package-manager';
 import { execSync } from 'child_process';
 import { writeFileSync } from 'fs';

diff --git a/packages/create-nx-workspace/bin/shared.ts b/packages/create-nx-workspace/bin/shared.ts
@@ -1,6 +1,6 @@
 import * as path from 'path';
 import { execSync } from 'child_process';
-import { output } from '@nrwl/workspace/src/utils/output';
+import { output } from '@nrwl/workspace/src/utilities/output';
 
 export function showNxWarning(workspaceName: string) {
   try {

diff --git a/packages/devkit/index.ts b/packages/devkit/index.ts
@@ -49,3 +49,4 @@ export { offsetFromRoot } from './src/utils/offset-from-root';
 export { convertNxGenerator } from './src/utils/invoke-nx-generator';
 export { convertNxExecutor } from './src/utils/convert-nx-executor';
 export { stripIndents } from './src/utils/strip-indents';
+export { joinPathFragments, normalizePath } from './src/utils/path';
diff --git a/packages/devkit/src/generators/generate-files.ts b/packages/devkit/src/generators/generate-files.ts
@@ -1,6 +1,6 @@
-import * as path from 'path';
 import * as fs from 'fs';
 import { Tree } from '@nrwl/tao/src/shared/tree';
+import { joinPathFragments } from '../utils/path';
 
 const ejs = require('ejs');
 
@@ -41,7 +41,7 @@ export function generateFiles(
       substitutions
     );
     const newContent = ejs.render(fs.readFileSync(f).toString(), substitutions);
-    host.write(path.join(target, relativeToTarget), newContent);
+    host.write(joinPathFragments(target, relativeToTarget), newContent);
   });
 }
 
@@ -59,7 +59,7 @@ function allFilesInDir(parent: string) {
   let res = [];
   try {
     fs.readdirSync(parent).forEach((c) => {
-      const child = path.join(parent, c);
+      const child = joinPathFragments(parent, c);
       try {
         const s = fs.statSync(child);
         if (!s.isDirectory()) {

diff --git a/packages/devkit/src/utils/path.ts b/packages/devkit/src/utils/path.ts
@@ -0,0 +1,28 @@
+import * as path from 'path';
+
+function removeWindowsDriveLetter(osSpecificPath: string): string {
+  return osSpecificPath.replace(/^[A-Z]:/, '');
+}
+
+/**
+ * Coverts an os specific path to a unix style path
+ */
+export function normalizePath(osSpecificPath: string): string {
+  return removeWindowsDriveLetter(osSpecificPath).split(path.sep).join('/');
+}
+
+/**
+ * Normalized path fragments and joins them
+ */
+export function joinPathFragments(...fragments: string[]): string {
+  const normalizedFragments = [];
+  for (let i = 0; i < fragments.length; ++i) {
+    if (i === 0) {
+      normalizedFragments.push(normalizePath(fragments[i]));
+    } else {
+      const n = normalizePath(fragments[i]);
+      normalizedFragments.push(n.startsWith('/') ? n.substring(1) : n);
+    }
+  }
+  return normalizedFragments.join('/');
+}
diff --git a/packages/eslint-plugin-nx/src/rules/enforce-module-boundaries.ts b/packages/eslint-plugin-nx/src/rules/enforce-module-boundaries.ts
@@ -1,4 +1,4 @@
-import { appRootPath } from '@nrwl/workspace/src/utils/app-root';
+import { appRootPath } from '@nrwl/workspace/src/utilities/app-root';
 import {
   DepConstraint,
   findConstraintsFor,

diff --git a/packages/jest/package.json b/packages/jest/package.json
@@ -33,9 +33,6 @@
   },
   "dependencies": {
     "@nrwl/devkit": "*",
-    "@angular-devkit/architect": "~0.1100.1",
-    "@angular-devkit/core": "~11.0.1",
-    "@angular-devkit/schematics": "~11.0.1",
     "jest-resolve": "^26.6.2",
     "rxjs": "^6.5.4",
     "strip-json-comments": "2.0.1",

diff --git a/packages/jest/src/generators/init/init.ts b/packages/jest/src/generators/init/init.ts
@@ -1,4 +1,3 @@
-import { stripIndents } from '@angular-devkit/core/src/utils/literals';
 import {
   babelCoreVersion,
   babelJestVersion,
@@ -16,6 +15,7 @@ import {
   updateJson,
   addDependenciesToPackageJson,
   convertNxGenerator,
+  stripIndents,
 } from '@nrwl/devkit';
 
 interface NormalizedSchema extends ReturnType<typeof normalizeOptions> {}

diff --git a/packages/jest/src/generators/jest-project/lib/update-workspace.ts b/packages/jest/src/generators/jest-project/lib/update-workspace.ts
@@ -1,18 +1,27 @@
-import { join, normalize } from '@angular-devkit/core';
 import { JestProjectSchema } from '../schema';
 import {
   readProjectConfiguration,
   Tree,
   updateProjectConfiguration,
+  joinPathFragments,
+  normalizePath,
 } from '@nrwl/devkit';
 
 export function updateWorkspace(tree: Tree, options: JestProjectSchema) {
   const projectConfig = readProjectConfiguration(tree, options.project);
   projectConfig.targets.test = {
     executor: '@nrwl/jest:jest',
-    outputs: [join(normalize('coverage'), normalize(projectConfig.root))],
+    outputs: [
+      joinPathFragments(
+        normalizePath('coverage'),
+        normalizePath(projectConfig.root)
+      ),
+    ],
     options: {
-      jestConfig: join(normalize(projectConfig.root), 'jest.config.js'),
+      jestConfig: joinPathFragments(
+        normalizePath(projectConfig.root),
+        'jest.config.js'
+      ),
       passWithNoTests: true,
     },
   };
@@ -24,7 +33,10 @@ export function updateWorkspace(tree: Tree, options: JestProjectSchema) {
   if (isUsingTSLint) {
     projectConfig.targets.lint.options.tsConfig = [
       ...(projectConfig.targets.lint.options.tsConfig || []),
-      join(normalize(projectConfig.root), 'tsconfig.spec.json'),
+      joinPathFragments(
+        normalizePath(projectConfig.root),
+        'tsconfig.spec.json'
+      ),
     ];
   }
   updateProjectConfiguration(tree, options.project, projectConfig);

diff --git a/packages/jest/src/migrations/update-10-0-0/update-jest-configs.ts b/packages/jest/src/migrations/update-10-0-0/update-jest-configs.ts
@@ -13,7 +13,7 @@ import {
 } from '@nrwl/workspace';
 import { addPropertyToJestConfig } from '../utils/config/legacy/update-config';
 import { getJestObject } from './require-jest-config';
-import { appRootPath } from '@nrwl/workspace/src/utils/app-root';
+import { appRootPath } from '@nrwl/workspace/src/utilities/app-root';
 
 function checkJestPropertyObject(object: unknown): object is object {
   return object !== null && object !== undefined;

diff --git a/packages/jest/src/migrations/update-10-3-0/update-ts-jest.ts b/packages/jest/src/migrations/update-10-3-0/update-ts-jest.ts
@@ -16,7 +16,7 @@ import {
 } from '../utils/config/legacy/update-config';
 import { getJestObject } from '../update-10-0-0/require-jest-config';
 import { stripIndents } from '@angular-devkit/core/src/utils/literals';
-import { appRootPath } from '@nrwl/workspace/src/utils/app-root';
+import { appRootPath } from '@nrwl/workspace/src/utilities/app-root';
 
 function updateAstTransformers(): Rule {
   return async (host: Tree, context: SchematicContext) => {

diff --git a/packages/linter/package.json b/packages/linter/package.json
@@ -28,7 +28,6 @@
   },
   "builders": "./builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "~0.1100.1",
     "@nrwl/devkit": "*",
     "glob": "7.1.4",
     "minimatch": "3.0.4",

diff --git a/packages/next/plugins/with-nx.ts b/packages/next/plugins/with-nx.ts
@@ -1,5 +1,5 @@
 const { join } = require('path');
-const { appRootPath } = require('@nrwl/workspace/src/utils/app-root');
+const { appRootPath } = require('@nrwl/workspace/src/utilities/app-root');
 const { workspaceLayout } = require('@nrwl/workspace/src/core/file-utils');
 
 function regexEqual(x, y) {

diff --git a/packages/node/src/builders/package/package.impl.spec.ts b/packages/node/src/builders/package/package.impl.spec.ts
@@ -16,9 +16,9 @@ jest.mock('glob');
 import * as glob from 'glob';
 jest.mock('fs-extra');
 import * as fs from 'fs-extra';
-jest.mock('@nrwl/workspace/src/utils/fileutils');
-import * as fsUtility from '@nrwl/workspace/src/utils/fileutils';
-import * as tsUtils from '@nrwl/workspace/src/utils/typescript';
+jest.mock('@nrwl/workspace/src/utilities/fileutils');
+import * as fsUtility from '@nrwl/workspace/src/utilities/fileutils';
+import * as tsUtils from '@nrwl/workspace/src/utilities/typescript';
 import * as ts from 'typescript';
 
 describe('NodePackageBuilder', () => {

diff --git a/packages/node/src/builders/package/utils/update-package-json.ts b/packages/node/src/builders/package/utils/update-package-json.ts
@@ -1,7 +1,7 @@
 import { BuilderContext } from '@angular-devkit/architect';
 import { normalize } from '@angular-devkit/core';
 import { readJsonFile } from '@nrwl/workspace';
-import { writeJsonFile } from '@nrwl/workspace/src/utils/fileutils';
+import { writeJsonFile } from '@nrwl/workspace/src/utilities/fileutils';
 import { basename, join } from 'path';
 import { NormalizedBuilderOptions } from './models';
 

diff --git a/packages/node/src/utils/generate-package-json.ts b/packages/node/src/utils/generate-package-json.ts
@@ -1,6 +1,6 @@
 import { ProjectGraph, readJsonFile } from '@nrwl/workspace';
 import { BuildNodeBuilderOptions } from './types';
-import { writeJsonFile } from '@nrwl/workspace/src/utils/fileutils';
+import { writeJsonFile } from '@nrwl/workspace/src/utilities/fileutils';
 import { OUT_FILENAME } from './config';
 
 /**

diff --git a/packages/nx-plugin/src/utils/testing-utils/nx-project.ts b/packages/nx-plugin/src/utils/testing-utils/nx-project.ts
@@ -1,4 +1,4 @@
-import { appRootPath } from '@nrwl/workspace/src/utils/app-root';
+import { appRootPath } from '@nrwl/workspace/src/utilities/app-root';
 import { getPackageManagerCommand } from '@nrwl/tao/src/shared/package-manager';
 import { execSync } from 'child_process';
 import { readFileSync, writeFileSync } from 'fs';

diff --git a/packages/react/src/utils/babel-utils.ts b/packages/react/src/utils/babel-utils.ts
@@ -1,4 +1,4 @@
-import { appRootPath } from '@nrwl/workspace/src/utils/app-root';
+import { appRootPath } from '@nrwl/workspace/src/utilities/app-root';
 import { readJsonFile } from '@nrwl/workspace';
 import { join } from 'path';
 

diff --git a/packages/tao/package.json b/packages/tao/package.json
@@ -29,9 +29,6 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@angular-devkit/schematics": "~11.0.1",
-    "@angular-devkit/core": "~11.0.1",
-    "@angular-devkit/architect": "~0.1100.1",
     "chalk": "4.1.0",
     "inquirer": "^6.3.1",
     "minimist": "^1.2.5",

diff --git a/packages/web/src/builders/package/package.impl.ts b/packages/web/src/builders/package/package.impl.ts
@@ -16,7 +16,7 @@ import { BuildResult } from '@angular-devkit/build-webpack';
 import {
   readJsonFile,
   writeJsonFile,
-} from '@nrwl/workspace/src/utils/fileutils';
+} from '@nrwl/workspace/src/utilities/fileutils';
 import { createProjectGraph } from '@nrwl/workspace/src/core/project-graph';
 
 import {