feat(core): interpolated outputs & cache coverage folder

bekos · vsavkin · commit 6c1335ac8385 · 2020-12-01T13:49:43.000-05:00
diff --git a/e2e/workspace/src/workspace.test.ts b/e2e/workspace/src/workspace.test.ts
@@ -479,7 +479,7 @@ describe('print-affected', () => {
           target: 'test',
         },
         command: `npm run nx -- test ${myapp}`,
-        outputs: [],
+        outputs: [`coverage/apps/${myapp}`],
       },
     ]);
     compareTwoArrays(resWithTarget.projects, [`${myapp}-e2e`, myapp]);
diff --git a/package.json b/package.json
@@ -95,6 +95,7 @@
     "@types/jasmine": "~2.8.6",
     "@types/jasminewd2": "~2.0.3",
     "@types/jest": "26.0.8",
+    "@types/lodash": "^4.14.165",
     "@types/node": "12.12.38",
     "@types/prettier": "2.0.0",
     "@types/react": "16.9.17",
@@ -181,6 +182,7 @@
     "less-loader": "5.0.0",
     "license-webpack-plugin": "2.1.2",
     "loader-utils": "1.2.3",
+    "lodash": "^4.17.20",
     "memfs": "^3.0.1",
     "mime": "2.4.4",
     "mini-css-extract-plugin": "0.8.0",
diff --git a/packages/angular/src/schematics/application/__snapshots__/application.spec.ts.snap b/packages/angular/src/schematics/application/__snapshots__/application.spec.ts.snap
@@ -88,6 +88,9 @@ Object {
         "jestConfig": "apps/my-dir/my-app/jest.config.js",
         "passWithNoTests": true,
       },
+      "outputs": Array [
+        "coverage/apps/my-dir/my-app",
+      ],
     },
   },
   "prefix": "proj",
@@ -221,6 +224,9 @@ Object {
         "jestConfig": "apps/my-app/jest.config.js",
         "passWithNoTests": true,
       },
+      "outputs": Array [
+        "coverage/apps/my-app",
+      ],
     },
   },
   "prefix": "proj",
diff --git a/packages/jest/src/schematics/jest-project/jest-project.spec.ts b/packages/jest/src/schematics/jest-project/jest-project.spec.ts
@@ -67,6 +67,7 @@ describe('jestProject', () => {
     const workspaceJson = readJsonInTree(resultTree, 'workspace.json');
     expect(workspaceJson.projects.lib1.architect.test).toEqual({
       builder: '@nrwl/jest:jest',
+      outputs: ['coverage/libs/lib1'],
       options: {
         jestConfig: 'libs/lib1/jest.config.js',
         passWithNoTests: true,
diff --git a/packages/jest/src/schematics/jest-project/lib/update-workspace.ts b/packages/jest/src/schematics/jest-project/lib/update-workspace.ts
@@ -8,6 +8,7 @@ export function updateWorkspace(options: JestProjectSchema): Rule {
     const projectConfig = json.projects[options.project];
     projectConfig.architect.test = {
       builder: '@nrwl/jest:jest',
+      outputs: [join(normalize('coverage'), normalize(projectConfig.root))],
       options: {
         jestConfig: join(normalize(projectConfig.root), 'jest.config.js'),
         passWithNoTests: true,
diff --git a/packages/nest/src/schematics/library/library.spec.ts b/packages/nest/src/schematics/library/library.spec.ts
@@ -26,6 +26,7 @@ describe('lib', () => {
       });
       expect(workspaceJson.projects['my-lib'].architect.test).toEqual({
         builder: '@nrwl/jest:jest',
+        outputs: ['coverage/libs/my-lib'],
         options: {
           jestConfig: 'libs/my-lib/jest.config.js',
           passWithNoTests: true,
diff --git a/packages/nest/src/schematics/library/library.ts b/packages/nest/src/schematics/library/library.ts
@@ -183,6 +183,7 @@ function addProject(options: NormalizedSchema): Rule {
       if (architect) {
         architect.build = {
           builder: '@nrwl/node:package',
+          outputs: ['{options.outputPath}'],
           options: {
             outputPath: `dist/${libsDir(host)}/${options.projectDirectory}`,
             tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
diff --git a/packages/next/src/schematics/application/lib/add-project.spec.ts b/packages/next/src/schematics/application/lib/add-project.spec.ts
@@ -38,6 +38,7 @@ describe('addProject Rule', () => {
     const project = workspaceJson.projects[schema.name];
     expect(project.architect.build).toEqual({
       builder: '@nrwl/next:build',
+      outputs: ['{options.outputPath}'],
       configurations: {
         production: {},
       },
diff --git a/packages/next/src/schematics/application/lib/add-project.ts b/packages/next/src/schematics/application/lib/add-project.ts
@@ -11,6 +11,7 @@ export function addProject(options: NormalizedSchema): Rule {
 
     architect.build = {
       builder: '@nrwl/next:build',
+      outputs: ['{options.outputPath}'],
       options: {
         root: options.appProjectRoot,
         outputPath: join(normalize('dist'), options.appProjectRoot),
diff --git a/packages/node/src/schematics/application/application.spec.ts b/packages/node/src/schematics/application/application.spec.ts
@@ -26,6 +26,7 @@ describe('app', () => {
         expect.objectContaining({
           build: {
             builder: '@nrwl/node:build',
+            outputs: ['{options.outputPath}'],
             options: {
               outputPath: 'dist/apps/my-node-app',
               main: 'apps/my-node-app/src/main.ts',
diff --git a/packages/node/src/schematics/application/application.ts b/packages/node/src/schematics/application/application.ts
@@ -50,6 +50,7 @@ function updateNxJson(options: NormalizedSchema): Rule {
 function getBuildConfig(project: any, options: NormalizedSchema) {
   return {
     builder: '@nrwl/node:build',
+    outputs: ['{options.outputPath}'],
     options: {
       outputPath: join(normalize('dist'), options.appProjectRoot),
       main: maybeJs(options, join(project.sourceRoot, 'main.ts')),
diff --git a/packages/node/src/schematics/library/library.spec.ts b/packages/node/src/schematics/library/library.spec.ts
@@ -26,6 +26,7 @@ describe('lib', () => {
       });
       expect(workspaceJson.projects['my-lib'].architect.test).toEqual({
         builder: '@nrwl/jest:jest',
+        outputs: ['coverage/libs/my-lib'],
         options: {
           jestConfig: 'libs/my-lib/jest.config.js',
           passWithNoTests: true,
@@ -299,6 +300,9 @@ describe('lib', () => {
             "packageJson": "libs/my-lib/package.json",
             "tsConfig": "libs/my-lib/tsconfig.lib.json",
           },
+          "outputs": Array [
+            "{options.outputPath}",
+          ],
         }
       `);
     });
diff --git a/packages/node/src/schematics/library/library.ts b/packages/node/src/schematics/library/library.ts
@@ -123,6 +123,7 @@ function addProject(options: NormalizedSchema): Rule {
     if (architect) {
       architect.build = {
         builder: '@nrwl/node:package',
+        outputs: ['{options.outputPath}'],
         options: {
           outputPath: `dist/${libsDir(host)}/${options.projectDirectory}`,
           tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
diff --git a/packages/nx-plugin/src/schematics/plugin/plugin.spec.ts b/packages/nx-plugin/src/schematics/plugin/plugin.spec.ts
@@ -20,6 +20,7 @@ describe('NxPlugin plugin', () => {
     expect(project.root).toEqual('libs/my-plugin');
     expect(project.architect.build).toEqual({
       builder: '@nrwl/node:package',
+      outputs: ['{options.outputPath}'],
       options: {
         outputPath: 'dist/libs/my-plugin',
         tsConfig: 'libs/my-plugin/tsconfig.lib.json',
@@ -53,6 +54,7 @@ describe('NxPlugin plugin', () => {
     });
     expect(project.architect.test).toEqual({
       builder: '@nrwl/jest:jest',
+      outputs: ['coverage/libs/my-plugin'],
       options: {
         jestConfig: 'libs/my-plugin/jest.config.js',
         passWithNoTests: true,
diff --git a/packages/react/src/schematics/application/application.spec.ts b/packages/react/src/schematics/application/application.spec.ts
@@ -230,6 +230,7 @@ describe('app', () => {
     const workspaceJson = readJsonInTree(tree, 'workspace.json');
     const architectConfig = workspaceJson.projects['my-app'].architect;
     expect(architectConfig.build.builder).toEqual('@nrwl/web:build');
+    expect(architectConfig.build.outputs).toEqual(['{options.outputPath}']);
     expect(architectConfig.build.options).toEqual({
       assets: ['apps/my-app/src/favicon.ico', 'apps/my-app/src/assets'],
       index: 'apps/my-app/src/index.html',
diff --git a/packages/react/src/schematics/application/lib/add-project.ts b/packages/react/src/schematics/application/lib/add-project.ts
@@ -9,6 +9,7 @@ export function addProject(options: NormalizedSchema): Rule {
 
     architect.build = {
       builder: '@nrwl/web:build',
+      outputs: ['{options.outputPath}'],
       options: {
         outputPath: join(normalize('dist'), options.appProjectRoot),
         index: join(options.appProjectRoot, 'src/index.html'),
diff --git a/packages/react/src/schematics/library/library.spec.ts b/packages/react/src/schematics/library/library.spec.ts
@@ -404,6 +404,7 @@ describe('lib', () => {
 
       expect(workspaceJson.projects['my-lib'].architect.build).toMatchObject({
         builder: '@nrwl/web:package',
+        outputs: ['{options.outputPath}'],
         options: {
           external: ['react', 'react-dom'],
           entryFile: 'libs/my-lib/src/index.ts',
diff --git a/packages/react/src/schematics/library/library.ts b/packages/react/src/schematics/library/library.ts
@@ -157,6 +157,7 @@ function addProject(options: NormalizedSchema): Rule {
       }
       architect.build = {
         builder: '@nrwl/web:package',
+        outputs: ['{options.outputPath}'],
         options: {
           outputPath: `dist/${libsDir(host)}/${options.projectDirectory}`,
           tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
diff --git a/packages/storybook/src/schematics/configuration/configuration.ts b/packages/storybook/src/schematics/configuration/configuration.ts
@@ -312,6 +312,7 @@ function addStorybookTask(projectName: string, uiFramework: string): Rule {
     });
     projectConfig.targets.set('build-storybook', {
       builder: '@nrwl/storybook:build',
+      outputs: ['{options.outputPath}'],
       options: {
         uiFramework,
         outputPath: join(
@@ -328,7 +329,7 @@ function addStorybookTask(projectName: string, uiFramework: string): Rule {
           quiet: true,
         },
       },
-    });
+    } as any);
   });
 }
 
diff --git a/packages/web/src/schematics/application/application.spec.ts b/packages/web/src/schematics/application/application.spec.ts
@@ -214,6 +214,7 @@ describe('app', () => {
     const workspaceJson = readJsonInTree(tree, 'workspace.json');
     const architectConfig = workspaceJson.projects['my-app'].architect;
     expect(architectConfig.build.builder).toEqual('@nrwl/web:build');
+    expect(architectConfig.build.outputs).toEqual(['{options.outputPath}']);
     expect(architectConfig.build.options).toEqual({
       assets: ['apps/my-app/src/favicon.ico', 'apps/my-app/src/assets'],
       index: 'apps/my-app/src/index.html',
diff --git a/packages/web/src/schematics/application/application.ts b/packages/web/src/schematics/application/application.ts
@@ -65,6 +65,7 @@ function addProject(options: NormalizedSchema): Rule {
 
     architect.build = {
       builder: '@nrwl/web:build',
+      outputs: ['{options.outputPath}'],
       options: {
         outputPath: join(normalize('dist'), options.appProjectRoot),
         index: join(normalize(options.appProjectRoot), 'src/index.html'),
diff --git a/packages/workspace/migrations.json b/packages/workspace/migrations.json
@@ -150,6 +150,11 @@
       "version": "11.0.0-beta.3",
       "description": "Rename tools/schematics into tools/generators",
       "factory": "./src/migrations/update-11-0-0/rename-workspace-schematics"
+    },
+    "add-outputs-in-workspace": {
+      "version": "11.0.0-beta.7",
+      "description": "Adds `outputs` based on builders",
+      "factory": "./src/migrations/update-11-0-0/add-outputs-in-workspace"
     }
   },
   "packageJsonUpdates": {
diff --git a/packages/workspace/src/migrations/update-11-0-0/add-outputs-in-workspace.spec.ts b/packages/workspace/src/migrations/update-11-0-0/add-outputs-in-workspace.spec.ts
@@ -0,0 +1,69 @@
+import { Tree } from '@angular-devkit/schematics';
+import { readWorkspace } from '@nrwl/workspace';
+import {
+  SchematicTestRunner,
+  UnitTestTree,
+} from '@angular-devkit/schematics/testing';
+import { join } from 'path';
+
+describe('add `outputs` in workspace', () => {
+  let tree: Tree;
+  let schematicRunner: SchematicTestRunner;
+
+  beforeEach(async () => {
+    tree = new UnitTestTree(Tree.empty());
+
+    schematicRunner = new SchematicTestRunner(
+      '@nrwl/workspace',
+      join(__dirname, '../../../migrations.json')
+    );
+  });
+
+  it('based on the builder', async () => {
+    tree.create(
+      'workspace.json',
+      JSON.stringify({
+        projects: {
+          products: {
+            root: 'apps/products',
+            architect: {
+              build: {
+                builder: '@nrwl/jest:jest',
+              },
+              serve: {
+                builder: 'whatever',
+              },
+            },
+          },
+          cart: {
+            architect: {
+              build: {
+                builder: '@nrwl/web:build',
+              },
+              buildWithOutputsDefined: {
+                builder: '@nrwl/web:build',
+                outputs: ['test/dir'],
+              },
+            },
+          },
+        },
+      })
+    );
+
+    await schematicRunner
+      .runSchematicAsync('add-outputs-in-workspace', {}, tree)
+      .toPromise();
+
+    const config = readWorkspace(tree);
+    const { products, cart } = config.projects;
+    expect(products.architect.build.outputs).toEqual([
+      'coverage/apps/products',
+    ]);
+    expect(products.architect.serve.outputs).toBeUndefined();
+
+    expect(cart.architect.build.outputs).toEqual(['{options.outputPath}']);
+    expect(cart.architect.buildWithOutputsDefined.outputs).toEqual([
+      'test/dir',
+    ]);
+  });
+});
diff --git a/packages/workspace/src/migrations/update-11-0-0/add-outputs-in-workspace.ts b/packages/workspace/src/migrations/update-11-0-0/add-outputs-in-workspace.ts
@@ -0,0 +1,41 @@
+import { chain, Rule } from '@angular-devkit/schematics';
+import { updateWorkspaceInTree } from '@nrwl/workspace';
+
+const addOutputs = () =>
+  updateWorkspaceInTree((workspace) => {
+    for (const [, project] of Object.entries<any>(workspace.projects)) {
+      for (const [, target] of Object.entries<any>(project.architect)) {
+        const builder = target?.builder;
+
+        if (!builder || target.outputs) {
+          continue; // Do not mess with already defined outputs from user
+        }
+
+        if (
+          ['@nrwl/jest:jest', '@angular-devkit/build-angular:karma'].includes(
+            builder
+          )
+        ) {
+          target.outputs = [`coverage/${project.root}`];
+        } else if (
+          [
+            '@angular-devkit/build-angular:browser',
+            '@nrwl/next:build',
+            '@nrwl/node:build',
+            '@nrwl/node:package',
+            '@nrwl/web:build',
+            '@nrwl/web:package',
+            '@nrwl/storybook:build',
+          ].includes(builder)
+        ) {
+          target.outputs = ['{options.outputPath}'];
+        }
+      }
+    }
+
+    return workspace;
+  });
+
+export default function update(): Rule {
+  return chain([addOutputs()]);
+}
diff --git a/packages/workspace/src/tasks-runner/utils.spec.ts b/packages/workspace/src/tasks-runner/utils.spec.ts
diff --git a/packages/workspace/src/tasks-runner/utils.ts b/packages/workspace/src/tasks-runner/utils.ts
diff --git a/yarn.lock b/yarn.lock
