Dist To Github

dist.sh

@@ -0,0 +1,62 @@
+#!/bin/bash
+
+set -e
+
+DIST_BRANCH='gh-pages'
+DIST_OUT='out/client'
+
+GIT_REPO_ROOT=$(git rev-parse --show-toplevel)
+if [ "$GIT_REPO_ROOT" != "$PWD" ]; then
+  echo "Should run this script in the repository root";
+  exit 1;
+fi
+
+GIT_BRANCH_NAME=$(git symbolic-ref HEAD 2>/dev/null)
+if [ "$GIT_BRANCH_NAME" != "refs/heads/master" ]; then
+  echo "Should checkout master branch";
+  exit 1;
+fi
+
+if [[ -n $(git status -s) ]]; then
+  echo "Should be clean";
+  exit 1;
+fi
+
+if [[ -n $(git log origin/master..master) ]]; then
+  echo "Should be pushed to master";
+  exit 1;
+fi
+
+# Update remote commits
+git remote update
+
+# Get hash
+LAST_HASH=$(git rev-parse HEAD)
+
+echo "Commit $LAST_HASH will be distributed"
+
+# Check out to dist branch
+git checkout $DIST_BRANCH
+
+# Rebase against master
+git rebase master
+
+# Reset to last commit
+git reset --hard $LAST_HASH
+
+# Build
+npm run build
+
+# Add built files
+git add $DIST_OUT
+
+# Commit
+git commit -am "Built"
+
+# Push
+git push -f
+
+# Back to master
+git checkout master
+
+echo "FINISHED"

package.json

@@ -42,6 +42,7 @@
     "fs-extra": "^2.0.0",
     "glob": "^7.1.1",
     "grunt": "^1.0.1",
+    "grunt-contrib-clean": "^1.0.0",
     "grunt-spawn-process": "^0.1.1",
     "grunt-ts": "^6.0.0-beta.11",
     "grunt-webpack": "^2.0.1",

src/tasks/init.ts

@@ -5,16 +5,22 @@ import * as webpack from 'webpack';
 
 module.exports = (grunt: IGrunt) => {
 
+    grunt.loadNpmTasks('grunt-contrib-clean');
     grunt.loadNpmTasks('grunt-webpack');
     grunt.loadNpmTasks('grunt-ts');
     grunt.loadNpmTasks('grunt-spawn-process');
 
     const PATH_OUT = path.join(__dirname, '../../out');
+    const PATH_OUT_CLIENT = path.join(PATH_OUT, 'client');
     const PATH_OUT_SERVER = path.join(PATH_OUT, 'server');
 
     const webpackConfig = require("./webpack.config");
 
     grunt.initConfig({
+        clean: {
+            client: PATH_OUT_CLIENT,
+            server: PATH_OUT_SERVER,
+        },
         webpack: {
             options: webpackConfig,
             build: {
@@ -29,7 +35,7 @@ module.exports = (grunt: IGrunt) => {
                     new webpack.optimize.UglifyJsPlugin()
                 )
             },
-            "watch": {
+            watch: {
                 devtool: "sourcemap",
                 watch: true
             }
@@ -70,8 +76,7 @@ module.exports = (grunt: IGrunt) => {
         }
     });
 
-    console.log('server path: ', path.join(__dirname, '../../out/server'));
-
-    grunt.registerTask('serve', ['ts:server', 'spawnProcess:server', 'webpack:watch']);
-    grunt.registerTask('default', ['webpack:build-dev', 'ts:server']);
+    grunt.registerTask('serve', ['clean', 'ts:server', 'spawnProcess:server', 'webpack:watch']);
+    grunt.registerTask('dist', ['clean:client', 'webpack:build', 'ts:server']);
+    grunt.registerTask('default', ['clean:client', 'webpack:build', 'ts:server']);
 }

src/tasks/plugins/client-plugin.ts

@@ -9,9 +9,9 @@ import * as webpack from 'webpack';
 // const log = debug('plugin/config');
 
 function out_html(outputOption: webpack.Output, path, html, config: Config, assets: string[]) {
-    console.log('out_html', config, html);
+    // console.log('out_html', config, html);
     const $ = cheerio.load(html);
-    console.log('out_html', assets);
+    // console.log('out_html', assets);
     assets
         .filter(assetName => !/\.map$/.test(assetName))
         .forEach(assetName => {
@@ -57,7 +57,7 @@ export class ClientPlugin {
             const contextCompiler = this.context;
             compilation.entries.forEach((entry) => {
                 const contextCompilation = entry.context;
-                console.log('\nDBG: emit', contextCompilation);
+                // console.log('\nDBG: emit', contextCompilation);
                 const pathname = contextCompilation.replace(contextCompiler, '');
                 const htmlPath = `${out}${pathname}/index.html`;
 
@@ -66,7 +66,7 @@ export class ClientPlugin {
                 const html: string = entry.__html__ || entryInfo && entryInfo.html;
 
                 if (config && html) {
-                    console.log('\nDBG: compilation with html');
+                    // console.log('\nDBG: compilation with html');
                     entryInfoMap[contextCompilation] = {
                         context: contextCompilation,
                         config,
@@ -80,7 +80,7 @@ export class ClientPlugin {
         });
 
         compiler.plugin('done', () => {
-            console.log('\nDBG: ConfigPlugin DONE')
+            // console.log('\nDBG: ConfigPlugin DONE')
         });
     }
 

src/tasks/webpack.config.ts

@@ -38,9 +38,9 @@ const entryInfoList = configList.map<EntryInfo>(configPath => {
 const entries = entryInfoList.reduce((ret, info) => {
     ret[info.chunkName] = info.entryFilePath;
     return ret;
-}, {})
+}, {});
 
-module.exports = {
+const webpackConfig: webpack.Configuration = {
     cache: true,
     entry: entries,
     output: {
@@ -157,3 +157,5 @@ module.exports = {
         __filename: true
     }
 };
+
+module.exports = webpackConfig;