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.

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

angular-cli latest deployed with rc.7 #86

Merged
merged 22 commits into from
Sep 30, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@ node_js:
addons:
firefox: latest
before_script:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
install:
- npm i process-nextick-args util-deprecate
- npm install
- "./node_modules/.bin/ng build"
script:
- "./node_modules/.bin/tslint -c ./tslint.json ./src/**/*.ts -e ./src/**/typings.d.ts"
- "./node_modules/.bin/karma start ./config/karma.travis.conf.js"
- npm run tslint
- "./node_modules/.bin/ng test --watch=false"
notifications:
slack:
secure: pkXQL5AZiSBh1yWjilrcA7KbcJjC4xxjhd0SAwogJCQgyEf/i8/CfR1ZXiZYsIBJT6HTI7UMdJzwP6TiY/zih6Mq8PqUg38NUsvGyznILkbksMQJieWrg1r+1ideplPJFX7qdXwrOcxvSVoEFIGha26X0Fglq3kXSBHpPR9U0lDCoUxLUO35txQ/iji85Na4hjQnmtBEQkqaJogA0hRdcSLIKxwScgSrb4UU2PXEaIS9Zpr2SOG/RTOMkrrSMOD7bgocZbhAbk3c5shPZNj51gpEN+692Qxp4kQ/nfT10Hu5ATLaFCM5v04+w0D3ZJLA46LpU47qP0ALy6O9d16pGUcxJGbWaMZpV53vV9jIl9y2ahaqN1h1J9BcLIOzJvaQy92km8F7a3l7cN8gWSUZjs5Hd+gPFQH9Flcydmq26e8Maa1tQDF5R3GIdaCw4qkuJYbl4ToE59wtiPQ6M7xVKqNK4Qypu1YNsKOoLG/tZRFvp4771vgWcR5Lu/DqJJ9SAB0jsdrOXpe+0DmdrLBwhoZv2D9FTce+clDHIJ7ObPEc/UKw8rtWAA5iCPCEJ0sPl+WZwOS3ZFp4QmMC+5mzffMUiX6HBnzxiyOZvYGJD/jTy1yA1Cmt4RJYrOPM73csI1ELs5tj4tvqBNJQ8daIenfkg7u42IJfByDGIsJz8to=
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ Covalent is a reusable UI platform from Teradata for building web applications w
## Setup

* Ensure you have Node 4.4 and NPM 3+ installed.
* Install Angular CLI `npm i -g [email protected].10`
* Install Typescript 2.0 `npm i -g typescript@2.0.2`
* Install TSLint and Typings `npm install -g tslint typings`
* Install Angular CLI `npm i -g [email protected].15`
* Install Typescript 2.0 `npm i -g typescript`
* Install TSLint `npm install -g tslint`
* Install Protractor for e2e testing `npm install -g protractor`
* Install Node packages `npm i`
* Update Webdriver `webdriver-manager update` and `./node_modules/.bin/webdriver-manager update`
Expand Down
29 changes: 0 additions & 29 deletions angular-cli-build.js

This file was deleted.

35 changes: 28 additions & 7 deletions angular-cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,47 @@
},
"apps": [
{
"main": "src/main.ts",
"tsconfig": "src/tsconfig.json"
"root": "src",
"outDir": "dist",
"assets": "assets",
"index": "index.html",
"main": "main.ts",
"test": "test.ts",
"tsconfig": "tsconfig.json",
"prefix": "app",
"mobile": false,
"styles": [
"styles.css",
"platform/core/styles/platform.scss",
"../node_modules/@angular2-material/core/style/core.css",
"../node_modules/@angular2-material/core/overlay/overlay.css"
],
"scripts": [
"../node_modules/hammerjs/hammer.min.js",
"../node_modules/showdown/dist/showdown.js"
],
"environments": {
"source": "environments/environment.ts",
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
}
}
],
"addons": [],
"packages": [],
"e2e": {
"protractor": {
"config": "config/protractor.conf.js"
"config": "./protractor.conf.js"
}
},
"test": {
"karma": {
"config": "config/karma.conf.js"
"config": "./karma.conf.js"
}
},
"defaults": {
"prefix": "docs",
"sourceDir": "src",
"styleExt": "css",
"styleExt": "scss",
"prefixInterfaces": false,
"lazyRoutePrefix": "+"
}
}
10 changes: 0 additions & 10 deletions config/environment.js

This file was deleted.

55 changes: 0 additions & 55 deletions config/karma-test-shim.js

This file was deleted.

46 changes: 0 additions & 46 deletions config/karma.conf.js

This file was deleted.

38 changes: 0 additions & 38 deletions config/karma.travis.conf.js

This file was deleted.

2 changes: 2 additions & 0 deletions e2e/index.e2e.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { browser } from 'protractor/globals';

describe('hello, protractor', function(): void {
describe('index', function(): void {
browser.get('/');
Expand Down
15 changes: 5 additions & 10 deletions e2e/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,11 @@
"experimentalDecorators": true,
"module": "commonjs",
"moduleResolution": "node",
"noEmitOnError": true,
"noImplicitAny": false,
"outDir": "../dist/e2e",
"rootDir": ".",
"outDir": "../dist/out-tsc-e2e",
"sourceMap": true,
"target": "es5",
"inlineSources": true
},

"files": [
"./typings.d.ts"
]
"typeRoots": [
"../node_modules/@types"
]
}
}
1 change: 0 additions & 1 deletion e2e/typings.d.ts

This file was deleted.

49 changes: 49 additions & 0 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// Karma configuration file, see link for more information
// https://karma-runner.github.io/0.13/config/configuration-file.html

module.exports = function (config) {
var configuration = {
basePath: '.',
frameworks: ['jasmine', 'angular-cli'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-remap-istanbul'),
require('angular-cli/plugins/karma')
],
customLaunchers: {
// chrome setup for travis CI using chromium
Chrome_travis_ci: {
base: 'Chrome',
flags: ['--no-sandbox']
}
},
files: [
{ pattern: './src/test.ts', watched: false }
],
preprocessors: {
'./src/test.ts': ['angular-cli']
},
remapIstanbulReporter: {
reports: {
html: 'coverage',
lcovonly: './coverage/coverage.lcov'
}
},
angularCli: {
config: './angular-cli.json',
environment: 'dev'
},
reporters: ['progress', 'karma-remap-istanbul'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false
};
if (process.env.TRAVIS) {
configuration.browsers = ['Chrome_travis_ci'];
}
config.set(configuration);
};
Loading