Skip to content

Commit

Permalink
Merge pull request #96 from SayakMukhopadhyay/ng5
Browse files Browse the repository at this point in the history
Upgrades to Angular 5
  • Loading branch information
SayakMukhopadhyay authored Mar 2, 2018
2 parents 1c051ba + 59d032a commit 25b10ec
Show file tree
Hide file tree
Showing 51 changed files with 7,953 additions and 4,849 deletions.
24 changes: 3 additions & 21 deletions .angular-cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,18 @@
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"styles": [
"styles.scss",
"../node_modules/clarity-icons/clarity-icons.min.css",
"../node_modules/clarity-ui/clarity-ui.min.css",
"../node_modules/@clr/icons/clr-icons.min.css",
"../node_modules/@clr/ui/clr-ui.min.css",
"../node_modules/prismjs/themes/prism.css"
],
"scripts": [
"../node_modules/mutationobserver-shim/dist/mutationobserver.min.js",
"../node_modules/@webcomponents/custom-elements/custom-elements.min.js",
"../node_modules/clarity-icons/clarity-icons.min.js",
"../node_modules/@clr/icons/clr-icons.min.js",
"../node_modules/prismjs/prism.js",
"../node_modules/prismjs/components/prism-json.min.js"
],
Expand All @@ -51,27 +49,11 @@
}
}
],
"e2e": {
"protractor": {
"config": "./protractor.conf.js"
}
},
"lint": [
{
"project": "src/tsconfig.app.json"
},
{
"project": "src/tsconfig.spec.json"
},
{
"project": "e2e/tsconfig.e2e.json"
}
],
"test": {
"karma": {
"config": "./karma.conf.js"
}
},
"defaults": {
"styleExt": "css",
"component": {}
Expand Down
14 changes: 0 additions & 14 deletions e2e/app.e2e-spec.ts

This file was deleted.

11 changes: 0 additions & 11 deletions e2e/app.po.ts

This file was deleted.

12 changes: 0 additions & 12 deletions e2e/tsconfig.e2e.json

This file was deleted.

44 changes: 0 additions & 44 deletions karma.conf.js

This file was deleted.

7 changes: 6 additions & 1 deletion nodemon.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
{
"watch": [
"server.js",
"server/",
"bin/"
],
"ignore": [
"dist/*",
"server/dumps/*",
"server/references/*"
]
}
}
Loading

0 comments on commit 25b10ec

Please sign in to comment.