feat(devkit): add builder as a library

Recreate NgPackgrSchematics as a library.
Publish a rc version and point is as a LinkingTool builder.

angular.json

@@ -188,9 +188,10 @@
       "prefix": "valueadd",
       "architect": {
         "build": {
-          "builder": "./libs/devkit/builders/build-ng-packagr-and-schematics:build",
+          "builder": "@valueadd/ng-packagr-schematics:build",
           "options": {
-            "tsConfig": "libs/linking-tool/tsconfig.lib.json",
+            "tsConfigRuntime": "libs/linking-tool/tsconfig.lib.json",
+            "tsConfigSchematics": "libs/linking-tool/tsconfig.lib.json",
             "project": "libs/linking-tool/ng-package.json"
           }
         },
@@ -252,6 +253,49 @@
         }
       },
       "schematics": {}
+    },
+    "devkit-builders-ng-packagr-schematics": {
+      "root": "libs/devkit/builders/ng-packagr-schematics",
+      "sourceRoot": "libs/devkit/builders/ng-packagr-schematics/src",
+      "projectType": "library",
+      "schematics": {},
+      "architect": {
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "libs/devkit/builders/ng-packagr-schematics/tsconfig.lib.json",
+              "libs/devkit/builders/ng-packagr-schematics/tsconfig.spec.json"
+            ],
+            "exclude": ["**/node_modules/**", "!libs/devkit/builders/ng-packagr-schematics/**"]
+          }
+        },
+        "test": {
+          "builder": "@nrwl/jest:jest",
+          "options": {
+            "jestConfig": "libs/devkit/builders/ng-packagr-schematics/jest.config.js",
+            "tsConfig": "libs/devkit/builders/ng-packagr-schematics/tsconfig.spec.json"
+          }
+        },
+        "build": {
+          "builder": "@nrwl/node:package",
+          "options": {
+            "outputPath": "dist/libs/devkit/builders/ng-packagr-schematics",
+            "tsConfig": "libs/devkit/builders/ng-packagr-schematics/tsconfig.lib.json",
+            "packageJson": "libs/devkit/builders/ng-packagr-schematics/package.json",
+            "main": "libs/devkit/builders/ng-packagr-schematics/src/index.ts",
+            "assets": [
+              "libs/devkit/builders/ng-packagr-schematics/*.md",
+              "libs/devkit/builders/ng-packagr-schematics/builders.json",
+              {
+                "glob": "schema.json",
+                "input": "libs/devkit/builders/ng-packagr-schematics/src/lib/build/",
+                "output": "lib/build"
+              }
+            ]
+          }
+        }
+      }
     }
   },
   "cli": {

jest.config.js

@@ -0,0 +1,10 @@
+module.exports = {
+  testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
+  transform: {
+    '^.+\\.(ts|js|html)$': 'ts-jest'
+  },
+  resolver: '@nrwl/jest/plugins/resolver',
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageReporters: ['html'],
+  passWithNoTests: true
+};

libs/devkit/builders/ng-packagr-schematics/README.md

@@ -0,0 +1,7 @@
+# devkit-builders-ng-packagr-schematics
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `ng test devkit-builders-ng-packagr-schematics` to execute the unit tests via [Jest](https://jestjs.io).

libs/devkit/builders/build-ng-packagr-and-schematics/builders.json → libs/devkit/builders/ng-packagr-schematics/builders.json

@@ -2,8 +2,8 @@
   "$schema": "http://json-schema.org/schema",
   "builders": {
     "build": {
-      "implementation": "./src/build/index",
-      "schema": "./src/build/schema.json",
+      "implementation": "./lib/build/index",
+      "schema": "./lib/build/schema.json",
       "description": "Build a library with ng-packagr."
     }
   }

libs/devkit/builders/build-ng-packagr-and-schematics/jest.config.js → libs/devkit/builders/ng-packagr-schematics/jest.config.js

@@ -1,9 +1,9 @@
 module.exports = {
-  name: 'devkit-builders-build-ng-packagr-and-schematics',
+  name: 'devkit-builders-ng-packagr-schematics',
   preset: '../../../../jest.config.js',
   transform: {
     '^.+\\.[tj]sx?$': 'ts-jest'
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
-  coverageDirectory: '../../../../coverage/libs/devkit/builders/build-ng-packagr-and-schematics'
+  coverageDirectory: '../../../../coverage/libs/devkit/builders/ng-packagr-schematics'
 };

libs/devkit/builders/build-ng-packagr-and-schematics/package.json → libs/devkit/builders/ng-packagr-schematics/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@valueadd-devkit/build-ng-packagr-and-schematics",
-  "version": "0.0.0",
+  "name": "@valueadd/ng-packagr-schematics",
+  "version": "0.0.0-rc1",
   "description": "ng-packagr builder with support for schematics inside library",
   "experimental": true,
   "main": "src/index.js",
@@ -11,21 +11,21 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/valueadd-poland/valueadd/tree/master/libs/devkit/builders/build-ng-packagr-and-schematics"
+    "url": "https://github.com/valueadd-poland/valueadd/tree/master/libs/devkit/builders/ng-packagr-schematics"
   },
   "author": "ValueAdd sp. z o.o",
   "license": "MIT",
   "dependencies": {
-    "@angular-devkit/architect": "0.0.0",
+    "@angular-devkit/architect": "^0.1000.0",
     "rxjs": "6.5.3"
   },
   "peerDependencies": {
     "ng-packagr": "^4.0.0 || ^5.0.0"
   },
   "devDependencies": {
+    "@angular-devkit/core": "^10.0.0",
     "@angular/compiler": "9.0.0-next.10",
     "@angular/compiler-cli": "9.0.0-next.10",
-    "@angular-devkit/core": "0.0.0",
     "ng-packagr": "~5.6.0",
     "tslib": "^1.10.0"
   }

libs/devkit/builders/ng-packagr-schematics/src/index.ts

@@ -0,0 +1 @@
+export * from './lib/build';

libs/devkit/builders/ng-packagr-schematics/src/lib/build/builder.interface.ts

@@ -0,0 +1,5 @@
+export interface Builder {
+  build(): Promise<void>;
+
+  watch(): Promise<void>;
+}

libs/devkit/builders/ng-packagr-schematics/src/lib/build/index.ts

@@ -0,0 +1,29 @@
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
+import { combineLatest, from, Observable } from 'rxjs';
+import { last, mapTo, switchMap } from 'rxjs/operators';
+import { initialize as initializeNgPackagrBuilder } from './ng-packagr-build';
+import { initialize as initializeSchematicsBuilder } from './schematics.build';
+import { JsonObject } from '@angular-devkit/core';
+
+interface Options extends JsonObject {
+  project: string;
+  tsConfigRuntime: string;
+  tsConfigSchematics: string;
+  watch?: boolean;
+}
+
+export function execute(options: Options, context: BuilderContext): Observable<BuilderOutput> {
+  return combineLatest([
+    from(
+      initializeNgPackagrBuilder(
+        { ...options, tsConfig: options.tsConfigRuntime },
+        context.workspaceRoot
+      )
+    ).pipe(switchMap(packager => (options.watch ? packager.watch() : packager.build()))),
+    from(initializeSchematicsBuilder(options, context.workspaceRoot)).pipe(
+      switchMap(builder => (options.watch ? builder.watch() : builder.build()))
+    )
+  ]).pipe(last(), mapTo({ success: true }));
+}
+
+export default createBuilder(execute);

libs/devkit/builders/build-ng-packagr-and-schematics/src/build/schema.json → libs/devkit/builders/ng-packagr-schematics/src/lib/build/schema.json

@@ -8,7 +8,11 @@
       "type": "string",
       "description": "The file path for the ng-packagr configuration file, relative to the current workspace."
     },
-    "tsConfig": {
+    "tsConfigRuntime": {
+      "type": "string",
+      "description": "The full path for the TypeScript configuration file, relative to the current workspace."
+    },
+    "tsConfigSchematics": {
       "type": "string",
       "description": "The full path for the TypeScript configuration file, relative to the current workspace."
     },