From 1ae4d70a8adf61fe9725db8a6cfc89c657fe4b85 Mon Sep 17 00:00:00 2001
From: Jaden Diefenbaugh <jaden.diefenbaugh@idiap.ch>
Date: Mon, 30 Apr 2018 16:36:48 +0200
Subject: [PATCH] output html/css/js distributables to new folder for conda
building
---
.gitignore | 3 +++
conda/js/package.json | 2 +-
conda/js/webpack.config.js | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3dc68b56..a1e31bbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,3 +109,6 @@ miniconda/
miniconda.cached/
conda/recipe_append.yaml
conda-bld/
+
+# built JS files
+beat/editor/js
diff --git a/conda/js/package.json b/conda/js/package.json
index d70c7cd2..db871a67 100644
--- a/conda/js/package.json
+++ b/conda/js/package.json
@@ -5,7 +5,7 @@
"main": "index.js",
"scripts": {
"start": "cross-env NODE_ENV=debug webpack-dev-server --hot",
- "prebuild": "rimraf dist",
+ "prebuild": "rimraf ../../beat/editor/js",
"build": "cross-env NODE_ENV=production webpack",
"test-start": "cross-env BABEL_ENV=test NODE_ENV=test karma start --no-single-run",
"test": "cross-env BABEL_ENV=test NODE_ENV=test karma start",
diff --git a/conda/js/webpack.config.js b/conda/js/webpack.config.js
index 9dd4f3fc..d7d26749 100644
--- a/conda/js/webpack.config.js
+++ b/conda/js/webpack.config.js
@@ -5,7 +5,7 @@ const VisualizerPlugin = require('webpack-visualizer-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
-const dist = resolve(__dirname, 'dist');
+const dist = resolve(__dirname, '../../beat/editor/js');
const isExternal = (module) => module.context && module.context.indexOf('node_modules') === -1;
--
GitLab