Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
architecture: ${{ steps.calculate_architecture.outputs.result }}
cache: "npm"
cache: ${{ matrix.node-version == '6.x' && '' || 'npm' }}
- run: |
sudo npm i npm@6.x
sudo npm install --ignore-engines
Expand Down
1 change: 0 additions & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ export default defineConfig([
"prefer-spread": "off",
"unicorn/prefer-spread": "off",
"prefer-rest-params": "off",
"n/prefer-node-protocol": "off",
},
},
]);
2 changes: 2 additions & 0 deletions lib/LoaderLoadingError.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ class LoadingLoaderError extends Error {
constructor(message) {
super(message);
this.name = "LoaderRunnerError";
// For old Node.js engines remove it then we drop them support
// eslint-disable-next-line unicorn/no-useless-error-capture-stack-trace
Error.captureStackTrace(this, this.constructor);
}
}
Expand Down
5 changes: 1 addition & 4 deletions lib/LoaderRunner.js
Original file line number Diff line number Diff line change
Expand Up @@ -314,13 +314,10 @@ module.exports.runLoaders = function runLoaders(options, callback) {
readResource(resource, callback);
}).bind(null, options.readResource || readFile);

//
const splittedResource = resource && parsePathQueryFragment(resource);
const resourcePath = splittedResource ? splittedResource.path : "";
const resourceQuery = splittedResource ? splittedResource.query : "";
const resourceFragment = splittedResource
? splittedResource.fragment
: "";
const resourceFragment = splittedResource ? splittedResource.fragment : "";
const contextDirectory = resourcePath ? dirname(resourcePath) : null;

// execution state
Expand Down
1 change: 1 addition & 0 deletions lib/loadLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ module.exports = function loadLoader(loader, callback) {
try {
if (url === undefined) url = require("url");

// eslint-disable-next-line n/no-unsupported-features/node-builtins
const loaderUrl = url.pathToFileURL(loader.path);
// eslint-disable-next-line no-eval
const modulePromise = eval(
Expand Down
Loading
Loading