Merge remote-tracking branch 'upstream/master' into decoupled-importer

package.json

@@ -56,46 +56,46 @@
     }
   },
   "dependencies": {
-    "klona": "^1.1.1",
+    "klona": "^1.1.2",
     "loader-utils": "^2.0.0",
-    "neo-async": "^2.6.1",
+    "neo-async": "^2.6.2",
     "schema-utils": "^2.7.0",
     "semver": "^7.3.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.10.3",
-    "@babel/core": "^7.10.3",
-    "@babel/preset-env": "^7.10.3",
-    "@commitlint/cli": "^9.0.1",
-    "@commitlint/config-conventional": "^9.0.1",
+    "@babel/cli": "^7.10.5",
+    "@babel/core": "^7.11.0",
+    "@babel/preset-env": "^7.11.0",
+    "@commitlint/cli": "^9.1.1",
+    "@commitlint/config-conventional": "^9.1.1",
     "@webpack-contrib/defaults": "^6.3.0",
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
-    "babel-jest": "^26.0.1",
-    "bootstrap": "^4.5.0",
+    "babel-jest": "^26.2.2",
+    "bootstrap": "^4.5.1",
     "bootstrap-sass": "^3.4.1",
     "cross-env": "^7.0.2",
-    "css-loader": "^3.6.0",
+    "css-loader": "^4.2.0",
     "del": "^5.1.0",
     "del-cli": "^3.0.1",
     "enhanced-resolve": "^4.3.0",
-    "eslint": "^7.3.0",
+    "eslint": "^7.6.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-import": "^2.21.2",
     "fibers": "^5.0.0",
     "file-loader": "^6.0.0",
     "foundation-sites": "^6.6.3",
     "husky": "^4.2.5",
-    "jest": "^26.0.1",
+    "jest": "^26.2.2",
     "lint-staged": "^10.2.11",
     "material-components-web": "^7.0.0",
     "memfs": "^3.2.0",
     "node-sass": "^4.14.1",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.0.5",
-    "sass": "^1.26.8",
-    "standard-version": "^8.0.0",
+    "sass": "^1.26.10",
+    "standard-version": "^8.0.2",
     "style-loader": "^1.2.1",
-    "webpack": "^4.43.0"
+    "webpack": "^4.44.1"
   },
   "keywords": [
     "sass",

src/utils.js

@@ -253,7 +253,7 @@ function getPossibleRequests(
   return [
     ...new Set(
       [`${dirname}/_${basename}`, request].concat(
-        forWebpackResolver ? [url] : []
+        forWebpackResolver ? [`${path.dirname(url)}/_${basename}`, url] : []
       )
     ),
   ];