zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-18 14:01:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes namespace collision & allows command-line options to be passed to UI build system (#3876)

Browse Source 
* Fixes BrowserSync window.name namespace collision #3872

* Allow command-line arguments to be passed to development UI builds.
Add support for --ng-debug and --router-debug flags to turn on Angular's
$log service and ui-router's trace utility.
Cleans up development debug settings & defunct websocket configuration.

Resolves lingering issues raised by trying read asynchronously-loaded config file during AngularJS config phase. #3872

* shrinkwrap updated minimist

* update CONTRIBUTING.md to include UI build options

* feedback/review
This commit is contained in:
Leigh Johnson
2016-11-09 12:49:18 -05:00
committed by GitHub
parent fe24d0fe0f
commit 0d3eb67bd0
8 changed files with 431 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/package.json
View File

@@ -16,8 +16,8 @@
"npm": "3.10.7"
},
"scripts": {
"build-docker-machine": "grunt dev; ip=$(docker-machine ip $DOCKER_MACHINE_NAME); npm set ansible-tower:django_host ${ip}; grunt sync",
"build-docker-cid": "grunt dev; ip=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' $DOCkER_CID` | npm set config ansible-tower:django_host ${ip}; grunt sync",
"build-docker-machine": "ip=$(docker-machine ip $DOCKER_MACHINE_NAME); npm set ansible-tower:django_host ${ip}; grunt dev;",
"build-docker-cid": "ip=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' $DOCkER_CID` | npm set config ansible-tower:django_host ${ip}; grunt dev;",
"build-devel": "grunt devNoSync",
"pot": "grunt nggettext_extract",
"languages": "grunt nggettext_compile",
@@ -73,6 +73,7 @@
"less-plugin-autoprefix": "^1.4.2",
"load-grunt-configs": "^1.0.0",
"load-grunt-tasks": "^3.5.0",
"minimist": "^1.2.0",
"phantomjs-prebuilt": "^2.1.12",
"time-grunt": "^1.4.0",
"webpack": "^1.13.1"