diff --git a/airflow/www_rbac/compile_assets.sh b/airflow/www_rbac/compile_assets.sh index a2b61115c85..a3a4ea23496 100755 --- a/airflow/www_rbac/compile_assets.sh +++ b/airflow/www_rbac/compile_assets.sh @@ -19,7 +19,7 @@ set -e # first bump up package.json manually, commit and tag if [ -d airflow/www_rbac/static/dist ]; then - rm airflow/www_rbac/static/dist/* + rm -f airflow/www_rbac/static/dist/* fi cd airflow/www_rbac/ diff --git a/airflow/www_rbac/package-lock.json b/airflow/www_rbac/package-lock.json index a26d0b8894e..c42050e276b 100644 --- a/airflow/www_rbac/package-lock.json +++ b/airflow/www_rbac/package-lock.json @@ -575,6 +575,7 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -2154,23 +2155,30 @@ } }, "dagre": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/dagre/-/dagre-0.8.4.tgz", - "integrity": "sha512-Dj0csFDrWYKdavwROb9FccHfTC4fJbyF/oJdL9LNZJ8WUvl968P6PAKEriGqfbdArVJEmmfA+UyumgWEwcHU6A==", + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/dagre/-/dagre-0.7.4.tgz", + "integrity": "sha1-3nLw50pVDOEc5jjwoTb+1xI5gCI=", "requires": { - "graphlib": "^2.1.7", - "lodash": "^4.17.4" + "graphlib": "^1.0.5", + "lodash": "^3.10.0" + }, + "dependencies": { + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" + } } }, "dagre-d3": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/dagre-d3/-/dagre-d3-0.6.3.tgz", - "integrity": "sha512-1vAzNp7OR1370JtjNaVFiW04DBjPDq513cJnqNVWxIkZqB0HfIArsc5eriTY9RM9cVMUjxdCJ3z4of5f8HqbdA==", - "requires": { - "d3": "^4.12.2", - "dagre": "^0.8.4", - "graphlib": "^2.1.7", - "lodash": "^4.17.10" + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/dagre-d3/-/dagre-d3-0.4.18.tgz", + "integrity": "sha512-7tRltaOfNTIkNEZYMCL8N3Q8bCre99x/mAJL2RbuUfPu5d+4f0KOHglZm+AzOG2Z/+S2HBDYciE6iDcDtki6Tg==", + "requires": { + "d3": "^3.3.8", + "dagre": "^0.7.3", + "graphlib": "^1.0.5", + "lodash": "^3.10.0" }, "dependencies": { "lodash": { @@ -3451,7 +3459,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -3472,12 +3481,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3492,17 +3503,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -3619,7 +3633,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -3631,6 +3646,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3645,6 +3661,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -3652,12 +3669,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -3676,6 +3695,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -3756,7 +3776,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -3768,6 +3789,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -3853,7 +3875,8 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -3889,6 +3912,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3908,6 +3932,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -3951,12 +3976,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -4102,11 +4129,18 @@ "dev": true }, "graphlib": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.7.tgz", - "integrity": "sha512-TyI9jIy2J4j0qgPmOOrHTCtpPqJGN/aurBwc6ZT+bRii+di1I+Wv3obRhVrmBEXet+qkMaEX67dXrwsd3QQM6w==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-1.0.7.tgz", + "integrity": "sha1-DKst8P/mq+BwsmJb+h7bbslnuLE=", "requires": { - "lodash": "^4.17.5" + "lodash": "^3.10.0" + }, + "dependencies": { + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" + } } }, "handlebars": { @@ -4960,7 +4994,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true + "dev": true, + "optional": true }, "loose-envify": { "version": "1.3.1", diff --git a/airflow/www_rbac/package.json b/airflow/www_rbac/package.json index f9a99fdc171..5c431895a76 100644 --- a/airflow/www_rbac/package.json +++ b/airflow/www_rbac/package.json @@ -58,7 +58,7 @@ "bootstrap-toggle": "^2.2.2", "d3": "^3.4.4", "d3-tip": "^0.9.1", - "dagre-d3": "^0.6.3", + "dagre-d3": "^0.4.18", "datatables.net": "^1.10.19", "datatables.net-bs": "^1.10.19", "lodash": "^4.17.11",