Merge branch 'master' into mixed-support

Author: kchobantonov

packages/angular-material/angular.json

@@ -39,7 +39,10 @@
           }
         },
         "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server"
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+           "buildTarget": "example:build"
+          }
         }
       }
     },

packages/angular-material/example/app/app.component.ts

@@ -29,7 +29,7 @@ import {
   UISchemaElement,
   UISchemaTester,
 } from '@jsonforms/core';
-import { angularMaterialRenderers } from '../../lib';
+import { angularMaterialRenderers } from '../../src/library';
 
 const uiSchema = {
   type: 'HorizontalLayout',

packages/angular-material/example/app/app.module.ts

@@ -26,7 +26,7 @@ import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { AppComponent } from './app.component';
-import { JsonFormsAngularMaterialModule } from '../../lib';
+import { JsonFormsAngularMaterialModule } from '../../src/library';
 
 @NgModule({
   declarations: [AppComponent],

packages/angular-material/package.json

@@ -39,7 +39,7 @@
   "scripts": {
     "build": "ng build",
     "build:examples-app": "pnpm run build && ng build --project=example",
-    "dev": "pnpm run build:examples-app && npx http-server ./example/dist/ -c-1 -o",
+    "dev": "ng serve --project=example",
     "clean": "rimraf lib coverage example/dist .nyc_output 2> /dev/null",
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",

packages/angular-material/tsconfig.example.json

@@ -1,13 +1,19 @@
 {
   "extends": "./tsconfig",
   "compilerOptions": {
-    "outDir": "./example/dist"
+    "outDir": "./example/dist",
+    "baseUrl": "./",
+     "paths": {
+      "@jsonforms/angular": ["../angular/src"],
+      "@jsonforms/core": ["../core/src"],
+      "@jsonforms/examples": ["../examples/src"],
+    },
   },
   "files": ["./example/main.ts"],
   "angularCompilerOptions": {
     "compilationMode": "full",
     "strictMetadataEmit": true,
     "generateCodeForLibraries": false,
-    "skipTemplateCodegen": true
+    "skipTemplateCodegen": true,
   }
 }