Skip to content
This repository was archived by the owner on Jul 16, 2020. It is now read-only.
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ examples/**/*.d.ts
coverage
es6
.DS_Store
.vscode/
.vscode/
npm-debug.log
47 changes: 41 additions & 6 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,52 @@ const runSequence = require('run-sequence');
const istanbul = require('gulp-istanbul');
const firebaseServer = require('./tests/firebaseServer');
const uglify = require('gulp-uglify');
const size = require('gulp-filesize');
const size = require('gulp-size');
const ts = require('gulp-typescript');
const rollup = require('gulp-better-rollup')
const rename = require('gulp-rename');
const tsProject = ts.createProject('tsconfig.json');
const execSync = require('child_process').execSync;

const exit = () => process.exit(0);

gulp.task('clean', () => del(['examples/*.js', 'examples/*.js.map', '!examples/index.js', 'dist']));
gulp.task('clean', () => del(['examples/*.js', 'examples/*.js.map', '!examples/index.js', 'dist', 'es6']));

gulp.task('ts', () => {
const tsCode = execSync('tsc');
const rollupCode = execSync('node rollup.config');
const uglifyCode = execSync('uglifyjs --compress --mangle -- ./dist/querybase.umd.js > ./dist/querybase.umd.min.js');
const tsResult = tsProject.src()
.pipe(tsProject());

return tsResult.js
.pipe(gulp.dest('./es6'));
// const tsCode = execSync('tsc');
// const rollupCode = execSync('node rollup.config');
// const uglifyCode = execSync('uglifyjs --compress --mangle -- ./dist/querybase.umd.js > ./dist/querybase.umd.min.js');
});

gulp.task('rollup', () => {
return gulp.src('./es6/entry.js')
.pipe(rollup({
entry: './es6/entry.js'
}, 'umd'))
.pipe(rename('querybase.umd.js'))
.pipe(gulp.dest('./dist'));
});

gulp.task('uglify', () => {
return gulp
.src('./dist/querybase.umd.js')
.pipe(uglify({ mangle: true }))
.pipe(rename('querybase.umd.min.js'))
.pipe(gulp.dest('./dist'));
});

gulp.task('size', () => {
return gulp
.src('./dist/querybase.umd.min.js')
.pipe(size({
showFiles: true,
gzip: true
}));
});

gulp.task('pre-test', () => {
Expand All @@ -41,4 +76,4 @@ gulp.task('firebaseServer', () => {
firebaseServer.initializeApp();
});

gulp.task('default', runSequence('clean', 'ts', 'test', exit));
gulp.task('default', runSequence('clean', 'ts', 'rollup', 'test', 'uglify', 'size', exit));
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,15 @@
"coveralls": "^2.11.9",
"del": "^2.2.0",
"gulp": "^3.9.0",
"gulp-connect": "^2.3.1",
"gulp-filesize": "0.0.6",
"gulp-better-rollup": "^1.0.2",
"gulp-istanbul": "^0.10.3",
"gulp-mocha": "^2.2.0",
"gulp-rename": "^1.2.2",
"gulp-rollup": "^2.5.1",
"gulp-size": "^2.1.0",
"gulp-sourcemaps": "^1.6.0",
"gulp-uglify": "^1.5.3",
"gulp-typescript": "^3.1.3",
"gulp-uglify": "^2.0.0",
"mocha": "^2.3.4",
"rollup": "^0.36.4",
"run-sequence": "^1.1.5",
Expand Down
27 changes: 0 additions & 27 deletions rollup.config.js

This file was deleted.

6 changes: 3 additions & 3 deletions src/entry.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Querybase, DatabaseReference } from './Querybase';
import { Querybase, DatabaseReference } from './querybase';
import { _ } from './QuerybaseUtils';
import { QuerybaseQuery } from './QuerybaseQuery';

/**
* Convienence function to match Firebase SDK design.
* use:
* use:
* const ref = firebase.database.ref('items');
* querybase.ref(ref, ['prop1', 'prop2']);
*/
Expand All @@ -29,4 +29,4 @@ export {
Querybase,
QuerybaseQuery,
_ as QuerybaseUtils
}
}
8 changes: 7 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,11 @@
"firebase",
"node"
]
}
},
"files": [
"./src/entry.ts",
"./src/querybase.ts",
"./src/QuerybaseQuery.ts",
"./src/QuerybaseUtils.ts"
]
}