Skip to content
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

fix(ruleset-bundler): virtualFs plugin not recognizing files #2271

Merged
merged 2 commits into from
Oct 21, 2022
Merged

fix(ruleset-bundler): virtualFs plugin not recognizing files #2271

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
25c20df
fix(ruleset-bundler): virtualFs plugin not recognizing files
P0lip Sep 8, 2022
37db704
Merge branch 'develop' into fix/ruleset-bundler/virtual-fs
P0lip Oct 21, 2022
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
1 change: 1 addition & 0 deletions karma.conf.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ module.exports = (config: Config): void => {
'nimma/fallbacks': require.resolve('./node_modules/nimma/dist/legacy/cjs/fallbacks/index.js'),
'nimma/legacy': require.resolve('./node_modules/nimma/dist/legacy/cjs/index.js'),
'node-fetch': require.resolve('./__karma__/fetch'),
'^rollup$': 'rollup/dist/rollup.browser.js',
fs: require.resolve('./__karma__/fs'),
process: require.resolve('./__mocks__/process'),
perf_hooks: require.resolve('./__karma__/perf_hooks'),
Expand Down
14 changes: 4 additions & 10 deletions packages/ruleset-bundler/src/plugins/virtualFs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { dirname, parse, join, normalize, isAbsolute, isURL } from '@stoplight/path';
import type { Plugin, PluginContext } from 'rollup';
import type { Plugin } from 'rollup';
import type { IO } from '../types';

export const virtualFs = ({ fs }: IO): Plugin => {
const recognized = new WeakMap<PluginContext, string[]>();
const recognized = new Set();

return {
name: '@stoplight-spectral/virtual-fs',
Expand All @@ -27,18 +27,12 @@ export const virtualFs = ({ fs }: IO): Plugin => {
resolvedSource = join(dirname(importer), source);
}

let existingEntries = recognized.get(this);
if (existingEntries === void 0) {
existingEntries = [];
recognized.set(this, existingEntries);
}

existingEntries.push(resolvedSource);
recognized.add(resolvedSource);

return resolvedSource;
},
load(id): Promise<string> | undefined {
if (!isURL(id) && recognized.get(this)?.includes(id) === true) {
if (!isURL(id) && recognized.has(id)) {
return fs.promises.readFile(id, 'utf8');
}

Expand Down