From 09d631c2c17c2713c6b2f67a6e9c21d16f85dd91 Mon Sep 17 00:00:00 2001 From: Joe Fiorini Date: Tue, 24 Mar 2015 17:27:03 -0400 Subject: [PATCH] Support isolated build for documentation examples --- Makefile | 6 +++--- awx/ui/static/js/docs.js | 1 + awx/ui/static/js/smart-status/main.js | 2 +- awx/ui/static/js/smart-status/smart-status.directive.js | 2 +- nodemon.json | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 awx/ui/static/js/docs.js diff --git a/Makefile b/Makefile index 90b68ebe9d..07b73f0df4 100644 --- a/Makefile +++ b/Makefile @@ -290,16 +290,16 @@ devjs: node_modules clean-ui Brocfile.js bower.json Gruntfile.js # Build minified JS/CSS. minjs: node_modules clean-ui Brocfile.js - $(BROCCOLI) build awx/ui/dist -- --silent --no-debug --no-tests --compress + $(BROCCOLI) build awx/ui/dist -- --silent --no-debug --no-tests --compress --no-docs minjs_ci: node_modules clean-ui Brocfile.js - $(BROCCOLI) build awx/ui/dist -- --no-debug --compress + $(BROCCOLI) build awx/ui/dist -- --no-debug --compress --no-docs # Check .js files for errors and lint jshint: node_modules Gruntfile.js $(GRUNT) $@ -ngdocs: node_modules Gruntfile.js +ngdocs: devjs Gruntfile.js $(GRUNT) $@ # Build a pip-installable package into dist/ with a timestamped version number. diff --git a/awx/ui/static/js/docs.js b/awx/ui/static/js/docs.js new file mode 100644 index 0000000000..9398fde08c --- /dev/null +++ b/awx/ui/static/js/docs.js @@ -0,0 +1 @@ +import 'tower/debug'; diff --git a/awx/ui/static/js/smart-status/main.js b/awx/ui/static/js/smart-status/main.js index c4450dcf1e..2eaeb06ad1 100644 --- a/awx/ui/static/js/smart-status/main.js +++ b/awx/ui/static/js/smart-status/main.js @@ -1,4 +1,4 @@ -import smartStatusDirective from 'tower/smart-status/smart-status.directive.js'; +import smartStatusDirective from 'tower/smart-status/smart-status.directive'; export default angular.module('systemStatus', []) .directive('awSmartStatus', smartStatusDirective); diff --git a/awx/ui/static/js/smart-status/smart-status.directive.js b/awx/ui/static/js/smart-status/smart-status.directive.js index 9a5626471a..b1fdd84e4d 100644 --- a/awx/ui/static/js/smart-status/smart-status.directive.js +++ b/awx/ui/static/js/smart-status/smart-status.directive.js @@ -1,4 +1,4 @@ -import smartStatusController from 'tower/smart-status/smart-status.controller.js'; +import smartStatusController from 'tower/smart-status/smart-status.controller'; export default [ function() { return { scope: { diff --git a/nodemon.json b/nodemon.json index a126f33861..6ceb91b153 100644 --- a/nodemon.json +++ b/nodemon.json @@ -3,7 +3,7 @@ "ignore": [ ".git", "node_modules/**/node_modules", - "awx/ui/static/dist" + "awx/ui/static/docs/**/*" ], "watch": [ "awx/ui/static"