hterm: switch to newer rollup string plugin The rollup-plugin-string hasn't been updated in years which is pulling in a lot of old deps that is holding others back. Switch to one that has been rebuilt with the same API: @bkuri/rollup-plugin-string. Need to rebuild the bundle & fix the update script too. Change-Id: I3b32abe633126d0d845fe83cf12a276bb80acaa5 Reviewed-on: https://chromium-review.googlesource.com/c/apps/libapps/+/5003938 Reviewed-by: Joel Hockey <joelhockey@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com>
diff --git a/hterm/rollup.config.js b/hterm/rollup.config.js index 1e2ca46..474522c 100644 --- a/hterm/rollup.config.js +++ b/hterm/rollup.config.js
@@ -6,11 +6,11 @@ * @fileoverview Bundle up for release. */ +import string from '@bkuri/rollup-plugin-string'; import image from '@rollup/plugin-image'; import terser from '@rollup/plugin-terser'; import url from '@rollup/plugin-url'; import gitInfo from 'rollup-plugin-git-info'; -import {string} from 'rollup-plugin-string'; const plugins = []; if (process.env.NODE_ENV === 'production') {
diff --git a/libdot/bin/node b/libdot/bin/node index 82152ba..1b60509 100755 --- a/libdot/bin/node +++ b/libdot/bin/node
@@ -17,7 +17,7 @@ # Allow a long line for easy automated updating. # pylint: disable=line-too-long NODE_MODULES_HASH = ( - "9fa46a29844cc1c69c67698c8dddff1e5bcd015037ffe30e6fad786b9e674719" + "a8883766ac35c101613cfb8a3b8a4e2813e409b7faa0703b3114c90e2ba4bac1" ) # pylint: enable=line-too-long
diff --git a/libdot/bin/node_modules_create_bundle b/libdot/bin/node_modules_create_bundle index 52c7948..d2e60cc 100755 --- a/libdot/bin/node_modules_create_bundle +++ b/libdot/bin/node_modules_create_bundle
@@ -53,7 +53,7 @@ logging.info( "To update the hash, run:\n" - "sed -i \"/^NODE_MODULES_HASH *=/s:=.*:= '%s':\" '%s/node'", + 'sed -i \'/^NODE_MODULES_HASH *=/,+1{/"/s:".*":"%s":}\' \'%s/node\'', new_hash, libdot.BIN_DIR, )
diff --git a/package.json b/package.json index eeb327f..7ffc208 100644 --- a/package.json +++ b/package.json
@@ -16,6 +16,7 @@ "start": "http-server --cors -a localhost -c-1 ." }, "dependencies": { + "@bkuri/rollup-plugin-string": "~1", "@material/mwc-icon-button": "^0.25.3", "@polymer/polymer": "^3.3", "@rollup/plugin-commonjs": "^21.0.1", @@ -58,7 +59,6 @@ "regex-extract-loader": "~1", "rollup": "~2", "rollup-plugin-git-info": "~1", - "rollup-plugin-string": "~3", "terser": "~5", "typescript": "~5", "url-loader": "~4",