From 8b9ee46f7ac7a9ee44e866957eb0dfecf2d9b7ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 13:44:52 +0100 Subject: [PATCH] Bump glob from 8.1.0 to 9.2.1 (#9527) * Bump glob from 8.1.0 to 9.2.1 Bumps [glob](https://github.com/isaacs/node-glob) from 8.1.0 to 9.2.1. - [Release notes](https://github.com/isaacs/node-glob/releases) - [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md) - [Commits](https://github.com/isaacs/node-glob/compare/v8.1.0...v9.2.1) --- updated-dependencies: - dependency-name: glob dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * update build script to glob v9 --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Martin Raifer --- package.json | 2 +- scripts/build_css.js | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 2fd3c7c00..462310b94 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "eslint": "^8.8.0", "fetch-mock": "^9.11.0", "gaze": "^1.1.3", - "glob": "^8.0.3", + "glob": "^9.2.1", "happen": "^0.3.2", "js-yaml": "^4.0.0", "json-stringify-pretty-compact": "^3.0.0", diff --git a/scripts/build_css.js b/scripts/build_css.js index 1dc7663a1..22ffe6452 100644 --- a/scripts/build_css.js +++ b/scripts/build_css.js @@ -29,8 +29,8 @@ function buildCSS() { return _currBuild = Promise.resolve() - .then(() => doGlob('css/**/*.css')) - .then(files => doConcat(files, 'dist/iD.css')) + .then(() => glob('css/**/*.css')) + .then(files => doConcat(files.sort(), 'dist/iD.css')) .then(() => { const css = fs.readFileSync('dist/iD.css', 'utf8'); return postcss([ @@ -54,15 +54,6 @@ function buildCSS() { } -function doGlob(pattern) { - return new Promise((resolve, reject) => { - glob(pattern, (err, files) => { - if (err) return reject(err); - resolve(files); - }); - }); -} - function doConcat(files, output) { return new Promise((resolve, reject) => { concat(files, output, (err) => {