diff --git a/packages/angular-material/angular.json b/packages/angular-material/angular.json index 7248d149b..b92d93fdd 100644 --- a/packages/angular-material/angular.json +++ b/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" + } } } }, diff --git a/packages/angular-material/example/app/app.component.ts b/packages/angular-material/example/app/app.component.ts index 614240e2f..1d93aaef5 100644 --- a/packages/angular-material/example/app/app.component.ts +++ b/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', diff --git a/packages/angular-material/example/app/app.module.ts b/packages/angular-material/example/app/app.module.ts index 9b532e27a..0acb9995c 100644 --- a/packages/angular-material/example/app/app.module.ts +++ b/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], diff --git a/packages/angular-material/package.json b/packages/angular-material/package.json index fb8f8994d..7a34b1f77 100644 --- a/packages/angular-material/package.json +++ b/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 .", diff --git a/packages/angular-material/tsconfig.example.json b/packages/angular-material/tsconfig.example.json index 46c487ea8..becc65b27 100644 --- a/packages/angular-material/tsconfig.example.json +++ b/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, } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 09097040c..6b18066b4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22082,7 +22082,7 @@ snapshots: dependencies: '@ampproject/remapping': 2.3.0 '@angular-devkit/architect': 0.1802.12(chokidar@3.6.0) - '@angular-devkit/build-webpack': 0.1802.12(chokidar@3.6.0)(webpack-dev-server@5.0.4(webpack@5.91.0))(webpack@5.94.0(esbuild@0.23.0)) + '@angular-devkit/build-webpack': 0.1802.12(chokidar@3.6.0)(webpack-dev-server@5.0.4(webpack@5.94.0(esbuild@0.23.0)))(webpack@5.94.0(esbuild@0.23.0)) '@angular-devkit/core': 18.2.12(chokidar@3.6.0) '@angular/build': 18.2.12(@angular/compiler-cli@18.2.13(@angular/compiler@18.2.13(@angular/core@18.2.13(rxjs@6.6.7)(zone.js@0.14.10)))(typescript@5.5.4))(@types/node@22.13.8)(chokidar@3.6.0)(less@4.2.0)(postcss@8.4.41)(stylus@0.57.0)(terser@5.31.6)(typescript@5.5.4) '@angular/compiler-cli': 18.2.13(@angular/compiler@18.2.13(@angular/core@18.2.13(rxjs@6.6.7)(zone.js@0.14.10)))(typescript@5.5.4) @@ -22167,7 +22167,7 @@ snapshots: - utf-8-validate - webpack-cli - '@angular-devkit/build-webpack@0.1802.12(chokidar@3.6.0)(webpack-dev-server@5.0.4(webpack@5.91.0))(webpack@5.94.0(esbuild@0.23.0))': + '@angular-devkit/build-webpack@0.1802.12(chokidar@3.6.0)(webpack-dev-server@5.0.4(webpack@5.94.0(esbuild@0.23.0)))(webpack@5.94.0(esbuild@0.23.0))': dependencies: '@angular-devkit/architect': 0.1802.12(chokidar@3.6.0) rxjs: 7.8.1