Skip to content

Bump enhanced-resolve from 3.4.1 to 5.12.0 #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 16, 2023
Merged

Bump enhanced-resolve from 3.4.1 to 5.12.0 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84160e1
Bump enhanced-resolve from 3.4.1 to 5.12.0
dependabot[bot] Mar 15, 2023
38799de
Fix enhanced-resolve update
princed Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
const postcss = require('postcss');
const fs = require('fs');
const path = require('path');
const promisify = require('es6-promisify');
const { CachedInputFileSystem, NodeJsInputFileSystem, ResolverFactory } = require('enhanced-resolve');
const { CachedInputFileSystem, ResolverFactory } = require('enhanced-resolve');
const { parse } = require('postcss-values-parser');
const { urlToRequest } = require('loader-utils');
const ICSSUtils = require('icss-utils');
Expand All @@ -15,8 +16,9 @@ const PLUGIN = 'postcss-modules-values-replace';
const INNER_PLUGIN = 'postcss-modules-values-replace-bind';

// Borrowed from enhanced-resolve
const nodeFs = new CachedInputFileSystem(new NodeJsInputFileSystem(), 4000);
const nodeFs = new CachedInputFileSystem(fs, 4000);
const concordContext = {};
const resolveContext = {};

const replaceValueSymbols = (valueString, replacements) => {
const value = parse(valueString, { ignoreUnknownWords: true });
Expand Down Expand Up @@ -141,7 +143,7 @@ const walkerPlugin = (fn, ...args) => ({
walkerPlugin.postcss = true;

const factory = ({
fs = nodeFs,
fs: fileSystem = nodeFs,
noEmitExports = false,
resolve: resolveOptions = {},
preprocessValues = false,
Expand All @@ -155,7 +157,7 @@ const factory = ({
return {
async Once(root) {
const resolver = ResolverFactory.createResolver(Object.assign(
{ fileSystem: fs },
{ fileSystem },
resolveOptions,
));
const resolve = promisify(resolver.resolve, resolver);
Expand All @@ -172,7 +174,7 @@ const factory = ({
const definitionCache = new Map();
async function walkFile(from, dir, requiredDefinitions) {
const request = importsAsModuleRequests ? urlToRequest(from) : from;
const resolvedFrom = await resolve(concordContext, dir, request);
const resolvedFrom = await resolve(concordContext, dir, request, resolveContext);

const cached = definitionCache.get(resolvedFrom);
if (cached) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"homepage": "https://github.com/princed/postcss-modules-values-replace",
"dependencies": {
"enhanced-resolve": "^3.1.0",
"enhanced-resolve": "^5.12.0",
"es6-promisify": "^5.0.0",
"icss-utils": "^5.1.0",
"loader-utils": "^3.2.1",
Expand Down