Skip to content

fix: Importing files using a resource query #55

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

Closed
wants to merge 2 commits into from
Closed

fix: Importing files using a resource query #55

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e0c01a
fix: Importing files using a resource query (#53)
DimitarNestorov Dec 11, 2018
d87b806
fix: wrong indexOfQuery when ?? is present
DimitarNestorov Jan 3, 2019
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
3 changes: 2 additions & 1 deletion src/extractLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ function evalDependencyGraph({loaderContext, src, filename, publicPath = ""}) {
exports,
__webpack_public_path__: publicPath, // eslint-disable-line camelcase
require: givenRelativePath => {
const indexOfQuery = Math.max(givenRelativePath.indexOf("?"), givenRelativePath.length);
const noDoubleQuestionMarkPath = givenRelativePath.replace(/\?\?/g, "##");
Copy link

@smac89 smac89 Apr 30, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When is ?? part of a valid url? Also if you handled ??, why didn't you also handle ????

I don't think you need to handle these anyways. You should just focus on fixing the query part which was handled wrongly in the original code and leave these other cases to the judgement of the person using it.

Copy link
Author

@DimitarNestorov DimitarNestorov Apr 30, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a test case failing, it was related to double question mark. I believe it is valid in webpack context.

const indexOfQuery = noDoubleQuestionMarkPath.includes("?") ? noDoubleQuestionMarkPath.indexOf("?") : givenRelativePath.length;
Copy link

@smac89 smac89 Apr 30, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A shorter way of accomplishing the same thing is:

const indexOfQuery = givenRelativePath.search(/(\?.*)?$/);

Copy link
Author

@DimitarNestorov DimitarNestorov Apr 30, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love it but code is meant to be readable and understandable. I'm going to leave the decision to the maintainer.

const relativePathWithoutQuery = givenRelativePath.slice(0, indexOfQuery);
const indexOfLastExclMark = relativePathWithoutQuery.lastIndexOf("!");
const query = givenRelativePath.slice(indexOfQuery);
Expand Down