Skip to content

Commit 5957e67

Browse files
authored
Merge pull request #3682 from IgniteUI/vnext
fix(QB): Update query-builder-request-sample.component.ts (#3681)
2 parents 872bc64 + e96eebf commit 5957e67

File tree

201 files changed

+13747
-17861
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

201 files changed

+13747
-17861
lines changed

.github/workflows/build-app-crm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
strategy:
3131
matrix:
32-
node-version: [18.x, 20.x]
32+
node-version: [20.x, 22.x]
3333

3434
# Steps represent a sequence of tasks that will be executed as part of the job
3535
steps:

.github/workflows/build-app-lob.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
strategy:
3636
matrix:
37-
node-version: [18.x, 20.x]
37+
node-version: [20.x, 22.x]
3838

3939
# Steps represent a sequence of tasks that will be executed as part of the job
4040
steps:

angular.json

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"prefix": "app",
1111
"architect": {
1212
"build": {
13-
"builder": "@angular-devkit/build-angular:application",
13+
"builder": "@angular/build:application",
1414
"options": {
1515
"outputPath": {
1616
"base": "dist/app"
@@ -64,7 +64,7 @@
6464
}
6565
},
6666
"serve": {
67-
"builder": "@angular-devkit/build-angular:dev-server",
67+
"builder": "@angular/build:dev-server",
6868
"options": {
6969
"buildTarget": "my-app:build"
7070
},
@@ -75,13 +75,13 @@
7575
}
7676
},
7777
"extract-i18n": {
78-
"builder": "@angular-devkit/build-angular:extract-i18n",
78+
"builder": "@angular/build:extract-i18n",
7979
"options": {
8080
"buildTarget": "my-app:build"
8181
}
8282
},
8383
"test": {
84-
"builder": "@angular-devkit/build-angular:karma",
84+
"builder": "@angular/build:karma",
8585
"options": {
8686
"main": "src/test.ts",
8787
"karmaConfig": "./karma.conf.js",
@@ -125,7 +125,7 @@
125125
"prefix": "app",
126126
"architect": {
127127
"build": {
128-
"builder": "@angular-devkit/build-angular:application",
128+
"builder": "@angular/build:application",
129129
"options": {
130130
"outputPath": {
131131
"base": "dist/app-lob"
@@ -190,7 +190,7 @@
190190
}
191191
},
192192
"serve": {
193-
"builder": "@angular-devkit/build-angular:dev-server",
193+
"builder": "@angular/build:dev-server",
194194
"options": {
195195
"buildTarget": "app-lob:build"
196196
},
@@ -201,13 +201,13 @@
201201
}
202202
},
203203
"extract-i18n": {
204-
"builder": "@angular-devkit/build-angular:extract-i18n",
204+
"builder": "@angular/build:extract-i18n",
205205
"options": {
206206
"buildTarget": "app-lob:build"
207207
}
208208
},
209209
"test": {
210-
"builder": "@angular-devkit/build-angular:karma",
210+
"builder": "@angular/build:karma",
211211
"options": {
212212
"main": "projects/app-lob/src/test.ts",
213213
"polyfills": "projects/app-lob/src/polyfills.ts",
@@ -251,7 +251,7 @@
251251
"prefix": "app",
252252
"architect": {
253253
"build": {
254-
"builder": "@angular-devkit/build-angular:application",
254+
"builder": "@angular/build:application",
255255
"options": {
256256
"outputPath": {
257257
"base": "dist/app-crm"
@@ -315,7 +315,7 @@
315315
}
316316
},
317317
"serve": {
318-
"builder": "@angular-devkit/build-angular:dev-server",
318+
"builder": "@angular/build:dev-server",
319319
"options": {
320320
"buildTarget": "app-crm:build"
321321
},
@@ -326,13 +326,13 @@
326326
}
327327
},
328328
"extract-i18n": {
329-
"builder": "@angular-devkit/build-angular:extract-i18n",
329+
"builder": "@angular/build:extract-i18n",
330330
"options": {
331331
"buildTarget": "app-crm:build"
332332
}
333333
},
334334
"test": {
335-
"builder": "@angular-devkit/build-angular:karma",
335+
"builder": "@angular/build:karma",
336336
"options": {
337337
"main": "projects/app-crm/src/test.ts",
338338
"polyfills": "projects/app-crm/src/polyfills.ts",
@@ -368,10 +368,30 @@
368368
"schematics": {
369369
"@schematics/angular:component": {
370370
"prefix": "app",
371-
"style": "scss"
371+
"style": "scss",
372+
"type": "component"
372373
},
373374
"@schematics/angular:directive": {
374-
"prefix": "app"
375+
"prefix": "app",
376+
"type": "directive"
377+
},
378+
"@schematics/angular:service": {
379+
"type": "service"
380+
},
381+
"@schematics/angular:guard": {
382+
"typeSeparator": "."
383+
},
384+
"@schematics/angular:interceptor": {
385+
"typeSeparator": "."
386+
},
387+
"@schematics/angular:module": {
388+
"typeSeparator": "."
389+
},
390+
"@schematics/angular:pipe": {
391+
"typeSeparator": "."
392+
},
393+
"@schematics/angular:resolver": {
394+
"typeSeparator": "."
375395
}
376396
},
377397
"cli": {

gulpfile.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ require('ts-node').register({
88
transpileOnly: true,
99
compilerOptions: {
1010
module: "commonjs",
11+
moduleResolution: "node",
1112
allowJs: true
1213
}
1314
});

0 commit comments

Comments
 (0)