Merge pull request #16 from avrios/chore/AV-26330

chore: Update angular to 13 and fix `id` in schema.json

Author: brunoalvesavrios

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "avrios-schematics",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "description": "A blank schematics",
   "scripts": {
     "build": "tsc -p tsconfig.json"
@@ -12,13 +12,12 @@
   "license": "MIT",
   "schematics": "./src/collection.json",
   "devDependencies": {
-    "@angular-devkit/core": "^7.3.4",
-    "@angular-devkit/schematics": "^7.3.4",
-    "@schematics/angular": "^7.3.4",
-    "@types/jasmine": "^3.0.0",
-    "@types/node": "^8.0.31",
-    "jasmine": "^3.0.0",
-    "rxjs": "^6.4.0",
-    "typescript": "~3.2.2"
+    "@angular-devkit/architect": "0.1300.1",
+    "@angular-devkit/core": "13.0.1",
+    "@angular-devkit/schematics": "13.0.1",
+    "@schematics/angular": "13.0.1",
+    "@types/node": "15.0.2",
+    "rxjs": "7.4.0",
+    "typescript": "4.4.4"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/schema",
-    "id": "SchematicsAngularComponent",
+    "$id": "SchematicsAngularComponent",
     "title": "Angular Component Options Schema",
     "type": "object",
     "description": "Creates a new generic API service definition in the given or default project.",

src/api-service/index.js

@@ -52,7 +52,7 @@ export default function (options: ComponentOptions): Rule {
         const parsedPath = parseName(options.path, options.name);
         options.name = parsedPath.name;
         options.path = parsedPath.path;
-        options.selector = options.selector || buildSelector(options, project.prefix);
+        options.selector = options.selector || buildSelector(options, project.prefix ?? '');
 
         validateName(options.name);
         validateHtmlSelector(options.selector);

src/api-service/schema.json

@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/schema",
-    "id": "SchematicsAngularComponent",
+    "$id": "SchematicsAngularComponent",
     "title": "Angular Component Options Schema",
     "type": "object",
     "description": "Creates a new generic component definition in the given or default project.",

src/component/index.js

@@ -1,5 +1,5 @@
 import * as ts from 'typescript';
-import { experimental, strings } from '@angular-devkit/core';
+import { strings } from '@angular-devkit/core';
 import {
     Rule,
     SchematicsException,
@@ -80,7 +80,7 @@ export default function (options: LibraryOptions): Rule {
         const workspaceContent = workspaceConfig.toString();
         const nxWorkspaceContent = nxWorkspaceConfig.toString();
 
-        const workspace: experimental.workspace.WorkspaceSchema = JSON.parse(workspaceContent);
+        const workspace = JSON.parse(workspaceContent);
         const nxWorkspace: NxWorkspaceSchema = JSON.parse(nxWorkspaceContent);
 
         const libId = `shared-${dasherizedName}`;

src/component/index.ts

@@ -1,6 +1,6 @@
 {
     "$schema": "http://json-schema.org/schema",
-    "id": "SchematicsAngularComponent",
+    "$id": "SchematicsAngularComponent",
     "title": "Angular Library Options Schema",
     "type": "object",
     "description": "Creates a new generic Library definition in the given or default project.",