summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-10-06 11:30:16 -0700
committerelijah <elijah@riseup.net>2016-10-06 12:38:50 -0700
commitd6a31a82344047d70395695f5d587b344d2eb631 (patch)
treeff59108df85a65efbe883c9bb30768fed083a10e
parent3603703ad0e3e5c6836a3eda032b19f3900c1129 (diff)
[bug] fix problems building ui, closes #8516
-rw-r--r--ui/Makefile15
-rw-r--r--ui/package.json17
2 files changed, 16 insertions, 16 deletions
diff --git a/ui/Makefile b/ui/Makefile
index 96b632c5..182b0fa5 100644
--- a/ui/Makefile
+++ b/ui/Makefile
@@ -2,39 +2,38 @@
# builds for development mode
#
-dev-build: build-clean
+dev-build: build-clean make-init
npm install
npm run build
- touch pydist/leap/bitmask_js/__init__.py
dev-install: dev-build
pip install -e pydist
-#
# installs python package, but does not rebuild the js.
# for usage when you don't want to install nodejs
-#
dev-install-prebuilt:
pip install -e pydist
-
#
# distribution builds
#
-dist-build: build-clean
+dist-build: build-clean make-init
npm install
npm run build:production
- touch pydist/leap/bitmask_js/__init__.py
cd pydist && python setup.py bdist_wheel
dist-install: dist-build
pip install pydist/dist/*.whl
#
-# cleaning up
+# clean up and set up
#
+make-init:
+ test -d pydist/leap/bitmask_js || mkdir -p pydist/leap/bitmask_js
+ touch pydist/leap/bitmask_js/__init__.py
+
build-clean:
rm -rf pydist/leap/bitmask_js
rm -rf pydist/dist
diff --git a/ui/package.json b/ui/package.json
index d491edd8..c6bdd88d 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -8,22 +8,23 @@
"dependencies": {},
"devDependencies": {
"babel": "^6.5.2",
+ "babel-core": "^6.17.0",
"babel-loader": "^6.2.4",
- "babel-polyfill": "^6.13.0",
- "babel-preset-es2015": "^6.9.0",
- "babel-preset-react": "^6.11.1",
- "babel-preset-stage-0": "^6.5.0",
+ "babel-polyfill": "^6.16.0",
+ "babel-preset-es2015": "^6.16.0",
+ "babel-preset-react": "^6.16.0",
+ "babel-preset-stage-0": "^6.16.0",
"bootstrap": "^3.3.7",
"copy-webpack-plugin": "^3.0.1",
"css-loader": "^0.23.1",
"less": "^2.7.1",
"less-loader": "^2.2.3",
- "react": "^15.2.1",
- "react-bootstrap": "^0.30.2",
- "react-dom": "^15.2.1",
+ "react": "^15.3.2",
+ "react-dom": "^15.3.2",
+ "react-bootstrap": "^0.30.5",
"style-loader": "^0.13.1",
"webpack": "^1.13.1",
- "zxcvbn": "^4.3.0"
+ "zxcvbn": "^4.4.0"
},
"scripts": {
"open": "gnome-open http://localhost:7070",