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

Feature/ts 1.8 #24

Merged
merged 5 commits into from
Feb 23, 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
18 changes: 9 additions & 9 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"env": {
"jasmine": true,
"node": true,
"mocha": true,
"browser": true,
"builtin": true
"node": true
},
"ecmaFeatures": {
"arrowFunctions": true,
"blockBindings": true,
"templateStrings": true
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
"ecmaFeatures": {
"arrowFunctions": true,
"blockBindings": true,
"templateStrings": true
}
},
"globals": {},
"rules": {
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Future proof application skeleton
[![Build Status][travis-image]][travis-url] [![Dependency Status][depstat-image]][depstat-url]


This is an example of application skeleton written full in TypeScript 1.7 including:
This is an example of application skeleton written full in TypeScript 1.8 including:
unit and e2e test samples, bundling (minification, ng-annotate) and most needed automation tasks with gulp.

Example contains simple implementation of Angular:
Expand Down Expand Up @@ -35,7 +35,7 @@ Example contains simple implementation of Angular:
### Installing dependencies
-------
```
npm install gulp jspm typescript typings -g
npm install gulp -g
```

```
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ts-skeleton",
"version": "0.3.0",
"version": "0.4.0",
"main": "dist/ts-skeleton.min.js",
"ignore": [
"tasks",
Expand Down
41 changes: 19 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,48 +5,45 @@
"type": "git",
"url": "[email protected]:b091/ts-skeleton.git"
},
"version": "0.3.0",
"version": "0.4.0",
"license": "MIT",
"dependencies": {},
"devDependencies": {
"browser-sync": "^2.11.0",
"chai": "^3.5.0",
"browser-sync": "~2.11.0",
"chai": "~3.5.0",
"del": "~2.2.0",
"eslint": "~1.10.3",
"gulp": "^3.9.1",
"eslint": "~2.2.0",
"gulp": "~3.9.1",
"gulp-directive-replace": "git+https://github.com/b091/gulp-directive-replace.git",
"gulp-eslint": "~1.1.1",
"gulp-eslint": "~2.0.0",
"gulp-ng-annotate": "~1.1.0",
"gulp-protractor": "~2.1.0",
"gulp-tslint": "^4.2.2",
"gulp-tslint": "~4.3.2",
"gulp-typedoc": "~1.2.1",
"jspm": "^0.16.27",
"karma": "^0.13.19",
"jspm": "~0.16.29",
"karma": "~0.13.21",
"karma-chai-sinon": "~0.1.5",
"karma-coverage": "~0.5.3",
"karma-jspm": "~2.0.2",
"karma-junit-reporter": "~0.3.8",
"karma-mocha": "~0.2.1",
"karma-phantomjs2-launcher": "^0.5.0",
"minimist": "^1.2.0",
"mocha": "^2.4.5",
"phantomjs": "^2.1.3",
"phantomjs-prebuilt": "^2.1.4",
"portfinder": "^1.0.0",
"karma-phantomjs-launcher": "~1.0.0",
"mocha": "~2.4.5",
"phantomjs-prebuilt": "~2.1.4",
"protractor": "~3.0.0",
"run-sequence": "~1.1.5",
"sinon": "~1.17.2",
"sinon-chai": "~2.8.0",
"tslint": "^3.2.1",
"typescript": "~1.7.5",
"typings": "^0.6.8"
"tslint": "~3.4.0",
"typescript": "^1.8.2",
"typings": "~0.6.8"
},
"engines": {
"node": ">=4.1.1"
"node": ">=5.6.0"
},
"scripts": {
"test": "gulp test",
"postinstall": "jspm install && typings install && node ./node_modules/protractor/bin/webdriver-manager update"
"postinstall": "./node_modules/.bin/jspm install && ./node_modules/.bin/typings install && node ./node_modules/.bin/webdriver-manager update"
},
"jspm": {
"directories": {
Expand All @@ -69,10 +66,10 @@
"bootstrap": "github:twbs/bootstrap@^3.3.5",
"clean-css": "npm:clean-css@^3.3.8",
"css": "github:systemjs/plugin-css@^0.1.13",
"ts": "github:frankwallis/plugin-typescript@^2.4.5"
"ts": "github:frankwallis/plugin-typescript@^4.0.1"
},
"devDependencies": {
"typescript": "npm:typescript@^1.7.5"
"typescript": "npm:typescript@^1.8.2"
}
}
}
4 changes: 2 additions & 2 deletions tasks/server.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module.exports = (gulp, serverRootDir, watchDir, openBrowser) => {
const path = require('path');
const TS_WATCH_FLAG = '--watch-ts';

return () => {

Expand Down Expand Up @@ -44,7 +45,6 @@ module.exports = (gulp, serverRootDir, watchDir, openBrowser) => {
}

function shouldWatchTypeScript() {
const minimist = require('minimist');
return !!minimist(process.argv.slice(3))['watch-ts'];
return process.argv.slice(3).indexOf(TS_WATCH_FLAG) !== -1;
}
};
4 changes: 2 additions & 2 deletions test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ module.exports = function (config) {
port: 9999,

browsers: [
'PhantomJS2'
'PhantomJS'
],

plugins: [
'karma-phantomjs2-launcher',
'karma-phantomjs-launcher',
'karma-jspm',
'karma-mocha',
'karma-chai-sinon',
Expand Down
2 changes: 1 addition & 1 deletion tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"no-eval": true,
"no-string-literal": true,
"no-switch-case-fall-through": true,
"no-trailing-comma": true,
"trailing-comma": true,
"no-trailing-whitespace": true,
"no-unused-variable": true,
"no-unreachable": true,
Expand Down