From c4ccfa1b2799c4f365e43b8c9661fc88100221f5 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Thu, 14 Dec 2017 14:23:46 -0500 Subject: [PATCH 1/2] restoring ui watch functionality --- awx/ui/package.json | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/awx/ui/package.json b/awx/ui/package.json index 09ffb3f203..7847708eaa 100644 --- a/awx/ui/package.json +++ b/awx/ui/package.json @@ -29,17 +29,7 @@ "lint": "eslint .", "dev": "webpack --config build/webpack.development.js --progress", "watch": "webpack-dev-server --config build/webpack.watch.js --progress", - "production": "webpack --config build/webpack.production.js", - "component-test": "./node_modules/.bin/karma start client/test/karma.conf.js", - "lint-dev": "./node_modules/.bin/nodemon --exec \"./node_modules/.bin/eslint -c .eslintrc.js .\" --watch \"client/components/**/*.js\"", - "component-dev": "./node_modules/.bin/karma start client/test/karma.conf.js --auto-watch --no-single-run" - }, - "optionalDependencies": { - "fsevents": "*", - "browser-sync": "^2.14.0", - "grunt-browser-sync": "^2.2.0", - "grunt-contrib-watch": "^1.0.0", - "webpack-dev-server": "^1.14.1" + "production": "webpack --config build/webpack.production.js" }, "devDependencies": { "angular-mocks": "~1.6.6", From 987cdc680293ed6b28b64c4cae1b2095f764f87b Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Mon, 18 Dec 2017 16:21:29 -0500 Subject: [PATCH 2/2] Bump versions of angular-codemirror, jquery-ui, and moment --- awx/ui/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/ui/package.json b/awx/ui/package.json index 7847708eaa..9e9604f1a2 100644 --- a/awx/ui/package.json +++ b/awx/ui/package.json @@ -94,7 +94,7 @@ "@uirouter/angularjs": "^1.0.7", "angular": "~1.6.6", "angular-breadcrumb": "git+https://git@github.com/ansible/angular-breadcrumb#0.4.1", - "angular-codemirror": "git+https://git@github.com/ansible/angular-codemirror#v1.1.1", + "angular-codemirror": "git+https://git@github.com/ansible/angular-codemirror#v1.1.2", "angular-cookies": "~1.6.6", "angular-drag-and-drop-lists": "git+https://git@github.com/ansible/angular-drag-and-drop-lists#v1.4.1", "angular-duration-format": "^1.0.1", @@ -112,12 +112,12 @@ "d3": "~3.3.13", "javascript-detect-element-resize": "^0.5.3", "jquery": "~2.2.4", - "jquery-ui": "~1.10.5", + "jquery-ui": "^1.12.1", "js-yaml": "^3.2.7", "legacy-loader": "0.0.2", "lodash": "~3.8.0", "lr-infinite-scroll": "git+https://git@github.com/lorenzofox3/lrInfiniteScroll", - "moment": "~2.10.0", + "moment": "^2.19.4", "ng-toast": "git+https://git@github.com/ansible/ngToast#v2.1.1", "nvd3": "git+https://git@github.com/ansible/nvd3#awx", "reconnectingwebsocket": "^1.0.0",