Skip to content

Commit

Permalink
refactor(app): update app for @ionic/angular version 4
Browse files Browse the repository at this point in the history
  • Loading branch information
brandyscarney committed Feb 26, 2018
1 parent 6a0327a commit 7d2dbbc
Show file tree
Hide file tree
Showing 93 changed files with 6,566 additions and 1,118 deletions.
65 changes: 65 additions & 0 deletions .angular-cli.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "ionic-conference-app"
},
"apps": [
{
"root": "src",
"outDir": "www",
"assets": [
"assets",
{
"glob": "**/*",
"input": "../node_modules/@ionic/core/dist",
"output": "./ionic/core"
}
],
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "",
"styles": [
"theme/variables.scss",
"global.scss"
],
"scripts": [],
"environmentSource": "environments/index.ts",
"environments": {
"dev": "environments/index.ts",
"prod": "environments/prod.ts"
}
}
],
"e2e": {
"protractor": {
"config": "./protractor.conf.js"
}
},
"lint": [
{
"project": "src/tsconfig.app.json",
"exclude": "**/node_modules/**"
},
{
"project": "src/tsconfig.spec.json",
"exclude": "**/node_modules/**"
},
{
"project": "e2e/tsconfig.e2e.json",
"exclude": "**/node_modules/**"
}
],
"test": {
"karma": {
"config": "./karma.conf.js"
}
},
"defaults": {
"styleExt": "scss",
"component": {}
}
}
14 changes: 5 additions & 9 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs
# editorconfig.org

# Editor configuration, see http://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2

# We recommend you to keep these unchanged
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false
max_line_length = off
trim_trailing_whitespace = false
7 changes: 3 additions & 4 deletions ionic.config.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"name": "ionic-conference-app",
"app_id": "",
"type": "ionic-angular",
"integrations": {
"cordova": {}
}
"type": "angular",
"integrations": {},
"hooks": {}
}
Loading

0 comments on commit 7d2dbbc

Please sign in to comment.