From 5d02a8789d50e09d2ad4ddceaef9ede84cdbbbf3 Mon Sep 17 00:00:00 2001 From: Charles Suh Date: Thu, 5 Dec 2019 14:22:15 -0800 Subject: [PATCH] fix: check for `url` being null before accessing `__esModules` property --- src/runtime/getUrl.js | 2 +- test/__snapshots__/loader.test.js.snap | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/runtime/getUrl.js b/src/runtime/getUrl.js index c2e3d506..1ae687a3 100644 --- a/src/runtime/getUrl.js +++ b/src/runtime/getUrl.js @@ -5,7 +5,7 @@ module.exports = (url, options) => { } // eslint-disable-next-line no-underscore-dangle, no-param-reassign - url = url.__esModule ? url.default : url; + url = url && url.__esModule ? url.default : url; if (typeof url !== 'string') { return url; diff --git a/test/__snapshots__/loader.test.js.snap b/test/__snapshots__/loader.test.js.snap index 40572090..fcc81263 100644 --- a/test/__snapshots__/loader.test.js.snap +++ b/test/__snapshots__/loader.test.js.snap @@ -109,7 +109,7 @@ exports[`loader should compile with \`css\` entry point (with \`modules\` and sc } // eslint-disable-next-line no-underscore-dangle, no-param-reassign - url = url.__esModule ? url.default : url; + url = url && url.__esModule ? url.default : url; if (typeof url !== 'string') { return url; @@ -414,7 +414,7 @@ exports[`loader should compile with \`css\` entry point (with \`modules\` and sc } // eslint-disable-next-line no-underscore-dangle, no-param-reassign - url = url.__esModule ? url.default : url; + url = url && url.__esModule ? url.default : url; if (typeof url !== 'string') { return url; @@ -743,7 +743,7 @@ exports[`loader should compile with \`css\` entry point: escape 1`] = ` } // eslint-disable-next-line no-underscore-dangle, no-param-reassign - url = url.__esModule ? url.default : url; + url = url && url.__esModule ? url.default : url; if (typeof url !== 'string') { return url; @@ -1048,7 +1048,7 @@ exports[`loader should compile with \`js\` entry point: escape 1`] = ` } // eslint-disable-next-line no-underscore-dangle, no-param-reassign - url = url.__esModule ? url.default : url; + url = url && url.__esModule ? url.default : url; if (typeof url !== 'string') { return url; @@ -1547,7 +1547,7 @@ module.exports = (url, options) => { } // eslint-disable-next-line no-underscore-dangle, no-param-reassign - url = url.__esModule ? url.default : url; + url = url && url.__esModule ? url.default : url; if (typeof url !== 'string') { return url; @@ -1824,7 +1824,7 @@ module.exports = (url, options) => { } // eslint-disable-next-line no-underscore-dangle, no-param-reassign - url = url.__esModule ? url.default : url; + url = url && url.__esModule ? url.default : url; if (typeof url !== 'string') { return url;