From a3e511b97109d58e1fa4cf2220b7a96aedd0f724 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Mon, 30 Jul 2018 22:02:36 -0700 Subject: [PATCH] tools: update to using dmn 1.0.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit dmn 1.0.11 is available. Update update-eslint.sh to use it. Update update-babel-eslint.sh to use it too via npx. Add removeNPMAbsolutePaths to the latter while we're at it. PR-URL: https://github.com/nodejs/node/pull/22035 Reviewed-By: Michaël Zasso Reviewed-By: Gireesh Punathil Reviewed-By: Colin Ihrig Reviewed-By: Refael Ackermann Reviewed-By: Roman Reiss Reviewed-By: Luigi Pinca Reviewed-By: Richard Lau Reviewed-By: Trivikram Kamat --- tools/update-babel-eslint.sh | 10 +++++----- tools/update-eslint.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/update-babel-eslint.sh b/tools/update-babel-eslint.sh index 2b6a4e0ee9825f..6e5971e4ef69ca 100755 --- a/tools/update-babel-eslint.sh +++ b/tools/update-babel-eslint.sh @@ -2,7 +2,7 @@ # Shell script to update babel-eslint in the source tree to the latest release. -# Depends on npm and node being in $PATH. +# Depends on npm, npx, and node being in $PATH. # This script must be be in the tools directory when it runs because it uses # $BASH_SOURCE[0] to determine directories to work in. @@ -15,11 +15,11 @@ npm init --yes npm install --global-style --no-bin-links --production --no-package-lock babel-eslint@latest -# Install dmn if it is not in path. -type -P dmn || npm install -g dmn - # Use dmn to remove some unneeded files. -dmn -f clean +npx dmn@1.0.11 -f clean +# Use removeNPMAbsolutePaths to remove unused data in package.json. +# This avoids churn as absolute paths can change from one dev to another. +npx removeNPMAbsolutePaths@1.0.4 . cd .. mv babel-eslint-tmp/node_modules/babel-eslint node_modules/babel-eslint diff --git a/tools/update-eslint.sh b/tools/update-eslint.sh index 8092b7f0b8e93f..301dd334d84331 100755 --- a/tools/update-eslint.sh +++ b/tools/update-eslint.sh @@ -20,7 +20,7 @@ npm install --no-bin-links --production --no-package-lock eslint-plugin-markdown cd ../.. # Use dmn to remove some unneeded files. -npx dmn@1.0.10 -f clean +npx dmn@1.0.11 -f clean # Use removeNPMAbsolutePaths to remove unused data in package.json. # This avoids churn as absolute paths can change from one dev to another. npx removeNPMAbsolutePaths@1.0.4 .