Skip to content
Permalink
Browse files

BGR-2813: WIP - Removed some old webpack config files; initial work o…

…n tests, they run but the HTTP tests don't work because of the switch to HttpClient
  • Loading branch information...
Yona-Appletree committed Dec 5, 2018
1 parent ffba80d commit 9d91b4f8039c5a1bfc4a9dec95ba9efb162bac43
Showing with 1,642 additions and 4,039 deletions.
  1. +12 −98 .editorconfig
  2. +21 −21 angular.json
  3. +0 −26 config/head-config.common.js
  4. +0 −76 config/karma-ci.conf.js
  5. +0 −58 config/karma-common.conf.js
  6. +0 −50 config/karma-debug.conf.js
  7. +0 −49 config/protractor.conf.js
  8. +0 −63 config/spec-bundle.js
  9. +0 −180 config/webpack.common.dev.js
  10. +0 −354 config/webpack.common.js
  11. +0 −199 config/webpack.common.prod.js
  12. +0 −69 config/webpack.dev.js
  13. +0 −97 config/webpack.prod.js
  14. +0 −195 config/webpack.test.js
  15. +0 −90 config/webpack.widgets.js
  16. +28 −0 e2e/protractor.conf.js
  17. +13 −0 e2e/tsconfig.e2e.json
  18. +0 −31 karma.conf.js
  19. +1,326 −2,021 package-lock.json
  20. +121 −117 package.json
  21. +0 −6 protractor.conf.js
  22. +3 −2 src/app/common/app-config.service.ts
  23. +10 −9 src/app/common/model/linked-entity-set.spec.ts
  24. +24 −11 src/app/common/model/managed-entity-set.spec.ts
  25. +4 −14 src/app/common/services/user-profile-manager.service.spec.ts
  26. +1 −1 src/app/common/util/array-reducers.ts
  27. +1 −1 src/app/common/util/{mock-response-util.ts → mock-response-util.spec.ts}
  28. +1 −1 src/app/issuer/badge-selection-dialog.component.ts
  29. +1 −1 src/app/issuer/pathway-selection-dialog.component.ts
  30. +1 −1 src/app/issuer/recipientgroup-selection-dialog.component.ts
  31. +4 −3 src/app/issuer/services/badgeclass-manager.service.spec.ts
  32. +1 −1 src/app/issuer/services/badgeinstance-manager.service.spec.ts
  33. +3 −2 src/app/issuer/services/issuer-manager.service.spec.ts
  34. +1 −1 src/app/issuer/services/pathway-manager.service.spec.ts
  35. +1 −1 src/app/issuer/services/recipientgroup-manager.service.spec.ts
  36. +1 −1 src/app/recipient/recipient-badge-selection-dialog.component.ts
  37. +1 −1 src/app/recipient/services/recipient-badge-collection-manager.service.spec.ts
  38. +1 −1 src/app/recipient/services/recipient-badge-manager.service.spec.ts
  39. +0 −13 src/custom-typings.d.ts
  40. 0 src/{styles.css → styles.scss}
  41. +32 −0 src/test.ts
  42. +0 −48 src/test/e2e/onboarding/login.e2e.ts
  43. +0 −63 src/test/e2e/onboarding/signup.e2e.ts
  44. +0 −19 src/test/matchers.ts
  45. +3 −1 src/tsconfig.app.json
  46. +27 −24 tsconfig.json
  47. +0 −19 webpack.config.js
@@ -1,99 +1,13 @@
[*]
charset=utf-8
end_of_line=lf
insert_final_newline=false
indent_style=tab
tab_width=4

[{*.sht,*.html,*.shtm,*.shtml,*.ng,*.htm}]
indent_style=tab
tab_width=2

[{phpunit.xml.dist,*.jhm,*.xjb,*.rng,*.qrc,*.wsdl,*.fxml,*.pom,*.xslt,*.jrxml,*.ant,*.svg,*.xul,*.xsl,*.xsd,*.tld,*.jnlp,*.wsdd,*.wadl,*.xml}]
indent_style=tab
tab_width=2

[{.babelrc,.stylelintrc,.eslintrc,jest.config,*.bowerrc,*.jsb3,*.jsb2,*.json}]
indent_style=tab
tab_width=2

[*.css]
indent_style=tab
tab_width=2

[{openjscad,*.applejs,*.js}]
indent_style=space
indent_size=4

[{*.ts,*.ats}]
indent_style=tab
tab_width=2

[*.tsx]
indent_style=tab
tab_width=2

[*.js.flow]
indent_style=space
indent_size=4

[*.jsx]
indent_style=space
indent_size=4

[{jshint.json,*.jshintrc}]
indent_style=tab
tab_width=2

[{*.jscs.json,*.jscsrc}]
indent_style=tab
tab_width=2

[{*.module,*.hphp,*.phtml,*.php5,*.php4,*.php,*.inc}]
indent_style=space
indent_size=4

[*.coffee]
indent_style=space
indent_size=2

[*.conf]
indent_style=space
indent_size=2

[*.less]
indent_style=tab
tab_width=2

[*.sass]
indent_style=space
indent_size=2

[*.scss]
indent_style=space
indent_size=2

[*.styl]
indent_style=space
indent_size=2

[{scratch_29,*.yml,*.yaml}]
indent_style=space
indent_size=2

[{*.pyw,*.py}]
indent_style=space
indent_size=4

[*.pyi]
indent_style=space
indent_size=4

[{*.pyx,*.pxi,*.pxd}]
indent_style=space
indent_size=4

[tslint.json]
indent_style=tab
tab_width=2
# Editor configuration, see https://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = tab
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
max_line_length = off
trim_trailing_whitespace = false
@@ -18,10 +18,11 @@
"polyfills": "src/polyfills.ts",
"assets": [
"src/assets",
"src/favicon.ico"
"src/favicon.ico",
"src/unsupported-browser-warning.html"
],
"styles": [
"src/styles.css"
"src/styles.scss"
],
"scripts": []
},
@@ -62,24 +63,23 @@
"browserTarget": "badgr-ui-cli:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"karmaConfig": "./karma.conf.js",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"scripts": [],
"styles": [
"src/styles.css"
],
"assets": [
"src/assets",
"src/favicon.ico",
"src/unsupported-browser-warning.html"
]
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": [
"src/styles.scss"
],
"scripts": [],
"assets": [
"src/favicon.ico",
"src/assets"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
@@ -130,4 +130,4 @@
"prefix": "app"
}
}
}
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 9d91b4f

Please sign in to comment.
You can’t perform that action at this time.