Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to angular v6 and videogular 6.2.0 #7

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update to angular v6 and videogular 6.2.0 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3538462
Merge pull request #1 from videogular/master
jorgeucano Dec 31, 2017
03493a6
Merge pull request #2 from videogular/master
jorgeucano May 30, 2018
6065707
chore(updagrade): v6
jorgeucano May 30, 2018
d9347fd
chore(merge): merge package.json
jorgeucano May 30, 2018
0718581
Merge pull request #4 from jorgeucano/update/v6-merged
jorgeucano May 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 0 additions & 62 deletions .angular-cli.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Videogular2Showroom
# videogular2Showroom

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.0.0.

Expand Down
138 changes: 138 additions & 0 deletions angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"videogular2-showroom": {
"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",
"src/favicon.ico"
],
"styles": [
"node_modules/videogular2/fonts/videogular.css",
"src/styles.css"
],
"scripts": [
"node_modules/vivus/dist/vivus.min.js",
"node_modules/dashjs/dist/dash.all.min.js",
"node_modules/hls.js/dist/hls.min.js"
]
},
"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": "videogular2-showroom:build"
},
"configurations": {
"production": {
"browserTarget": "videogular2-showroom:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "videogular2-showroom: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": [
"node_modules/vivus/dist/vivus.min.js",
"node_modules/dashjs/dist/dash.all.min.js",
"node_modules/hls.js/dist/hls.min.js"
],
"styles": [
"node_modules/videogular2/fonts/videogular.css",
"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": []
}
}
}
},
"videogular2-showroom-e2e": {
"root": "",
"sourceRoot": "",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "videogular2-showroom:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"e2e/tsconfig.e2e.json"
],
"exclude": []
}
}
}
}
},
"defaultProject": "videogular2-showroom",
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"styleext": "css"
},
"@schematics/angular:directive": {
"prefix": "app"
}
}
}
6 changes: 3 additions & 3 deletions e2e/app.e2e-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Videogular2ShowroomPage } from './app.po';
import { videogular2ShowroomPage } from './app.po';

describe('videogular2-showroom App', () => {
let page: Videogular2ShowroomPage;
let page: videogular2ShowroomPage;

beforeEach(() => {
page = new Videogular2ShowroomPage();
page = new videogular2ShowroomPage();
});

it('should display message saying app works', () => {
Expand Down
2 changes: 1 addition & 1 deletion e2e/app.po.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { browser, element, by } from 'protractor';

export class Videogular2ShowroomPage {
export class videogular2ShowroomPage {
navigateTo() {
return browser.get('/');
}
Expand Down
10 changes: 5 additions & 5 deletions karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
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
},
files: [
{ pattern: './src/test.ts', watched: false }

],
preprocessors: {
'./src/test.ts': ['@angular/cli']

},
mime: {
'text/x-typescript': ['ts','tsx']
},
coverageIstanbulReporter: {
reports: [ 'html', 'lcovonly' ],
dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
fixWebpackSourcePaths: true
},
angularCli: {
Expand Down
110 changes: 56 additions & 54 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,58 @@
{
"name": "videogular2-showroom",
"version": "0.0.0-semantically-released",
"description": "Videogular is a video application framework for desktop and mobile powered by Angular",
"repository": {
"type": "git",
"url": "https://github.com/videogular/videogular2"
},
"dependencies": {
"@angular/common": "5.1.0",
"@angular/compiler": "5.1.0",
"@angular/core": "5.1.0",
"@angular/forms": "5.1.0",
"@angular/platform-browser": "5.1.0",
"@angular/platform-browser-dynamic": "5.1.0",
"@angular/router": "5.1.0",
"angulartics2": "4.0.1",
"core-js": "2.5.3",
"dashjs": "2.5.0",
"hls.js": "0.6.10",
"rxjs": "5.5.2",
"videogular2": "6.1.1",
"vivus": "0.4.1",
"zone.js": "^0.8.4"
},
"devDependencies": {
"@angular-devkit/core": "0.3.1",
"@angular/cli": "1.5.0",
"@angular/compiler-cli": "5.1.0",
"@types/core-js": "0.9.41",
"@types/jasmine": "2.5.38",
"@types/node": "6.0.93",
"codelyzer": "4.0.1",
"jasmine-core": "~2.5.2",
"jasmine-spec-reporter": "~3.2.0",
"karma": "~1.4.1",
"karma-chrome-launcher": "~2.0.0",
"karma-cli": "~1.0.1",
"karma-coverage-istanbul-reporter": "^0.2.0",
"karma-jasmine": "1.1.1",
"karma-jasmine-html-reporter": "^0.2.2",
"protractor": "~5.1.0",
"ts-node": "~2.0.0",
"tslint": "5.0.0",
"typescript": "2.4.2"
},
"scripts": {
"ng": "ng",
"start": "ng serve --host 0.0.0.0",
"aot": "ng serve --prod --aot --env=prod",
"build": "ng build --prod --aot --env=prod --bh /videogular2-showroom/",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
}
"name": "videogular2-showroom",
"version": "0.0.0-semantically-released",
"description": "Videogular is a video application framework for desktop and mobile powered by Angular",
"repository": {
"type": "git",
"url": "https://github.com/videogular/videogular2"
},
"dependencies": {
"@angular/common": "6.0.3",
"@angular/compiler": "6.0.3",
"@angular/core": "6.0.3",
"@angular/forms": "6.0.3",
"@angular/platform-browser": "6.0.3",
"@angular/platform-browser-dynamic": "6.0.3",
"@angular/router": "6.0.3",
"angulartics2": "6.1.0",
"core-js": "2.5.3",
"dashjs": "2.5.0",
"hls.js": "0.6.10",
"jasmine": "^3.1.0",
"rxjs": "6.2.0",
"rxjs-compat": "^6.2.0",
"videogular2": "^6.2.0",
"vivus": "0.4.1",
"zone.js": "^0.8.26"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.6.7",
"@angular/cli": "^6.0.0",
"@angular/compiler-cli": "^6.0.0",
"@types/core-js": "0.9.41",
"@types/jasmine": "2.5.38",
"@types/node": "6.0.93",
"codelyzer": "4.3.0",
"jasmine-core": "~2.5.2",
"jasmine-spec-reporter": "~3.2.0",
"karma": "~1.4.1",
"karma-chrome-launcher": "~2.0.0",
"karma-cli": "~1.0.1",
"karma-coverage-istanbul-reporter": "^0.2.0",
"karma-jasmine": "1.1.1",
"karma-jasmine-html-reporter": "^0.2.2",
"protractor": "~5.1.0",
"ts-node": "~2.0.0",
"tslint": "5.0.0",
"typescript": "2.7.2"
},
"scripts": {
"ng": "ng",
"start": "ng serve --host 0.0.0.0",
"aot": "ng serve --prod --aot --env=prod",
"build": "ng build --prod --aot --env=prod --bh /videogular2-showroom/",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
}
}
2 changes: 1 addition & 1 deletion src/app/app.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { TestBed, async } from "@angular/core/testing";
import { AppComponent } from "./app.component";

describe('App: Videogular2Showroom', () => {
describe('App: videogular2Showroom', () => {
beforeEach(() => {
TestBed.configureTestingModule({
declarations: [
Expand Down
2 changes: 1 addition & 1 deletion src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<title>Videogular2 Showroom</title>
<title>videogular2 Showroom</title>
<base href="/">

<meta name="viewport" content="width=device-width, initial-scale=1">
Expand Down
Loading