External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-18 05:01:19 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #844 from jakemcdermott/fix-package-json-backmerge-issue

Browse Source 
package.json updates / restore ui watch functionality
This commit is contained in:
Jake McDermott 2017-12-18 17:03:03 -05:00 committed by GitHub
commit f7259a1e78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
awx/ui/package.json
View File

@ -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",
@ -104,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",
@ -122,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",