Merge dd61dcd into 6b24654

gauntface · Sep 9, 2018 · 67f1f42 · 67f1f42
2 parents 6b24654 + dd61dcd
commit 67f1f42
Show file tree

Hide file tree

Showing 29 changed files with 1,159 additions and 2,453 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-build/
+build-*/
 dist/
 docs/
 

diff --git a/demo/hopin-logger-screenshots.png b/demo/hopin-logger-screenshots.png
diff --git a/demo/index.html b/demo/index.html
diff --git a/demo/node.js b/demo/node.js
diff --git a/gulp-tasks/build.js b/gulp-tasks/build.js
diff --git a/gulp-tasks/copy.js b/gulp-tasks/copy.js
diff --git a/gulp-tasks/typescript-commonjs.js b/gulp-tasks/typescript-commonjs.js
diff --git a/gulp-tasks/typescript-modules-and-browsers.js b/gulp-tasks/typescript-modules-and-browsers.js
diff --git a/gulp-tasks/typescript-test.js b/gulp-tasks/typescript-test.js
diff --git a/gulp-tasks/utils/get-task-filepaths.js b/gulp-tasks/utils/get-task-filepaths.js
diff --git a/gulp-tasks/utils/glob-promise.js b/gulp-tasks/utils/glob-promise.js
diff --git a/gulp-tasks/utils/module-to-bundle.js b/gulp-tasks/utils/module-to-bundle.js
diff --git a/gulp-tasks/utils/npm-run.js b/gulp-tasks/utils/npm-run.js
diff --git a/gulp-tasks/utils/spawn-promise.js b/gulp-tasks/utils/spawn-promise.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -1,36 +1,34 @@
 const gulp = require('gulp');
 const path = require('path');
+const fs = require('fs-extra');
+const {setConfig} = require('@hopin/wbt-config');
+const tsNode = require('@hopin/wbt-ts-node'); 
+const tsBrowser = require('@hopin/wbt-ts-browser'); 
 
-const getTaskFilepaths = require('./gulp-tasks/utils/get-task-filepaths');
+const src = path.join(__dirname, 'src');
+const dst = path.join(__dirname, 'build');
 
-global.__buildConfig = {
-  src: path.join(__dirname, 'src'),
-  dest: path.join(__dirname, 'dist'),
-  temp: path.join(__dirname, 'build'),
-};
+setConfig(src, dst);
 
-const loadTasks = () => {
-  const taskFiles = getTaskFilepaths();
-  for (const taskFilepath of taskFiles) {
-    const {task} = require(taskFilepath);
-    if (task) {
-      gulp.task(task);
-    }
-  }
-};
+const buildBrowserDir = path.join(__dirname, 'build-browser');
+const buildNodeDir = path.join(__dirname, 'build-node');
+const buildTestDir = path.join(__dirname, 'build-test');
 
-loadTasks();
+gulp.task('clean',
+  gulp.parallel(
+    () => fs.remove(buildBrowserDir),
+    () => fs.remove(buildNodeDir),
+    () => fs.remove(buildTestDir),
+  )
+)
 
-gulp.task('dev', (done) => {
-  return gulp.series([
-    'build',
-  ])(done);
-});
-
-gulp.task('prod', (done) => {
-  process.env.NODE_ENV = 'production';
-
-  return gulp.series([
-    'build',
-  ])(done);
-});
+gulp.task('build',
+  gulp.series(
+    'clean',
+    gulp.parallel(
+      tsNode.gulpBuild({src: 'node', dst: buildNodeDir, rootDir: 'src'}),
+      tsNode.gulpBuild({dst: buildTestDir, rootDir: 'src'}),
+      tsBrowser.gulpBuild('hopin', {src: 'browser', dst: buildBrowserDir, rootDir: 'src'}),
+    )
+  )
+);