Update dependencies

This commit is contained in:
kiswa 2016-09-23 12:42:50 +00:00
parent 3cd66d7ef6
commit f2a5cc20f6
4 changed files with 12 additions and 23 deletions

View File

@ -7,7 +7,6 @@ before_script:
- nvm install 4 - nvm install 4
- nvm use 4 - nvm use 4
- npm i -g gulp typings - npm i -g gulp typings
- npm i escape-string-regexp
- npm i - npm i
- touch tests.db - touch tests.db
- chmod a+w tests.db - chmod a+w tests.db

View File

@ -41,6 +41,7 @@ let gulp = require('gulp'),
images: 'src/images/**/*.*', images: 'src/images/**/*.*',
scss: 'src/scss/**/*.scss', scss: 'src/scss/**/*.scss',
scssMain: 'src/scss/main.scss', scssMain: 'src/scss/main.scss',
app: 'src/app/**/*.ts',
api: [ api: [
'src/api/**/*.*', 'src/api/**/*.*',
'src/api/.htaccess', 'src/api/.htaccess',
@ -93,22 +94,14 @@ gulp.task('scss', () => {
gulp.task('tsc', () => { gulp.task('tsc', () => {
del('build/'); del('build/');
let tsProject = tsc.createProject('tsconfig.json'), let tsProject = tsc.createProject('tsconfig.json');
tsResult = tsProject.src()
.pipe(tsc(tsProject));
return tsResult.js return gulp.src(paths.app)
.pipe(tsProject())
.pipe(gulp.dest('build/')); .pipe(gulp.dest('build/'));
}); });
gulp.task('sourceMaps', () => { gulp.task('vendor', () => {
return gulp.src([
'node_modules/reflect-metadata/Reflect.js.map'
])
.pipe(gulp.dest('dist/js/'));
});
gulp.task('vendor', ['sourceMaps'], () => {
return gulp.src([ return gulp.src([
'node_modules/core-js/client/shim.js', 'node_modules/core-js/client/shim.js',
'node_modules/zone.js/dist/zone.js', 'node_modules/zone.js/dist/zone.js',

View File

@ -43,6 +43,7 @@
"core-js": "^2.4.1", "core-js": "^2.4.1",
"del": "^2.2.2", "del": "^2.2.2",
"dragula": "^3.7.2", "dragula": "^3.7.2",
"escape-string-regexp": "^1.0.5",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"gulp-autoprefixer": "^3.1.1", "gulp-autoprefixer": "^3.1.1",
"gulp-chmod": "^1.3.0", "gulp-chmod": "^1.3.0",
@ -53,10 +54,10 @@
"gulp-cssnano": "^2.1.2", "gulp-cssnano": "^2.1.2",
"gulp-imagemin": "^3.0.3", "gulp-imagemin": "^3.0.3",
"gulp-mocha": "^3.0.1", "gulp-mocha": "^3.0.1",
"gulp-phpunit": "^0.18.0", "gulp-phpunit": "^0.19.0",
"gulp-sass": "^2.3.2", "gulp-sass": "^2.3.2",
"gulp-scss-lint": "^0.4.0", "gulp-scss-lint": "^0.4.0",
"gulp-typescript": "^2.14.1", "gulp-typescript": "^3.0.0",
"gulp-uglify": "^2.0.0", "gulp-uglify": "^2.0.0",
"gulp-util": "^3.0.7", "gulp-util": "^3.0.7",
"merge-stream": "^1.0.0", "merge-stream": "^1.0.0",
@ -68,7 +69,8 @@
"systemjs": "0.19.38", "systemjs": "0.19.38",
"systemjs-builder": "0.15.31", "systemjs-builder": "0.15.31",
"touch": "^1.0.0", "touch": "^1.0.0",
"typings": "^1.3.3", "typescript": "^2.0.3",
"typings": "^1.4.0",
"zone.js": "^0.6.23" "zone.js": "^0.6.23"
} }
} }

View File

@ -6,11 +6,6 @@
"sourceMap": false, "sourceMap": false,
"emitDecoratorMetadata": true, "emitDecoratorMetadata": true,
"experimentalDecorators": true, "experimentalDecorators": true,
"removeComments": true, "removeComments": true
"noImplicitAny": false }
},
"exclude": [
"node_modules",
".c9"
]
} }