Skip to content

Commit 2fc6a47

Browse files
authored
Merge pull request #81 from rubberduck-vba/webhook
Angular update
2 parents e64dfd3 + 0b1cf11 commit 2fc6a47

File tree

64 files changed

+11359
-13944
lines changed

Some content is hidden

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

64 files changed

+11359
-13944
lines changed

rubberduckvba.client/angular.json

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"prefix": "app",
1212
"architect": {
1313
"build": {
14-
"builder": "@angular-devkit/build-angular:application",
14+
"builder": "@angular/build:application",
1515
"options": {
1616
"outputPath": {
1717
"base": "dist/rubberduckvba.client"
@@ -39,7 +39,7 @@
3939
"budgets": [
4040
{
4141
"type": "initial",
42-
"maximumWarning": "2.5mb",
42+
"maximumWarning": "3mb",
4343
"maximumError": "4mb"
4444
},
4545
{
@@ -87,7 +87,7 @@
8787
"defaultConfiguration": "production"
8888
},
8989
"serve": {
90-
"builder": "@angular-devkit/build-angular:dev-server",
90+
"builder": "@angular/build:dev-server",
9191
"configurations": {
9292
"production": {
9393
"buildTarget": "rubberduckvba.client:build:production"
@@ -102,13 +102,13 @@
102102
}
103103
},
104104
"extract-i18n": {
105-
"builder": "@angular-devkit/build-angular:extract-i18n",
105+
"builder": "@angular/build:extract-i18n",
106106
"options": {
107107
"buildTarget": "rubberduckvba.client:build"
108108
}
109109
},
110110
"test": {
111-
"builder": "@angular-devkit/build-angular:karma",
111+
"builder": "@angular/build:karma",
112112
"options": {
113113
"polyfills": [
114114
"zone.js",
@@ -129,5 +129,31 @@
129129
}
130130
}
131131
}
132+
},
133+
"schematics": {
134+
"@schematics/angular:component": {
135+
"type": "component"
136+
},
137+
"@schematics/angular:directive": {
138+
"type": "directive"
139+
},
140+
"@schematics/angular:service": {
141+
"type": "service"
142+
},
143+
"@schematics/angular:guard": {
144+
"typeSeparator": "."
145+
},
146+
"@schematics/angular:interceptor": {
147+
"typeSeparator": "."
148+
},
149+
"@schematics/angular:module": {
150+
"typeSeparator": "."
151+
},
152+
"@schematics/angular:pipe": {
153+
"typeSeparator": "."
154+
},
155+
"@schematics/angular:resolver": {
156+
"typeSeparator": "."
157+
}
132158
}
133159
}

rubberduckvba.client/karma.conf.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = function (config) {
1+
module.exports = function (config) {
22
config.set({
33
basePath: '',
44
frameworks: ['jasmine', '@angular-devkit/build-angular'],
@@ -7,7 +7,7 @@
77
require('karma-chrome-launcher'),
88
require('karma-jasmine-html-reporter'),
99
require('karma-coverage'),
10-
require('@angular-devkit/build-angular/plugins/karma')
10+
1111
],
1212
client: {
1313
jasmine: {

0 commit comments

Comments
 (0)