Skip to content

Commit be9a039

Browse files
authored
Merge pull request #72 from GSA/feature/angular_update
Angular update to 15; removed outdated package; fixed formatting; switched from npm to yarn. Tested and successful.
2 parents 659785f + 0448788 commit be9a039

66 files changed

Lines changed: 10261 additions & 19740 deletions

File tree

Some content is hidden

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

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,7 @@ testem.log
4040
# System Files
4141
.DS_Store
4242
Thumbs.db
43+
44+
#Angular
45+
.angular
46+
.dccache

angular.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"build": {
1212
"builder": "@angular-devkit/build-angular:browser",
1313
"options": {
14+
"allowedCommonJsDependencies": ["os", "stream"],
1415
"outputPath": "dist",
1516
"index": "src/index.html",
1617
"main": "src/main.ts",
@@ -23,11 +24,11 @@
2324
],
2425
"styles": [
2526
"src/styles.css",
26-
"node_modules/font-awesome/css/font-awesome.min.css",
27+
"node_modules/font-awesome/css/font-awesome.min.css"
2728
],
2829
"scripts": [
2930
"node_modules/jquery/dist/jquery.min.js",
30-
"node_modules/chart.js/dist/Chart.bundle.min.js",
31+
"node_modules/chart.js/dist/Chart.js"
3132
]
3233
},
3334
"configurations": {
@@ -108,13 +109,13 @@
108109
"tsConfig": "src/tsconfig.spec.json",
109110
"scripts": [
110111
"node_modules/jquery/dist/jquery.min.js",
111-
"node_modules/chart.js/dist/Chart.bundle.min.js",
112+
"node_modules/chart.js/dist/Chart.bundle.min.js"
112113
],
113114
"styles": [
114115
"src/styles.css",
115116
"src/nova-light-theme.css",
116117
"src/primeng.min.css",
117-
"node_modules/font-awesome/css/font-awesome.min.css",
118+
"node_modules/font-awesome/css/font-awesome.min.css"
118119
],
119120
"assets": [
120121
"src/assets",
@@ -168,5 +169,8 @@
168169
"@schematics/angular:directive": {
169170
"prefix": "app"
170171
}
172+
},
173+
"cli": {
174+
"analytics": false
171175
}
172176
}

0 commit comments

Comments
 (0)