10000 Update of angular · dynamic-forms/dynamic-forms@ec5c712 · GitHub
[go: up one dir, main page]
Skip to content

Commit ec5c712

Browse files
AlexanderGebuhrAlexanderGebuhr
committed
Update of angular
1 parent 0a5bb54 commit ec5c712

File tree

10 files changed

+533
-5888
lines changed

10 files changed

+533
-5888
lines changed

‎angular.json

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"prefix": "core",
1111
"architect": {
1212
"build": {
13-
"builder": "@angular-devkit/build-angular:ng-packagr",
13+
"builder": "@angular/build:ng-packagr",
1414
"options": {
1515
"tsConfig": "libs/core/tsconfig.lib.json",
1616
"project": "libs/core/ng-package.json"
@@ -22,7 +22,7 @@
2222
}
2323
},
2424
"test": {
25-
"builder": "@angular-devkit/build-angular:karma",
25+
"builder": "@angular/build:karma",
2626
"options": {
2727
"main": "libs/core/test.ts",
2828
"tsConfig": "libs/core/tsconfig.spec.json",
@@ -51,7 +51,7 @@
5151
"prefix": "bootstrap",
5252
"architect": {
5353
"build": {
54-
"builder": "@angular-devkit/build-angular:ng-packagr",
54+
"builder": "@angular/build:ng-packagr",
5555
"options": {
5656
"tsConfig": "libs/bootstrap/tsconfig.lib.json",
5757
"project": "libs/bootstrap/ng-package.json"
@@ -63,7 +63,7 @@
6363
}
6464
},
6565
"test": {
66-
"builder": "@angular-devkit/build-angular:karma",
66+
"builder": "@angular/build:karma",
6767
"options": {
6868
"main": "libs/bootstrap/test.ts",
6969
"tsConfig": "libs/bootstrap/tsconfig.spec.json",
@@ -92,7 +92,7 @@
9292
"prefix": "material",
9393
"architect": {
9494
"build": {
95-
"builder": "@angular-devkit/build-angular:ng-packagr",
95+
"builder": "@angular/build:ng-packagr",
9696
"options": {
9797
"tsConfig": "libs/material/tsconfig.lib.json",
9898
"project": "libs/material/ng-package.json"
@@ -104,7 +104,7 @@
104104
}
105105
},
106106
"test": {
107-
"builder": "@angular-devkit/build-angular:karma",
107+
"builder": "@angular/build:karma",
108108
"options": {
109109
"main": "libs/material/test.ts",
110110
"tsConfig": "libs/material/tsconfig.spec.json",
@@ -133,7 +133,7 @@
133133
"prefix": "markdown",
134134
"architect": {
135135
"build": {
136-
"builder": "@angular-devkit/build-angular:ng-packagr",
136+
"builder": "@angular/build:ng-packagr",
137137
"options": {
138138
"tsConfig": "libs/markdown/tsconfig.lib.json",
139139
"project": "libs/markdown/ng-package.json"
@@ -145,7 +145,7 @@
145145
}
146146
},
147147
"test": {
148-
"builder": "@angular-devkit/build-angular:karma",
148+
"builder": "@angular/build:karma",
149149
"options": {
150150
"main": "libs/markdown/test.ts",
151151
"tsConfig": "libs/markdown/tsconfig.spec.json",
@@ -172,7 +172,7 @@
172172
"projectType": "library",
173173
"architect": {
174174
"test": {
175-
"builder": "@angular-devkit/build-angular:karma",
175+
"builder": "@angular/build:karma",
176176
"options": {
177177
"main": "libs/test.ts",
178178
"tsConfig": "libs/tsconfig.spec.json",
@@ -204,7 +204,7 @@
204204
},
205205
"architect": {
206206
"build": {
207-
"builder": "@angular-devkit/build-angular:application",
207+
"builder": "@angular/build:application",
208208
"options": {
209209
"outputPath": {
210210
"base": "dist/v20/@dynamic-forms/demo",
@@ -298,7 +298,7 @@
298298
}
299299
},
300300
"serve": {
301-
"builder": "@angular-devkit/build-angular:dev-server",
301+
"builder": "@angular/build:dev-server",
302302
"options": {
303303
"buildTarget": "dynamic-forms-demo:build"
304304
},
@@ -309,16 +309,18 @@
309309
}
310310
},
311311
"extract-i18n": {
312-
"builder": "@angular-devkit/build-angular:extract-i18n",
312+
"builder": "@angular/build:extract-i18n",
313313
"options": {
314314
"buildTarget": "dynamic-forms-demo:build"
315315
}
316316
},
317317
"test": {
318-
"builder": "@angular-devkit/build-angular:karma",
318+
"builder": "@angular/build:karma",
319319
"options": {
320320
"main": "apps/demo/src/test.ts",
321-
"polyfills": "apps/demo/src/polyfills.ts",
321+
"polyfills": [
322+
"apps/demo/src/polyfills.ts"
323+
],
322324
"tsConfig": "apps/demo/tsconfig.spec.json",
323325
"karmaConfig": "apps/demo/karma.conf.js",
324326
"assets": [
@@ -392,4 +394,4 @@
392394
"typeSeparator": "."
393395
}
394396
}
395-
}
397+
}

‎apps/demo/karma.conf.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
module.exports = function (config) {
55
config.set({
66
basePath: '',
7-
frameworks: ['jasmine', '@angular-devkit/build-angular'],
7+
frameworks: ['jasmine'],
88
plugins: [
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-junit-reporter'),
1313
require('karma-coverage'),
14-
require('@angular-devkit/build-angular/plugins/karma')
1514
],
1615
client: {
1716
clearContext: false // leave Jasmine Spec Runner output visible in browser

‎libs/bootstrap/karma.conf.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
module.exports = function (config) {
55
config.set({
66
basePath: '',
7-
frameworks: ['jasmine', '@angular-devkit/build-angular'],
7+
frameworks: ['jasmine'],
88
plugins: [
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-junit-reporter'),
1313
require('karma-coverage'),
14-
require('@angular-devkit/build-angular/plugins/karma')
1514
],
1615
client: {
1716
clearContext: false // leave Jasmine Spec Runner output visible in browser

‎libs/core/karma.conf.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
module.exports = function (config) {
55
config.set({
66
basePath: '',
7-
frameworks: ['jasmine', '@angular-devkit/build-angular'],
7+
frameworks: ['jasmine'],
88
plugins: [
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-junit-reporter'),
1313
require('karma-coverage'),
14-
require('@angular-devkit/build-angular/plugins/karma')
1514
],
1615
client: {
1716
clearContext: false // leave Jasmine Spec Runner output visible in browser

‎libs/karma.conf.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
module.exports = function (config) {
55
config.set({
66
basePath: '',
7-
frameworks: ['jasmine', '@angular-devkit/build-angular'],
7+
frameworks: ['jasmine'],
88
plugins: [
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-junit-reporter'),
1313
require('karma-coverage'),
14-
require('@angular-devkit/build-angular/plugins/karma')
1514
],
1615
client: {
1716
clearContext: false // leave Jasmine Spec Runner output visible in browser

‎libs/markdown/karma.conf.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
module.exports = function (config) {
55
config.set({
66
basePath: '',
7-
frameworks: ['jasmine', '@angular-devkit/build-angular'],
7+
frameworks: ['jasmine'],
88
plugins: [
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-junit-reporter'),
1313
require('karma-coverage'),
14-
require('@angular-devkit/build-angular/plugins/karma')
1514
],
1615
client: {
1716
clearContext: false // leave Jasmine Spec Runner output visible in browser

‎libs/markdown/src/lib/dynamic-form-markdown.service.spec.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { HttpTestingController, provideHttpClientTesting } from '@angular/common
33
import { SecurityContext } from '@angular/core';
44
import { TestBed } from '@angular/core/testing';
55
import { DomSanitizer } from '@angular/platform-browser';
6-
import { MockService } from 'ng-mocks';
6+
import { MockProvider } from 'ng-mocks';
77
import { provideDynamicFormsMarkdown } from './dynamic-form-markdown.module';
88
import { DynamicFormMarkdownService } from './dynamic-form-markdown.service';
99

@@ -13,23 +13,20 @@ describe('DynamicFormMarkdownService', () => {
1313
let httpTestingController: HttpTestingController;
1414

1515
beforeEach(() => {
16-
domSanitizer = MockService(DomSanitizer);
17-
spyOn(domSanitizer, 'sanitize').and.callFake((_context, value) => value as string);
18-
1916
TestBed.configureTestingModule({
2017
providers: [
2118
provideHttpClient(withInterceptorsFromDi()),
2219
provideHttpClientTesting(),
2320
provideDynamicFormsMarkdown(),
24-
{
25-
provide: DomSanitizer,
26-
useValue: domSanitizer,
27-
},
21+
MockProvider(DomSanitizer, { sanitize: (_context: SecurityContext, value: string) => value }),
2822
],
2923
});
3024

25+
domSanitizer = TestBed.inject(DomSanitizer);
3126
service = TestBed.inject(DynamicFormMarkdownService);
3227
httpTestingController = TestBed.inject(HttpTestingController);
28+
29+
spyOn(domSanitizer, 'sanitize').and.callThrough();
3330
});
3431

3532
it('returns compiled markdown', done => {

‎libs/material/karma.conf.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
module.exports = function (config) {
55
config.set({
66
basePath: '',
7-
frameworks: ['jasmine', '@angular-devkit/build-angular'],
7+
frameworks: ['jasmine'],
88
plugins: [
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-junit-reporter'),
1313
require('karma-coverage'),
14-
require('@angular-devkit/build-angular/plugins/karma')
1514
],
1615
client: {
1716
clearContext: false // leave Jasmine Spec Runner output visible in browser

0 commit comments

Comments
 (0)
0