浏览代码

YARN-10826. [UI2] Upgrade Node.js to v12.22.1. (#3128)

(cherry picked from commit 11d144d2284be29da1f49e163db0763636dcf058)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock
Masatake Iwasaki 4 年之前
父节点
当前提交
7d2186ffcf

+ 1 - 1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml

@@ -143,7 +143,7 @@
                   <goal>install-node-and-yarn</goal>
                   <goal>install-node-and-yarn</goal>
                 </goals>
                 </goals>
                 <configuration>
                 <configuration>
-                  <nodeVersion>v10.23.1</nodeVersion>
+                  <nodeVersion>v12.22.1</nodeVersion>
                   <yarnVersion>v1.22.5</yarnVersion>
                   <yarnVersion>v1.22.5</yarnVersion>
                 </configuration>
                 </configuration>
               </execution>
               </execution>

+ 1 - 1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json

@@ -1,7 +1,7 @@
 {
 {
   "name": "yarn-ui",
   "name": "yarn-ui",
   "dependencies": {
   "dependencies": {
-    "ember": "2.2.0",
+    "ember": "2.11.3",
     "ember-cli-shims": "0.0.6",
     "ember-cli-shims": "0.0.6",
     "ember-cli-test-loader": "0.2.1",
     "ember-cli-test-loader": "0.2.1",
     "ember-data": "2.1.0",
     "ember-data": "2.1.0",

+ 3 - 0
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json

@@ -58,5 +58,8 @@
   "dependencies": {
   "dependencies": {
     "em-helpers": "^0.8.0",
     "em-helpers": "^0.8.0",
     "em-table": "0.12.0"
     "em-table": "0.12.0"
+  },
+  "resolutions": {
+    "graceful-fs": "^4.2.4"
   }
   }
 }
 }

+ 13 - 26
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/yarn.lock

@@ -2611,23 +2611,10 @@ globule@^1.0.0:
     lodash "~4.17.4"
     lodash "~4.17.4"
     minimatch "~3.0.2"
     minimatch "~3.0.2"
 
 
-graceful-fs@^3.0.5:
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
-  dependencies:
-    natives "^1.1.0"
-
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@~4.1.2:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-
-graceful-fs@~2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-2.0.3.tgz#7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"
-
-"graceful-readlink@>= 1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+graceful-fs@^3.0.5, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.4, graceful-fs@~2.0.0, graceful-fs@~4.1.2:
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
+  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
 
 
 growl@^1.8.1:
 growl@^1.8.1:
   version "1.9.2"
   version "1.9.2"
@@ -3834,8 +3821,9 @@ node-modules-path@^1.0.0:
   resolved "https://registry.yarnpkg.com/node-modules-path/-/node-modules-path-1.0.1.tgz#40096b08ce7ad0ea14680863af449c7c75a5d1c8"
   resolved "https://registry.yarnpkg.com/node-modules-path/-/node-modules-path-1.0.1.tgz#40096b08ce7ad0ea14680863af449c7c75a5d1c8"
 
 
 node-sass@^4.1.0:
 node-sass@^4.1.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.6.0.tgz#1a54f5f4502e3cde310a26d6346266fd667271d9"
+  version "4.14.1"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.1.tgz#99c87ec2efb7047ed638fb4c9db7f3a42e2217b5"
+  integrity sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==
   dependencies:
   dependencies:
     async-foreach "^0.1.3"
     async-foreach "^0.1.3"
     chalk "^1.1.1"
     chalk "^1.1.1"
@@ -3844,17 +3832,16 @@ node-sass@^4.1.0:
     get-stdin "^4.0.1"
     get-stdin "^4.0.1"
     glob "^7.0.3"
     glob "^7.0.3"
     in-publish "^2.0.0"
     in-publish "^2.0.0"
-    lodash.assign "^4.2.0"
-    lodash.clonedeep "^4.3.2"
-    lodash.mergewith "^4.6.0"
+    lodash "^4.17.15"
     meow "^3.7.0"
     meow "^3.7.0"
     mkdirp "^0.5.1"
     mkdirp "^0.5.1"
-    nan "^2.3.2"
-    node-gyp "^3.3.1"
+    nan "^2.13.2"
+    node-gyp "^3.8.0"
     npmlog "^4.0.0"
     npmlog "^4.0.0"
-    request "^2.79.0"
-    sass-graph "^2.2.4"
+    request "^2.88.0"
+    sass-graph "2.2.5"
     stdout-stream "^1.4.0"
     stdout-stream "^1.4.0"
+    "true-case-path" "^1.0.2"
 
 
 node-uuid@^1.4.3, node-uuid@~1.4.3, node-uuid@~1.4.7:
 node-uuid@^1.4.3, node-uuid@~1.4.3, node-uuid@~1.4.7:
   version "1.4.8"
   version "1.4.8"