nav tabs on admin dashboard

This commit is contained in:
2019-03-07 00:20:34 -06:00
parent f73d6ae228
commit e4f473f376
11661 changed files with 216240 additions and 1544253 deletions

View File

@@ -123,9 +123,9 @@ function runSyncOrAsync(fn, context, args, callback) {
if(result === undefined)
return callback();
if(result && typeof result === "object" && typeof result.then === "function") {
return result.catch(callback).then(function(r) {
return result.then(function(r) {
callback(null, r);
});
}, callback);
}
return callback(null, result);
}
@@ -167,7 +167,10 @@ function iteratePitchingLoaders(options, loaderContext, callback) {
// load loader module
loadLoader(currentLoaderObject, function(err) {
if(err) return callback(err);
if(err) {
loaderContext.cacheable(false);
return callback(err);
}
var fn = currentLoaderObject.pitch;
currentLoaderObject.pitchExecuted = true;
if(!fn) return iteratePitchingLoaders(options, loaderContext, callback);

View File

@@ -1,11 +1,16 @@
var LoaderLoadingError = require("./LoaderLoadingError");
module.exports = function loadLoader(loader, callback) {
if(typeof System === "object" && typeof System.import === "function") {
System.import(loader.path).catch(callback).then(function(module) {
loader.normal = typeof module === "function" ? module : module.default;
loader.pitch = module.pitch;
loader.raw = module.raw;
if(typeof loader.normal !== "function" && typeof loader.pitch !== "function")
throw new Error("Module '" + loader.path + "' is not a loader (must have normal or pitch function)");
if(typeof loader.normal !== "function" && typeof loader.pitch !== "function") {
return callback(new LoaderLoadingError(
"Module '" + loader.path + "' is not a loader (must have normal or pitch function)"
));
}
callback();
});
} else {
@@ -26,13 +31,19 @@ module.exports = function loadLoader(loader, callback) {
}
return callback(e);
}
if(typeof loader !== "function" && typeof loader !== "object")
throw new Error("Module '" + loader.path + "' is not a loader (export function or es6 module))");
if(typeof module !== "function" && typeof module !== "object") {
return callback(new LoaderLoadingError(
"Module '" + loader.path + "' is not a loader (export function or es6 module)"
));
}
loader.normal = typeof module === "function" ? module : module.default;
loader.pitch = module.pitch;
loader.raw = module.raw;
if(typeof loader.normal !== "function" && typeof loader.pitch !== "function")
throw new Error("Module '" + loader.path + "' is not a loader (must have normal or pitch function)");
if(typeof loader.normal !== "function" && typeof loader.pitch !== "function") {
return callback(new LoaderLoadingError(
"Module '" + loader.path + "' is not a loader (must have normal or pitch function)"
));
}
callback();
}
};

View File

@@ -1,8 +1,8 @@
{
"_from": "loader-runner@^2.3.0",
"_id": "loader-runner@2.3.1",
"_id": "loader-runner@2.4.0",
"_inBundle": false,
"_integrity": "sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==",
"_integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
"_location": "/loader-runner",
"_phantomChildren": {},
"_requested": {
@@ -18,8 +18,8 @@
"_requiredBy": [
"/webpack"
],
"_resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.1.tgz",
"_shasum": "026f12fe7c3115992896ac02ba022ba92971b979",
"_resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
"_shasum": "ed47066bfe534d7e84c4c7b9998c2a75607d9357",
"_spec": "loader-runner@^2.3.0",
"_where": "C:\\xampp\\htdocs\\w4rpservices\\node_modules\\webpack",
"author": {
@@ -32,7 +32,6 @@
"deprecated": false,
"description": "Runs (webpack) loaders",
"devDependencies": {
"beautify-lint": "^1.0.4",
"codecov.io": "^0.1.6",
"coveralls": "^2.11.6",
"eslint": "^3.12.2",
@@ -65,14 +64,12 @@
"url": "git+https://github.com/webpack/loader-runner.git"
},
"scripts": {
"beautify": "beautify-rewrite lib/**.js test/*.js",
"beautify-lint": "beautify-lint lib/**.js test/*.js",
"cover": "istanbul cover node_modules/mocha/bin/_mocha",
"lint": "eslint lib test",
"precover": "npm run lint && npm run beautify-lint",
"pretest": "npm run lint && npm run beautify-lint",
"precover": "npm run lint",
"pretest": "npm run lint",
"test": "mocha --reporter spec",
"travis": "npm run cover -- --report lcovonly"
},
"version": "2.3.1"
"version": "2.4.0"
}