Upgrade Angular first step

pull/572/head
Chocobozzz 2018-05-15 10:58:08 +02:00
parent ed9118bad0
commit 54c3a22faa
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
4 changed files with 832 additions and 626 deletions

View File

@ -1,68 +0,0 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "PeerTube"
},
"apps": [
{
"root": "src",
"outDir": "dist",
"assets": [
"./assets/images",
"./manifest.json"
],
"deployUrl": "client/",
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "app",
"serviceWorker": true,
"styles": [
"sass/application.scss"
],
"stylePreprocessorOptions": {
"includePaths": [
"sass/include"
]
},
"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": "scss",
"component": {
}
}
}

139
client/angular.json Normal file
View File

@ -0,0 +1,139 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"PeerTube": {
"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",
"stylePreprocessorOptions": {
"includePaths": [
"src/sass/include"
]
},
"assets": [
"src/assets/images",
"src/manifest.json"
],
"styles": [
"src/sass/application.scss"
],
"scripts": []
},
"configurations": {
"production": {
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"serviceWorker": true,
"ngswConfigPath": "/src/ngsw-config.json",
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "PeerTube:build"
},
"configurations": {
"production": {
"browserTarget": "PeerTube:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "PeerTube: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/sass/application.scss"
],
"assets": [
"src/assets/images",
"src/manifest.json"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"PeerTube-e2e": {
"root": "",
"sourceRoot": "",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "PeerTube:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"e2e/tsconfig.e2e.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
"defaultProject": "PeerTube",
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"styleext": "scss"
},
"@schematics/angular:directive": {
"prefix": "app"
}
}
}

View File

@ -25,24 +25,25 @@
"videojs-dock/video.js": "^6"
},
"devDependencies": {
"@angular/animations": "~5.2.2",
"@angular/cli": "1.7.4",
"@angular/common": "~5.2.2",
"@angular/compiler": "~5.2.2",
"@angular/compiler-cli": "~5.2.2",
"@angular/core": "~5.2.2",
"@angular/forms": "~5.2.2",
"@angular/http": "~5.2.2",
"@angular/language-service": "^5.1.0",
"@angular/platform-browser": "~5.2.2",
"@angular/platform-browser-dynamic": "~5.2.2",
"@angular/router": "~5.2.2",
"@angular/service-worker": "^5.2.4",
"@angular-devkit/build-angular": "~0.6.1",
"@angular/animations": "~6.0.1",
"@angular/cli": "6.0.1",
"@angular/common": "~6.0.1",
"@angular/compiler": "~6.0.1",
"@angular/compiler-cli": "~6.0.1",
"@angular/core": "~6.0.1",
"@angular/forms": "~6.0.1",
"@angular/http": "~6.0.1",
"@angular/language-service": "^6.0.1",
"@angular/platform-browser": "~6.0.1",
"@angular/platform-browser-dynamic": "~6.0.1",
"@angular/router": "~6.0.1",
"@angular/service-worker": "^6.0.1",
"@angularclass/hmr": "^2.1.3",
"@ngx-loading-bar/core": "^1.1.1",
"@ngx-loading-bar/http-client": "^1.0.0-rc.1",
"@ngx-loading-bar/router": "^1.2.0",
"@ngx-meta/core": "^5.0.0",
"@ngx-meta/core": "^6.0.0-rc.1",
"@types/core-js": "^0.9.28",
"@types/lodash-es": "^4.17.0",
"@types/markdown-it": "^0.0.4",
@ -50,7 +51,7 @@
"@types/sanitize-html": "^1.14.0",
"@types/video.js": "6.2.4",
"@types/webtorrent": "^0.98.4",
"angular2-notifications": "^1.0.0",
"angular2-notifications": "^1.0.2",
"awesome-typescript-loader": "5.0.0",
"bootstrap-sass": "^3.3.7",
"cache-chunk-store": "^2.0.0",
@ -65,23 +66,23 @@
"lodash-es": "^4.17.4",
"markdown-it": "^8.4.0",
"ngx-bootstrap": "2.0.3",
"ngx-chips": "1.7.9",
"ngx-clipboard": "10.0.0",
"ngx-pipes": "^2.0.5",
"ngx-chips": "1.9.2",
"ngx-clipboard": "11.0.0",
"ngx-pipes": "^2.1.7",
"node-sass": "^4.1.1",
"npm-font-source-sans-pro": "^1.0.2",
"primeng": "^5.0.2",
"primeng": "^5.2.6",
"purify-css": "^1.2.5",
"purifycss-webpack": "^0.7.0",
"raw-loader": "^0.5.1",
"resolve-url-loader": "^2.0.0",
"rxjs": "^5.4.2",
"rxjs": "^6.1.0",
"sanitize-html": "^1.16.3",
"sass-loader": "^7.0.1",
"sass-resources-loader": "^1.2.1",
"tslint": "^5.7.0",
"tslint-config-standard": "^7.0.0",
"typescript": "2.8.1",
"typescript": "2.7",
"uglifyjs-webpack-plugin": "^1.1.2",
"video.js": "^6",
"videojs-dock": "^2.0.2",
@ -91,5 +92,8 @@
"webpack-cli": "^2.0.14",
"webtorrent": "^0.98.0",
"zone.js": "~0.8.5"
},
"dependencies": {
"rxjs-compat": "^6.0.0-rc.0"
}
}

File diff suppressed because it is too large Load Diff