Update Polymer Bundler to v4.0.10, Polymer CSS Build to 0.7.0

Update Polymer Bundler and Polymer CSS build to more recent versions,
and adjust as necessary to fix build and test breakages from the
bundler update. This is a prerequisite for updating bundled Web UI
pages to use JS modules/Polymer 3.

This update increases the size of npm_modules.tar.gz by around 18%
(1M), because we need to support both Polymer2 and Polymer3 in the
toolchain during the migration. Once Polymer2 related tools
(polymer-bundler, crisper) are removed, npm_modules.tar.gz's size
will be decreased again by a similar amount.

Some fixes for bundler v4.0.10 originally from:
https://chromium-review.googlesource.com/c/chromium/src/+/1652566
by aee@.

Bug: 921285
Change-Id: Ibb751cdac789af70e87f3774c5d27d0cafd57150
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1857568
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707619}

chrome/browser/resources/chromeos/bluetooth_pairing_dialog/bluetooth_pairing_dialog.html

@@ -15,7 +15,7 @@
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css">
 
-<script src="chrome://bluetooth-pairing/strings.js"></script>
+<script src="strings.js"></script>
 
 </head>
 

chrome/browser/resources/chromeos/internet_config_dialog/BUILD.gn

@@ -9,6 +9,7 @@ optimize_webui("build") {
   host = "internet_config_dialog"
   html_in_files = [ "internet_config_dialog.html" ]
   html_out_files = [ "vulcanized.html" ]
+  excludes = [ "chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom.html" ]
 
   input = rebase_path(".", root_build_dir)
   js_out_files = [ "crisper.js" ]

chrome/browser/resources/chromeos/internet_detail_dialog/BUILD.gn

@@ -12,6 +12,7 @@ optimize_webui("build") {
 
   input = rebase_path(".", root_build_dir)
   js_out_files = [ "crisper.js" ]
+  excludes = [ "chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom.html" ]
 
   deps = []
 }

chrome/browser/resources/chromeos/internet_detail_dialog/internet_detail_dialog.html

@@ -30,7 +30,7 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
 <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css">
 
-<script src="chrome://internet-detail-dialog/strings.js"></script>
+<script src="strings.js"></script>
 
 </head>
 

chrome/browser/resources/optimize_webui.py

@@ -23,26 +23,36 @@ import node
 import node_modules
 
 
-_RESOURCES_PATH = os.path.join(_SRC_PATH, 'ui', 'webui', 'resources')
+_RESOURCES_PATH = os.path.join(
+    _SRC_PATH, 'ui', 'webui', 'resources', '').replace('\\', '/')
 
 
-_CR_ELEMENTS_PATH = os.path.join(_RESOURCES_PATH, 'cr_elements')
+_CR_ELEMENTS_PATH = os.path.join(
+    _RESOURCES_PATH, 'cr_elements', '').replace('\\', '/')
 
 
-_CR_COMPONENTS_PATH = os.path.join(_RESOURCES_PATH, 'cr_components')
+_CR_COMPONENTS_PATH = os.path.join(
+    _RESOURCES_PATH, 'cr_components', '').replace('\\', '/')
 
 
-_CSS_RESOURCES_PATH = os.path.join(_RESOURCES_PATH, 'css')
+_CSS_RESOURCES_PATH = os.path.join(
+    _RESOURCES_PATH, 'css', '').replace('\\', '/')
 
 
-_HTML_RESOURCES_PATH = os.path.join(_RESOURCES_PATH, 'html')
+_HTML_RESOURCES_PATH = os.path.join(
+    _RESOURCES_PATH, 'html', '').replace('\\', '/')
 
 
-_JS_RESOURCES_PATH = os.path.join(_RESOURCES_PATH, 'js')
+_JS_RESOURCES_PATH = os.path.join(_RESOURCES_PATH, 'js', '').replace('\\', '/')
+
+
+_IMAGES_RESOURCES_PATH = os.path.join(
+    _RESOURCES_PATH, 'images', '').replace('\\', '/')
 
 
 _POLYMER_PATH = os.path.join(
-    _SRC_PATH, 'third_party', 'polymer', 'v1_0', 'components-chromium')
+    _SRC_PATH, 'third_party', 'polymer', 'v1_0', 'components-chromium',
+    '').replace('\\', '/')
 
 
 _VULCANIZE_BASE_ARGS = [
@@ -60,6 +70,7 @@ _VULCANIZE_BASE_ARGS = [
   '--exclude', 'chrome://resources/css/text_defaults.css',
   '--exclude', 'chrome://resources/css/text_defaults_md.css',
   '--exclude', 'chrome://resources/js/load_time_data.js',
+  '--exclude', 'chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.html',
 
   '--inline-css',
   '--inline-scripts',
@@ -74,7 +85,8 @@ _URL_MAPPINGS = [
     ('chrome://resources/css/', _CSS_RESOURCES_PATH),
     ('chrome://resources/html/', _HTML_RESOURCES_PATH),
     ('chrome://resources/js/', _JS_RESOURCES_PATH),
-    ('chrome://resources/polymer/v1_0/', _POLYMER_PATH)
+    ('chrome://resources/polymer/v1_0/', _POLYMER_PATH),
+    ('chrome://resources/images/', _IMAGES_RESOURCES_PATH)
 ]
 
 
@@ -130,8 +142,8 @@ def _update_dep_file(in_folder, args, manifest):
 
 
 def _optimize(in_folder, args):
-  in_path = os.path.normpath(os.path.join(_CWD, in_folder))
-  out_path = os.path.join(_CWD, args.out_folder)
+  in_path = os.path.normpath(os.path.join(_CWD, in_folder)).replace('\\', '/')
+  out_path = os.path.join(_CWD, args.out_folder).replace('\\', '/')
   manifest_out_path = _request_list_path(out_path, args.host)
 
   exclude_args = []
@@ -141,10 +153,9 @@ def _optimize(in_folder, args):
 
   in_html_args = []
   for f in args.html_in_files:
-    in_html_args.append('--in-html')
     in_html_args.append(f)
 
-  tmp_out_dir = os.path.join(out_path, 'bundled')
+  tmp_out_dir = os.path.join(out_path, 'bundled').replace('\\', '/')
   node.RunNode(
       [node_modules.PathToBundler()] +
       _VULCANIZE_BASE_ARGS + _VULCANIZE_REDIRECT_ARGS + exclude_args +
@@ -155,8 +166,8 @@ def _optimize(in_folder, args):
 
        '--manifest-out', manifest_out_path,
        '--root', in_path,
-       '--redirect', '"chrome://%s/|%s"' % (args.host, in_path),
-       '--out-dir', os.path.relpath(tmp_out_dir, _CWD),
+       '--redirect', '"chrome://%s/|%s"' % (args.host, in_path + '/'),
+       '--out-dir', os.path.relpath(tmp_out_dir, _CWD).replace('\\', '/'),
        '--shell', args.html_in_files[0],
       ] + in_html_args)
 

chrome/browser/resources/settings/BUILD.gn

@@ -28,6 +28,7 @@ if (optimize_webui) {
       "crisper.js",
       "lazy_load.crisper.js",
     ]
+    excludes = [ "chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom.html" ]
 
     deps = [
       ":unpak",

chrome/browser/resources/settings/chromeos/BUILD.gn

@@ -29,11 +29,14 @@ if (optimize_webui) {
       "lazy_load.crisper.js",
     ]
     excludes = [
+      "chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom.html",
       "chrome://os-settings/app-management/app_management.mojom-lite.js",
       "chrome://os-settings/app-management/bitmap.mojom-lite.js",
       "chrome://os-settings/app-management/image_info.mojom-lite.js",
       "chrome://os-settings/app-management/image.mojom-lite.js",
       "chrome://os-settings/app-management/types.mojom-lite.js",
+      "chrome://resources/mojo/mojo/public/mojom/base/big_buffer.mojom.html",
+      "chrome://resources/mojo/mojo/public/mojom/base/time.mojom.html",
     ]
 
     deps = [

third_party/node/node_modules.tar.gz.sha1

-5e3e142e86e26030ca3ebfe37d5c408aabc7b36d
+a9603a3dc03fa41af9cc5c8ac28d23d1f98dfe3c

third_party/node/package.json

@@ -6,8 +6,8 @@
     "babel-eslint": "10.0.2",
     "crisper": "2.1.1",
     "eslint": "5.16.0",
-    "polymer-bundler": "3.1.1",
-    "polymer-css-build": "0.3.3",
+    "polymer-bundler": "4.0.10",
+    "polymer-css-build": "0.7.0",
     "uglify-es": "3.3.9",
     "svgo": "1.2.0",
     "typescript": "3.5.3"