Simplified build process.

wqzgh · Sep 6, 2015 · 2003c46 · 2003c46
1 parent 3f7e993
commit 2003c46
Showing 21 changed files with 314 additions and 486 deletions.
diff --git a/dist/browser/swing.js b/dist/browser/swing.js
diff --git a/dist/browser/swing.js.map b/dist/browser/swing.js.map
diff --git a/dist/es5/card.js b/dist/es5/card.js
diff --git a/dist/es5/card.js.map b/dist/es5/card.js.map
diff --git a/dist/es5/index.js b/dist/es5/index.js
diff --git a/dist/es5/index.js.map b/dist/es5/index.js.map
diff --git a/dist/es5/stack.js b/dist/es5/stack.js
diff --git a/dist/es5/stack.js.map b/dist/es5/stack.js.map
diff --git a/dist/es5/util.js b/dist/es5/util.js
diff --git a/dist/es5/util.js.map b/dist/es5/util.js.map
diff --git a/examples/card-stack/card-stack.js b/examples/card-stack/card-stack.js
@@ -11,7 +11,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
     stack.on('throwout', function (e) {
         console.log(e.target.innerText || e.target.textContent, 'has been thrown out of the stack to the', e.throwDirection == 1 ? 'right' : 'left', 'direction.');
-        
+
         e.target.classList.remove('in-deck');
     });
 
@@ -20,4 +20,4 @@ document.addEventListener('DOMContentLoaded', function () {
 
         e.target.classList.add('in-deck');
     });
-});
+});
diff --git a/examples/card-stack/classList.js b/examples/card-stack/classList.js
diff --git a/examples/card-stack/index.html b/examples/card-stack/index.html
@@ -7,8 +7,7 @@
 
     <link rel="icon" href="data:;base64,iVBORw0KGgo=">
 
-    <script src="./../../dist/swing.js"></script>
-    <script src="./classList.js"></script>
+    <script src="./../../dist/browser/swing.js"></script>
     <script src="./card-stack.js"></script>
 </head>
 <body>

diff --git a/examples/card-state/index.html b/examples/card-state/index.html
@@ -7,7 +7,7 @@
 
     <link rel="icon" href="data:;base64,iVBORw0KGgo=">
 
-    <script src="./../../dist/swing.js"></script>
+    <script src="./../../dist/browser/swing.js"></script>
     <script src="./card-state.js"></script>
 </head>
 <body>

diff --git a/examples/throw-confidence/index.html b/examples/throw-confidence/index.html
@@ -8,7 +8,7 @@
 
     <link rel="icon" href="data:;base64,iVBORw0KGgo=">
 
-    <script src="./../../dist/swing.js"></script>
+    <script src="./../../dist/browser/swing.js"></script>
     <script src="./throw-confidence.js"></script>
 </head>
 <body>

diff --git a/gulpfile.js b/gulpfile.js
@@ -1,12 +1,13 @@
 import gulp from 'gulp';
-import karma from 'karma';
 import jsonfile from 'jsonfile';
 import webpack from 'webpack';
+import del from 'del';
+import mocha from 'gulp-mocha';
 import eslint from 'gulp-eslint';
 import babel from 'gulp-babel';
 import gutil from 'gulp-util';
-
-let Server = karma.Server;
+import sourcemaps from 'gulp-sourcemaps';
+import webpackConfig from './webpack.config';
 
 gulp.task('lint', () => {
     return gulp
@@ -16,52 +17,59 @@ gulp.task('lint', () => {
         .pipe(eslint.failOnError());
 });
 
-gulp.task('version', ['lint'], () => {
-    let pkg = jsonfile.readFileSync('./package.json'),
-        bower = jsonfile.readFileSync('./bower.json');
-
-    bower.name = pkg.name;
-    bower.description = pkg.description;
-    bower.keywords = pkg.keywords;
-    bower.license = pkg.license;
-    bower.authors = [pkg.author];
-
-    jsonfile.writeFileSync('./bower.json', bower);
+gulp.task('clean', ['lint'], () => {
+    return;
+    return del([
+            './dist/es5/*',
+            './dist/browser/*'
+        ]);
 });
 
-gulp.task('build-browser', ['version'], (done) => {
-    webpack({}, (error, stats) => {
+gulp.task('build-browser', ['clean'], (done) => {
+    webpack(webpackConfig, (error, stats) => {
         if (error) {
             throw new gutil.PluginError('webpack', error);
         }
 
         gutil.log('[webpack]', stats.toString());
 
+        console.log('WHAT');
+
         done();
     });
 });
 
-gulp.task('build-es5', () => {
-    /* return gulp
-        .src('./src/index')
+gulp.task('build-es5', ['clean'], () => {
+    return gulp
+        .src('./src/*')
+        .pipe(sourcemaps.init())
         .pipe(babel())
-        .pipe(gulp.dest()); */
+        .pipe(sourcemaps.write('./'))
+        .pipe(gulp.dest('./dist/es5'));
 });
 
 gulp.task('test', ['build-browser', 'build-es5'], (done) => {
-    let server;
+    return gulp
+        .src('./test/*', {
+            read: false
+        })
+        .pipe(mocha());
+});
 
-    server = new Server({
-        configFile: __dirname + '/karma.conf.js',
-        singleRun: true
-    });
+gulp.task('version', ['test'], () => {
+    let pkg = jsonfile.readFileSync('./package.json'),
+        bower = jsonfile.readFileSync('./bower.json');
 
-    server.start(() => {
-        done();
-    });
+    bower.name = pkg.name;
+    bower.description = pkg.description;
+    bower.keywords = pkg.keywords;
+    bower.license = pkg.license;
+    bower.authors = [pkg.author];
+
+    jsonfile.writeFileSync('./bower.json', bower);
 });
 
-gulp.task('default', ['test']);
+gulp.task('default', ['version']);
 
 gulp.task('watch', () => {
     gulp.watch(['./src/**/*', './tests/**/*'], ['default']);