From 1798ce99b61728e2d6e1ece508bfb6c10d7e25db Mon Sep 17 00:00:00 2001 From: George Kalpakas Date: Wed, 25 May 2022 21:32:53 +0300 Subject: [PATCH] build(docs-infra): be able to resolve root-relative image URLs in `getImageDimensions()` (#46138) Previously, `getImageDimensions()` would try to resolve image URLs relative to the base path using `path.resolve()`. This resulted in root-relative URLs (i.e. URLs starting with `/`) being treated as absolute filesystem paths and thus resolving incorrectly ([example failure][1]). This commit fixes it by using `.join()` instead, which is more appropriate in this case. (Originally discussed [here][2].) [1]: https://circleci.com/gh/angular/angular/1173150 [2]: https://github.com/angular/angular/pull/46134#issuecomment-1137191996 PR Close #46138 --- .../angular-base-package/services/getImageDimensions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aio/tools/transforms/angular-base-package/services/getImageDimensions.js b/aio/tools/transforms/angular-base-package/services/getImageDimensions.js index e32febb4c81..a3ae84733ee 100644 --- a/aio/tools/transforms/angular-base-package/services/getImageDimensions.js +++ b/aio/tools/transforms/angular-base-package/services/getImageDimensions.js @@ -1,6 +1,6 @@ -const { resolve } = require('canonical-path'); +const { join } = require('canonical-path'); const sizeOf = require('image-size'); module.exports = function getImageDimensions() { - return (basePath, path) => sizeOf(resolve(basePath, path)); + return (basePath, path) => sizeOf(join(basePath, path)); };