fix(travis-build): add frontend build in travis and remove webpack-st…

…ats (#189)

* fix(travis-build): add frontend build in travis and remove webpack-stats.json

* fix(travis-build): fix configs for production build

.gitignore

@@ -36,7 +36,7 @@ api/migrations/*
 !api/migrations/__init__.py
 
 # Bundle
-django_server/static/bundles/local
+django_server/static/bundles
 
 # Python
 *.pyc
@@ -47,3 +47,6 @@ origami.env
 
 # package-lock.json as we use yarn for dependency management
 package-lock.json
+
+# Webpack stats
+webpack-stats-local.json

.travis.yml

@@ -33,6 +33,7 @@ install:
   - yarn install
 
 script:
+  - npm run build
   - python manage.py makemigrations
   - python manage.py migrate
   - python manage.py test

django_server/settings.py

@@ -161,7 +161,7 @@
 
 WEBPACK_LOADER = {
     'DEFAULT': {
-        'BUNDLE_DIR_NAME': 'bundles/local/',  # end with slash
+        'BUNDLE_DIR_NAME': 'bundles/',  # end with slash
         'STATS_FILE': os.path.join(BASE_DIR, 'webpack-stats-local.json'),
     }
 }

package.json

@@ -3,8 +3,8 @@
   "version": "1.0.0",
   "description": "Create a demo of your machine learning model with CloudCV",
   "scripts": {
-    "remove:bundle": "node_modules/.bin/rimraf ./django_server/static/bundles/local",
-    "clean:bundle": "npm-run-all remove:bundle && mkdir ./django_server/static/bundles/local",
+    "remove:bundle": "node_modules/.bin/rimraf ./django_server/static/bundles",
+    "clean:bundle": "npm-run-all remove:bundle && mkdir ./django_server/static/bundles",
     "build": "npm-run-all clean:bundle test lint:build && babel-node Origami/scripts/build.js",
     "start": "babel-node server.js",
     "open:src": "babel-node server.js",

webpack.base.config.js

@@ -11,7 +11,7 @@ module.exports = {
   },
 
   output: {
-    path: path.resolve("./django_server/static/bundles/local/"),
+    path: path.resolve("./django_server/static/bundles/"),
     filename: "[name]-[hash].js"
   },
 

webpack.local.config.js

@@ -15,7 +15,7 @@ const config = {
   },
   target: "web",
   output: {
-    path: path.resolve("./django_server/static/bundles/local/"),
+    path: path.resolve("./django_server/static/bundles/"),
     publicPath: "http://localhost:3000/static/bundles/",
     filename: "bundle.js"
   },

webpack.prod.config.js

@@ -10,9 +10,7 @@ const config = {
   entry: "./Origami/src/index",
   target: "web",
   output: {
-    path: path.resolve(
-      path.join(__dirname, "django_server/static/bundles/local/")
-    ),
+    path: path.resolve(path.join(__dirname, "django_server/static/bundles/")),
     filename: "bundle.js"
   },
   plugins: [