Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
feudal
feudalWebpage
Commits
14a2b641
Commit
14a2b641
authored
Jun 04, 2018
by
Lukas Burgey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade the angular version to 6.0.3
parent
44e7affb
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
5727 additions
and
4339 deletions
+5727
-4339
.angular-cli.json
.angular-cli.json
+0
-60
angular.json
angular.json
+131
-0
karma.conf.js
karma.conf.js
+3
-3
package-lock.json
package-lock.json
+5570
-4255
package.json
package.json
+20
-18
src/tsconfig.spec.json
src/tsconfig.spec.json
+2
-1
tslint.json
tslint.json
+1
-2
No files found.
.angular-cli.json
deleted
100644 → 0
View file @
44e7affb
{
"$schema"
:
"./node_modules/@angular/cli/lib/config/schema.json"
,
"project"
:
{
"name"
:
"fum"
},
"apps"
:
[
{
"root"
:
"src"
,
"outDir"
:
"dist"
,
"assets"
:
[
"assets"
,
"favicon.ico"
],
"index"
:
"index.html"
,
"main"
:
"main.ts"
,
"polyfills"
:
"polyfills.ts"
,
"test"
:
"test.ts"
,
"tsconfig"
:
"tsconfig.app.json"
,
"testTsconfig"
:
"tsconfig.spec.json"
,
"prefix"
:
"app"
,
"styles"
:
[
"styles.css"
],
"scripts"
:
[],
"environmentSource"
:
"environments/environment.ts"
,
"environments"
:
{
"dev"
:
"environments/environment.ts"
,
"prod"
:
"environments/environment.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"
:
"css"
,
"component"
:
{}
}
}
angular.json
0 → 100644
View file @
14a2b641
{
"$schema"
:
"./node_modules/@angular/cli/lib/config/schema.json"
,
"version"
:
1
,
"newProjectRoot"
:
"projects"
,
"projects"
:
{
"fum"
:
{
"root"
:
""
,
"sourceRoot"
:
"src"
,
"projectType"
:
"application"
,
"architect"
:
{
"build"
:
{
"builder"
:
"@angular-devkit/build-angular:browser"
,
"options"
:
{
"outputPath"
:
"dist"
,
"index"
:
"src/index.html"
,
"main"
:
"src/main.ts"
,
"tsConfig"
:
"src/tsconfig.app.json"
,
"polyfills"
:
"src/polyfills.ts"
,
"assets"
:
[
"src/assets"
],
"styles"
:
[
"src/styles.css"
],
"scripts"
:
[]
},
"configurations"
:
{
"production"
:
{
"optimization"
:
true
,
"outputHashing"
:
"all"
,
"sourceMap"
:
false
,
"extractCss"
:
true
,
"namedChunks"
:
false
,
"aot"
:
true
,
"extractLicenses"
:
true
,
"vendorChunk"
:
false
,
"buildOptimizer"
:
true
,
"fileReplacements"
:
[
{
"replace"
:
"src/environments/environment.ts"
,
"with"
:
"src/environments/environment.prod.ts"
}
]
}
}
},
"serve"
:
{
"builder"
:
"@angular-devkit/build-angular:dev-server"
,
"options"
:
{
"browserTarget"
:
"fum:build"
},
"configurations"
:
{
"production"
:
{
"browserTarget"
:
"fum:build:production"
}
}
},
"extract-i18n"
:
{
"builder"
:
"@angular-devkit/build-angular:extract-i18n"
,
"options"
:
{
"browserTarget"
:
"fum: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"
]
}
},
"lint"
:
{
"builder"
:
"@angular-devkit/build-angular:tslint"
,
"options"
:
{
"tsConfig"
:
[
"src/tsconfig.app.json"
,
"src/tsconfig.spec.json"
],
"exclude"
:
[
"**/node_modules/**"
]
}
}
}
},
"fum-e2e"
:
{
"root"
:
""
,
"sourceRoot"
:
""
,
"projectType"
:
"application"
,
"architect"
:
{
"e2e"
:
{
"builder"
:
"@angular-devkit/build-angular:protractor"
,
"options"
:
{
"protractorConfig"
:
"./protractor.conf.js"
,
"devServerTarget"
:
"fum:serve"
}
},
"lint"
:
{
"builder"
:
"@angular-devkit/build-angular:tslint"
,
"options"
:
{
"tsConfig"
:
[
"e2e/tsconfig.e2e.json"
],
"exclude"
:
[
"**/node_modules/**"
]
}
}
}
}
},
"defaultProject"
:
"fum"
,
"schematics"
:
{
"@schematics/angular:component"
:
{
"prefix"
:
"app"
,
"styleext"
:
"css"
},
"@schematics/angular:directive"
:
{
"prefix"
:
"app"
}
}
}
karma.conf.js
View file @
14a2b641
...
...
@@ -4,19 +4,19 @@
module
.
exports
=
function
(
config
)
{
config
.
set
({
basePath
:
''
,
frameworks
:
[
'
jasmine
'
,
'
@angular
/cli
'
],
frameworks
:
[
'
jasmine
'
,
'
@angular
-devkit/build-angular
'
],
plugins
:
[
require
(
'
karma-jasmine
'
),
require
(
'
karma-chrome-launcher
'
),
require
(
'
karma-jasmine-html-reporter
'
),
require
(
'
karma-coverage-istanbul-reporter
'
),
require
(
'
@angular
/cli
/plugins/karma
'
)
require
(
'
@angular
-devkit/build-angular
/plugins/karma
'
)
],
client
:{
clearContext
:
false
// leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter
:
{
reports
:
[
'
html
'
,
'
lcovonly
'
],
dir
:
require
(
'
path
'
).
join
(
__dirname
,
'
coverage
'
),
reports
:
[
'
html
'
,
'
lcovonly
'
],
fixWebpackSourcePaths
:
true
},
angularCli
:
{
...
...
package-lock.json
View file @
14a2b641
This diff is collapsed.
Click to expand it.
package.json
View file @
14a2b641
...
...
@@ -12,30 +12,31 @@
},
"private"
:
true
,
"dependencies"
:
{
"
@angular/animations
"
:
"
5.2.9
"
,
"
@angular/cdk
"
:
"
^
5
.2.
4
"
,
"
@angular/common
"
:
"
5.2.9
"
,
"
@angular/compiler
"
:
"
5.2.9
"
,
"
@angular/core
"
:
"
5.2.9
"
,
"
@angular/forms
"
:
"
5.2.9
"
,
"
@angular/http
"
:
"
5.2.9
"
,
"
@angular/material
"
:
"
^
5
.2.
4
"
,
"
@angular/platform-browser
"
:
"
5.2.9
"
,
"
@angular/platform-browser-dynamic
"
:
"
5.2.9
"
,
"
@angular/platform-server
"
:
"
5.2.9
"
,
"
@angular/router
"
:
"
5.2.9
"
,
"
@angular/animations
"
:
"
6.0.3
"
,
"
@angular/cdk
"
:
"
^
6
.2.
0
"
,
"
@angular/common
"
:
"
6.0.3
"
,
"
@angular/compiler
"
:
"
6.0.3
"
,
"
@angular/core
"
:
"
6.0.3
"
,
"
@angular/forms
"
:
"
6.0.3
"
,
"
@angular/http
"
:
"
6.0.3
"
,
"
@angular/material
"
:
"
^
6
.2.
0
"
,
"
@angular/platform-browser
"
:
"
6.0.3
"
,
"
@angular/platform-browser-dynamic
"
:
"
6.0.3
"
,
"
@angular/platform-server
"
:
"
6.0.3
"
,
"
@angular/router
"
:
"
6.0.3
"
,
"
@stomp/ng2-stompjs
"
:
"
^0.6.4
"
,
"
core-js
"
:
"
^2.4.1
"
,
"
hammerjs
"
:
"
^2.0.8
"
,
"
ngx-cookie-service
"
:
"
^1.0.9
"
,
"
npm
"
:
"
^6.0.0
"
,
"
rxjs
"
:
"
^5.5.7
"
,
"
zone.js
"
:
"
^0.8.20
"
"
rxjs
"
:
"
^6.2.0
"
,
"
rxjs-compat
"
:
"
^6.0.0-rc.0
"
,
"
zone.js
"
:
"
^0.8.26
"
},
"devDependencies"
:
{
"
@angular/cli
"
:
"
1.7.3
"
,
"
@angular/compiler-cli
"
:
"
5.2.9
"
,
"
@angular/language-service
"
:
"
5.2.9
"
,
"
@angular/cli
"
:
"
^6.0.7
"
,
"
@angular/compiler-cli
"
:
"
6.0.3
"
,
"
@angular/language-service
"
:
"
6.0.3
"
,
"
@types/jasmine
"
:
"
~2.8.2
"
,
"
@types/jasminewd2
"
:
"
~2.0.2
"
,
"
@types/node
"
:
"
~8.0.53
"
,
...
...
@@ -50,6 +51,7 @@
"
protractor
"
:
"
~5.2.0
"
,
"
ts-node
"
:
"
~3.3.0
"
,
"
tslint
"
:
"
~5.8.0
"
,
"
typescript
"
:
"
2.6.2
"
"
typescript
"
:
"
2.7.2
"
,
"
@angular-devkit/build-angular
"
:
"
~0.6.6
"
}
}
src/tsconfig.spec.json
View file @
14a2b641
...
...
@@ -11,7 +11,8 @@
]
},
"files"
:
[
"test.ts"
"test.ts"
,
"polyfills.ts"
],
"include"
:
[
"**/*.spec.ts"
,
...
...
tslint.json
View file @
14a2b641
...
...
@@ -14,8 +14,7 @@
"eofline"
:
true
,
"forin"
:
true
,
"import-blacklist"
:
[
true
,
"rxjs"
true
],
"import-spacing"
:
true
,
"indent"
:
[
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment