Skip to content

Commit

Permalink
fix: compatibility with the filesystem cache (#896)
Browse files Browse the repository at this point in the history
  • Loading branch information
evilebottnawi authored Oct 22, 2020
1 parent b378046 commit e31f9b6
Show file tree
Hide file tree
Showing 15 changed files with 1,749 additions and 2,349 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ Thumbs.db
*.sublime-project
*.sublime-workspace
.nyc_output
test/output
test/outputs
3,241 changes: 1,020 additions & 2,221 deletions package-lock.json

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,30 +63,30 @@
"semver": "^7.3.2"
},
"devDependencies": {
"@babel/cli": "^7.11.6",
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.11.5",
"@babel/cli": "^7.12.1",
"@babel/core": "^7.12.3",
"@babel/preset-env": "^7.12.1",
"@commitlint/cli": "^11.0.0",
"@commitlint/config-conventional": "^11.0.0",
"@webpack-contrib/defaults": "^6.3.0",
"@webpack-contrib/eslint-config-webpack": "^3.0.0",
"babel-jest": "^26.5.2",
"bootstrap": "^4.5.2",
"babel-jest": "^26.6.0",
"bootstrap": "^4.5.3",
"bootstrap-sass": "^3.4.1",
"cross-env": "^7.0.2",
"css-loader": "^4.3.0",
"css-loader": "^5.0.0",
"del": "^6.0.0",
"del-cli": "^3.0.1",
"enhanced-resolve": "^5.2.0",
"enhanced-resolve": "^5.3.0",
"eslint": "^7.10.0",
"eslint-config-prettier": "^6.12.0",
"eslint-config-prettier": "^6.14.0",
"eslint-plugin-import": "^2.22.1",
"fibers": "^5.0.0",
"file-loader": "^6.1.0",
"foundation-sites": "^6.6.3",
"husky": "^4.3.0",
"jest": "^26.5.2",
"lint-staged": "^10.4.0",
"jest": "^26.6.0",
"lint-staged": "^10.4.2",
"material-components-web": "^7.0.0",
"memfs": "^3.2.0",
"node-sass": "^4.14.1",
Expand All @@ -95,7 +95,7 @@
"sass": "^1.27.0",
"standard-version": "^9.0.0",
"style-loader": "^2.0.0",
"webpack": "^4.44.2"
"webpack": "^5.2.0"
},
"keywords": [
"sass",
Expand Down
8 changes: 7 additions & 1 deletion src/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,13 @@ function getWebpackResolver(
return Promise.reject();
}

const [{ resolve, context, possibleRequests }] = resolutionMap;
const [{ possibleRequests }] = resolutionMap;

if (possibleRequests.length === 0) {
return Promise.reject();
}

const [{ resolve, context }] = resolutionMap;

try {
return await resolve(context, possibleRequests[0]);
Expand Down
Loading

0 comments on commit e31f9b6

Please sign in to comment.