feat: angular 13 migration #83 (#84)

Updated to Angular 13

Author: patelvimal

.github/workflows/npm-publish.yml

@@ -6,7 +6,7 @@ name: Node.js Package
 on:
     push:
         branches:
-            - 'releases/**'
+            - 'release/**'
     release:
         types: [created]
 

.npmignore

@@ -43,7 +43,7 @@ export default createBuilder<any>(
         success: true
       };
     }
-    catch (e) {
+    catch (e:any) {
       return {
         error: e.message,
         success: true

analyze/index.ts

@@ -1,5 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
+  "$id": "source-map-analyze",
   "type": "object",
   "properties": {
     "gzip": {

analyze/schema.json

@@ -1,46 +1,18 @@
 import { Rule, SchematicContext, SchematicsException, Tree } from '@angular-devkit/schematics';
-import { experimental, JsonParseMode, parseJson } from '@angular-devkit/core';
+import { getWorkspace, getWorkspacePath, ProjectType, WorkspaceProject } from 'schematics-utilities';
+import { NgAddOptions } from './schema';
 
-function getWorkspace(host: Tree): { path: string; workspace: experimental.workspace.WorkspaceSchema } {
-    const possibleFiles = ['/angular.json', './angular.json'];
-    const path = possibleFiles.find(path => host.exists(path));
-
-    if (!path) {
-        throw new SchematicsException(`Could not find angular.json`);
-    }
-
-    const configBuffer = host.read(path);
-    if (!configBuffer) {
-        throw new SchematicsException(`Could not find angular.json`);
-    }
-
-    const content = configBuffer.toString();
-    let workspace: experimental.workspace.WorkspaceSchema;
-
-    try {
-        workspace = <any>parseJson(content, JsonParseMode.Loose) as experimental.workspace.WorkspaceSchema;
-    } catch (e) {
-        throw new SchematicsException(`Could not parse angular.json: ${e.message}`);
-    }
-
-    return { path, workspace };
-}
-
-interface NgAddOptions {
-    project?: string;
-    siteID: string;
-    netlifyToken: string;
-}
 
 export function sourceMapBuilder(options: NgAddOptions): Rule {
     return (tree: Tree, _context: SchematicContext) => {
         // get the workspace details
-        const { path: workspacePath, workspace } = getWorkspace(tree);
+        const workspaceSchema = getWorkspace(tree);
+        const workspacePath: string = getWorkspacePath(tree);
 
         // getting project name
         if (!options.project) {
-            if (workspace.defaultProject) {
-                options.project = workspace.defaultProject;
+            if (workspaceSchema && workspaceSchema.defaultProject) {
+                options.project = workspaceSchema.defaultProject;
             } else {
                 throw new SchematicsException(
                     'No Angular project selected and no default project in the workspace'
@@ -49,7 +21,7 @@ export function sourceMapBuilder(options: NgAddOptions): Rule {
         }
 
         // Validating project name
-        const project = workspace.projects[options.project];
+        const project: WorkspaceProject<ProjectType.Application> = workspaceSchema.projects[options.project];
         if (!project) {
             throw new SchematicsException(
                 'The specified Angular project is not defined in this workspace'
@@ -59,7 +31,7 @@ export function sourceMapBuilder(options: NgAddOptions): Rule {
         // Checking if it is application
         if (project.projectType !== 'application') {
             throw new SchematicsException(
-                `Deploy requires an Angular project type of "application" in angular.json`
+                `source-map-analyzer requires an Angular project type of "application" in angular.json`
             );
         }
 
@@ -83,7 +55,7 @@ export function sourceMapBuilder(options: NgAddOptions): Rule {
             }
         }
 
-        tree.overwrite(workspacePath, JSON.stringify(workspace, null, 2));
+        tree.overwrite(workspacePath, JSON.stringify(workspaceSchema, null, 2));
         return tree;
     };
 }

ng-add/index.ts

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "source-map-explore",
+  "$id": "source-map-explore",
   "title": "Builder to analyze using source-map-explorer",
   "type": "object",
   "properties": {

ng-add/schema.json

@@ -0,0 +1,5 @@
+export interface NgAddOptions {
+    project: string | undefined;
+    siteID: string;
+    netlifyToken: string;
+}

ng-add/schema.ts

@@ -1,6 +1,6 @@
 {
   "name": "@ngx-builders/analyze",
-  "version": "2.3.3",
+  "version": "3.0.0",
   "description": "",
   "main": "index.js",
   "builders": "./builders.json",
@@ -10,7 +10,7 @@
   },
   "scripts": {
     "build": "tsc",
-    "test": "ts-node node_modules/jasmine/bin/jasmine command/index_spec.ts"
+    "test": "ts-node node_modules/jasmine/bin/jasmine analyze/index_spec.ts"
   },
   "repository": {
     "type": "git",
@@ -33,16 +33,16 @@
   "author": "Santosh Yadav <santosh.yadav198613@gmail.com>",
   "license": "MIT",
   "devDependencies": {
-    "@types/jasmine": "3.7.4",
-    "@types/node": "14.17.0",
-    "jasmine": "3.7.0",
+    "@types/jasmine": "3.10.2",
+    "@types/node": "16.11.11",
+    "jasmine": "3.10.0",
     "jasmine-node": "3.0.0",
-    "ts-node": "9.1.1",
-    "typescript": "4.2.4"
+    "ts-node": "10.4.0",
+    "typescript": "~4.5.2"
   },
   "dependencies": {
-    "@angular-devkit/architect": "0.1002.0",
-    "@angular-devkit/core": "10.2.0",
+    "@angular-devkit/architect": "0.1300.0",
+    "@angular-devkit/core": "13.0.0",
     "schematics-utilities": "2.0.3"
   }
 }