chore: apply nx 14 migrations

microsoft · May 18, 2023 · 2676412 · 2676412
1 parent cc80f8e
commit 2676412
Show file tree

Hide file tree

Showing 20 changed files with 54 additions and 60 deletions.
diff --git a/jest.config.js → jest.config.ts b/jest.config.js → jest.config.ts
@@ -1,5 +1,5 @@
 const { getJestProjects } = require('@nrwl/jest');
 
-module.exports = {
+export default {
   projects: [...getJestProjects()],
 };
diff --git a/nx.json b/nx.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "./node_modules/nx/schemas/nx-schema.json",
   "npmScope": "fluentui",
   "implicitDependencies": {
     "package.json": {
@@ -28,24 +29,15 @@
       "analyzeSourceFiles": true
     }
   },
-  "targetDependencies": {
-    "build": [
-      {
-        "target": "build",
-        "projects": "dependencies"
-      }
-    ],
-    "package": [
-      {
-        "target": "package",
-        "projects": "dependencies"
-      }
-    ],
-    "prepare": [
-      {
-        "target": "prepare",
-        "projects": "dependencies"
-      }
-    ]
+  "targetDefaults": {
+    "build": {
+      "dependsOn": ["^build"]
+    },
+    "package": {
+      "dependsOn": ["^package"]
+    },
+    "prepare": {
+      "dependsOn": ["^prepare"]
+    }
   }
 }
diff --git a/tools/generators/add-codeowners.spec.ts b/tools/generators/add-codeowners.spec.ts
@@ -1,5 +1,5 @@
 import { Tree, addProjectConfiguration, stripIndents } from '@nrwl/devkit';
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import { addCodeowner } from './add-codeowners';
 import { setupCodeowners } from '../utils-testing';
 import { workspacePaths } from '../utils';
@@ -8,7 +8,7 @@ describe(`#addCodeowner`, () => {
   let tree: Tree;
 
   beforeEach(() => {
-    tree = createTreeWithEmptyWorkspace();
+    tree = createTreeWithEmptyV1Workspace();
 
     addProjectConfiguration(tree, '@proj/react-one', {
       root: '/packages/react-one',

diff --git a/tools/generators/dependency-mismatch/index.spec.ts b/tools/generators/dependency-mismatch/index.spec.ts
@@ -1,4 +1,4 @@
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import { Tree, addProjectConfiguration, serializeJson, readWorkspaceConfiguration, readJson } from '@nrwl/devkit';
 
 import generator from './index';
@@ -9,7 +9,7 @@ describe('dependency-mismatch generator', () => {
   let workspaceNpmScope: string;
 
   beforeEach(() => {
-    appTree = createTreeWithEmptyWorkspace();
+    appTree = createTreeWithEmptyV1Workspace();
     workspaceNpmScope = readWorkspaceConfiguration(appTree).npmScope as string;
   });
 

diff --git a/tools/generators/epic-generator/index.spec.ts b/tools/generators/epic-generator/index.spec.ts
@@ -1,5 +1,5 @@
 import { addProjectConfiguration, ProjectType, stripIndents, writeJson } from '@nrwl/devkit';
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import { execSync, spawnSync, SpawnSyncReturns } from 'child_process';
 import { workspacePaths } from '../../utils';
 import epicGenerator from './index';
@@ -16,7 +16,7 @@ type Package = {
 };
 
 function setupTest(packages: Package[]) {
-  const tree = createTreeWithEmptyWorkspace();
+  const tree = createTreeWithEmptyV1Workspace();
 
   // Initialize NX package structure
   packages.forEach(pckg => {
@@ -80,15 +80,15 @@ function setupTest(packages: Package[]) {
 describe('epic-generator', () => {
   describe('validation', () => {
     it('requires a non-empty title', () => {
-      const tree = createTreeWithEmptyWorkspace();
+      const tree = createTreeWithEmptyV1Workspace();
 
       expect(() =>
         epicGenerator(tree, { title: ' ', repository: 'microsoft/fluentui' }),
       ).toThrowErrorMatchingInlineSnapshot(`"Must provide a title for the issue"`);
     });
 
     it('requires a well formatted repository', () => {
-      const tree = createTreeWithEmptyWorkspace();
+      const tree = createTreeWithEmptyV1Workspace();
 
       expect(() => epicGenerator(tree, { title: 'test title', repository: 'invalid_repo' }))
         .toThrowErrorMatchingInlineSnapshot(`
@@ -103,7 +103,7 @@ describe('epic-generator', () => {
       spawnSyncMock.mockReturnValueOnce({
         error: new Error('command not found.'),
       });
-      const tree = createTreeWithEmptyWorkspace();
+      const tree = createTreeWithEmptyV1Workspace();
 
       expect(() => epicGenerator(tree, { title: 'test title', repository: 'microsoft/fluentui' }))
         .toThrowErrorMatchingInlineSnapshot(`
@@ -117,7 +117,7 @@ describe('epic-generator', () => {
         output: [['You are not logged into any GitHub hosts. Run gh auth login to authenticate.']],
       });
 
-      const tree = createTreeWithEmptyWorkspace();
+      const tree = createTreeWithEmptyV1Workspace();
 
       expect(() =>
         epicGenerator(tree, { title: 'test title', repository: 'microsoft/fluentui' }),

diff --git a/tools/generators/migrate-converged-pkg/index.spec.ts b/tools/generators/migrate-converged-pkg/index.spec.ts
@@ -2,7 +2,7 @@ import * as Enquirer from 'enquirer';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as chalk from 'chalk';
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import {
   Tree,
   readProjectConfiguration,
@@ -60,7 +60,7 @@ describe('migrate-converged-pkg generator', () => {
     jest.spyOn(console, 'info').mockImplementation(noop);
     jest.spyOn(console, 'warn').mockImplementation(noop);
 
-    tree = createTreeWithEmptyWorkspace();
+    tree = createTreeWithEmptyV1Workspace();
     tree = setupCodeowners(tree, { content: `` });
     tree.write(
       'jest.config.js',

diff --git a/tools/generators/migrate-fixed-versions/index.spec.ts b/tools/generators/migrate-fixed-versions/index.spec.ts
@@ -1,4 +1,4 @@
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import {
   Tree,
   readProjectConfiguration,
@@ -24,7 +24,7 @@ describe('migrate-fixed-versions generator', () => {
     jest.spyOn(console, 'info').mockImplementation(noop);
     jest.spyOn(console, 'warn').mockImplementation(noop);
 
-    tree = createTreeWithEmptyWorkspace();
+    tree = createTreeWithEmptyV1Workspace();
     tree = setupDummyPackage(tree, options);
   });
 

diff --git a/tools/generators/migrate-v8-pkg/index.spec.ts b/tools/generators/migrate-v8-pkg/index.spec.ts
@@ -1,4 +1,4 @@
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import {
   Tree,
   readProjectConfiguration,
@@ -34,7 +34,7 @@ describe('migrate-v8-pkg generator', () => {
     jest.spyOn(console, 'info').mockImplementation(noop);
     jest.spyOn(console, 'warn').mockImplementation(noop);
 
-    tree = createTreeWithEmptyWorkspace();
+    tree = createTreeWithEmptyV1Workspace();
     tree = setupDummyPackage(tree, options);
     tree = setupDummyPackage(tree, {
       name: '@proj/react',

diff --git a/tools/generators/move-packages/index.spec.ts b/tools/generators/move-packages/index.spec.ts
@@ -1,4 +1,4 @@
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import {
   Tree,
   readProjectConfiguration,
@@ -36,7 +36,7 @@ describe('move-packages generator', () => {
     jest.restoreAllMocks();
     jest.spyOn(console, 'log').mockImplementation(noop);
 
-    tree = createTreeWithEmptyWorkspace();
+    tree = createTreeWithEmptyV1Workspace();
 
     setupCodeowners(tree, { content: `packages/test @dummyOwner` });
 

diff --git a/tools/generators/print-stats.spec.ts b/tools/generators/print-stats.spec.ts
@@ -1,5 +1,5 @@
 import { addProjectConfiguration, getProjects, logger, Tree } from '@nrwl/devkit';
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import * as chalk from 'chalk';
 import { disableChalk, formatMockedCalls } from '../utils-testing';
 
@@ -19,7 +19,7 @@ describe(`print stats`, () => {
     jest.spyOn(console, 'info').mockImplementation(noop);
     jest.spyOn(console, 'warn').mockImplementation(noop);
 
-    tree = createTreeWithEmptyWorkspace();
+    tree = createTreeWithEmptyV1Workspace();
 
     addProjectConfiguration(tree, '@proj/pkg-a', {
       root: 'packages/pkg-a',

diff --git a/tools/generators/rc-caret/index.spec.ts b/tools/generators/rc-caret/index.spec.ts
@@ -1,4 +1,4 @@
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import {
   Tree,
   readProjectConfiguration,
@@ -23,7 +23,7 @@ describe('rc-caret generator', () => {
     jest.spyOn(console, 'info').mockImplementation(noop);
     jest.spyOn(console, 'warn').mockImplementation(noop);
 
-    tree = createTreeWithEmptyWorkspace();
+    tree = createTreeWithEmptyV1Workspace();
     npmScope = readWorkspaceConfiguration(tree).npmScope ?? '@proj';
   });
 

diff --git a/tools/generators/tsconfig-base-all/index.spec.ts b/tools/generators/tsconfig-base-all/index.spec.ts
@@ -1,4 +1,4 @@
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import { Tree, writeJson, readJson, updateJson } from '@nrwl/devkit';
 
 import generator from './index';
@@ -9,7 +9,7 @@ describe('tsconfig-base-all generator', () => {
   const options: TsconfigBaseAllGeneratorSchema = {};
 
   beforeEach(() => {
-    tree = createTreeWithEmptyWorkspace();
+    tree = createTreeWithEmptyV1Workspace();
     writeJson(tree, '/tsconfig.base.v0.json', {
       compilerOptions: {
         paths: {

diff --git a/tools/generators/version-bump/index.spec.ts b/tools/generators/version-bump/index.spec.ts
@@ -1,4 +1,4 @@
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import {
   Tree,
   readProjectConfiguration,
@@ -28,7 +28,7 @@ describe('version-string-replace generator', () => {
     jest.spyOn(console, 'info').mockImplementation(noop);
     jest.spyOn(console, 'warn').mockImplementation(noop);
 
-    tree = createTreeWithEmptyWorkspace();
+    tree = createTreeWithEmptyV1Workspace();
   });
 
   it('should bump alpha package to beta', async () => {

diff --git a/tools/generators/workspace-generator/files/index.spec.ts__tmpl__ b/tools/generators/workspace-generator/files/index.spec.ts__tmpl__
@@ -1,4 +1,4 @@
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import { Tree, readProjectConfiguration } from '@nrwl/devkit';
 
 import generator from './index';
@@ -9,7 +9,7 @@ describe('<%= name %> generator', () => {
   const options: <%= className %>GeneratorSchema = { name: 'test' };
 
   beforeEach(() => {
-    appTree = createTreeWithEmptyWorkspace();
+    appTree = createTreeWithEmptyV1Workspace();
   });
 
   it('should run successfully', async () => {

diff --git a/tools/generators/workspace-generator/index.spec.ts b/tools/generators/workspace-generator/index.spec.ts
@@ -1,4 +1,4 @@
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import { Tree, readJson } from '@nrwl/devkit';
 
 import generator from './index';
@@ -9,7 +9,7 @@ describe('workspace-generator generator', () => {
   const options: WorkspaceGeneratorGeneratorSchema = { name: 'custom' };
 
   beforeEach(() => {
-    tree = createTreeWithEmptyWorkspace();
+    tree = createTreeWithEmptyV1Workspace();
   });
 
   it('should generate boilerplate', async () => {
@@ -118,7 +118,7 @@ describe('workspace-generator generator', () => {
     const content = tree.read('/tools/generators/custom/index.spec.ts')?.toString();
 
     expect(content).toMatchInlineSnapshot(`
-      "import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+      "import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
       import { Tree, readProjectConfiguration } from '@nrwl/devkit';
 
       import generator from './index';
@@ -129,7 +129,7 @@ describe('workspace-generator generator', () => {
         const options: CustomGeneratorSchema = { name: 'test' };
 
         beforeEach(() => {
-          appTree = createTreeWithEmptyWorkspace();
+          appTree = createTreeWithEmptyV1Workspace();
         });
 
         it('should run successfully', async () => {

diff --git a/tools/jest.config.js → tools/jest.config.ts b/tools/jest.config.js → tools/jest.config.ts
@@ -3,7 +3,7 @@
 /**
  * @type {import('@jest/types').Config.InitialOptions}
  */
-module.exports = {
+export default {
   displayName: 'tools',
   preset: '../jest.preset.js',
   globals: {

diff --git a/tools/tsconfig.lib.json b/tools/tsconfig.lib.json
@@ -6,6 +6,6 @@
     "outDir": "../dist/out-tsc",
     "types": ["node"]
   },
-  "exclude": ["**/*.spec.ts", "**/*.test.ts"],
+  "exclude": ["**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
   "include": ["**/*.ts"]
 }
diff --git a/tools/tsconfig.spec.json b/tools/tsconfig.spec.json
@@ -14,6 +14,7 @@
     "**/*.test.js",
     "**/*.spec.jsx",
     "**/*.test.jsx",
-    "**/*.d.ts"
+    "**/*.d.ts",
+    "jest.config.ts"
   ]
 }
diff --git a/tools/tsconfig.tools.json b/tools/tsconfig.tools.json
@@ -9,6 +9,6 @@
     "importHelpers": false,
     "downlevelIteration": true
   },
-  "exclude": ["**/*.spec.ts", "**/*.test.ts"],
+  "exclude": ["**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
   "include": ["**/*.ts"]
 }
diff --git a/workspace.json b/workspace.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "./node_modules/nx/schemas/workspace-schema.json",
   "version": 2,
   "projects": {
     "@fluentui/a11y-testing": {
@@ -188,25 +189,25 @@
           "executor": "@nrwl/jest:jest",
           "outputs": ["coverage/tools"],
           "options": {
-            "jestConfig": "tools/jest.config.js",
+            "jestConfig": "tools/jest.config.ts",
             "passWithNoTests": true
           }
         },
         "lint": {
-          "executor": "@nrwl/workspace:run-commands",
+          "executor": "nx:run-commands",
           "options": {
             "command": "eslint **/*.ts",
             "cwd": "tools"
           }
         },
         "type-check": {
-          "executor": "@nrwl/workspace:run-commands",
+          "executor": "nx:run-commands",
           "options": {
             "command": "tsc -b tools/tsconfig.json"
           }
         },
         "check-graph": {
-          "executor": "@nrwl/workspace:run-commands",
+          "executor": "nx:run-commands",
           "options": {
             "command": "node ./tools/check-dep-graph.js"
           }