@normed/bundle 4.2.2 → 4.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/bundles/bin/cli.js +33 -20
- package/bundles/bin/cli.js.map +3 -3
- package/bundles/index.js +33 -20
- package/bundles/index.js.map +3 -3
- package/package.json +1 -1
package/bundles/index.js
CHANGED
|
@@ -34669,15 +34669,15 @@ var require_pug_parser = __commonJS({
|
|
|
34669
34669
|
column: tok.loc.start.column,
|
|
34670
34670
|
filename: this.filename
|
|
34671
34671
|
};
|
|
34672
|
-
var
|
|
34672
|
+
var filters2 = [];
|
|
34673
34673
|
while (this.peek().type === "filter") {
|
|
34674
|
-
|
|
34674
|
+
filters2.push(this.parseIncludeFilter());
|
|
34675
34675
|
}
|
|
34676
34676
|
var path12 = this.expect("path");
|
|
34677
34677
|
node.file.path = path12.val.trim();
|
|
34678
34678
|
node.file.line = path12.loc.start.line;
|
|
34679
34679
|
node.file.column = path12.loc.start.column;
|
|
34680
|
-
if ((/\.jade$/.test(node.file.path) || /\.pug$/.test(node.file.path)) && !
|
|
34680
|
+
if ((/\.jade$/.test(node.file.path) || /\.pug$/.test(node.file.path)) && !filters2.length) {
|
|
34681
34681
|
node.block = "indent" == this.peek().type ? this.block() : this.emptyBlock(tok.loc.start.line);
|
|
34682
34682
|
if (/\.jade$/.test(node.file.path)) {
|
|
34683
34683
|
console.warn(
|
|
@@ -34686,7 +34686,7 @@ var require_pug_parser = __commonJS({
|
|
|
34686
34686
|
}
|
|
34687
34687
|
} else {
|
|
34688
34688
|
node.type = "RawInclude";
|
|
34689
|
-
node.filters =
|
|
34689
|
+
node.filters = filters2;
|
|
34690
34690
|
if (this.peek().type === "indent") {
|
|
34691
34691
|
this.error(
|
|
34692
34692
|
"RAW_INCLUDE_BLOCK",
|
|
@@ -65898,14 +65898,14 @@ var require_handle_filters = __commonJS({
|
|
|
65898
65898
|
var error = require_lib5();
|
|
65899
65899
|
var runFilter = require_run_filter();
|
|
65900
65900
|
module2.exports = handleFilters;
|
|
65901
|
-
function handleFilters(ast,
|
|
65901
|
+
function handleFilters(ast, filters2, options, filterAliases) {
|
|
65902
65902
|
options = options || {};
|
|
65903
65903
|
walk(
|
|
65904
65904
|
ast,
|
|
65905
65905
|
function(node) {
|
|
65906
65906
|
var dir = node.filename ? dirname(node.filename) : null;
|
|
65907
65907
|
if (node.type === "Filter") {
|
|
65908
|
-
handleNestedFilters(node,
|
|
65908
|
+
handleNestedFilters(node, filters2, options, filterAliases);
|
|
65909
65909
|
var text = getBodyAsText(node);
|
|
65910
65910
|
var attrs = getAttributes(node, options);
|
|
65911
65911
|
attrs.filename = node.filename;
|
|
@@ -65933,8 +65933,8 @@ var require_handle_filters = __commonJS({
|
|
|
65933
65933
|
function filterWithFallback(filter2, text2, attrs2, funcName) {
|
|
65934
65934
|
try {
|
|
65935
65935
|
var filterName = getFilterName(filter2);
|
|
65936
|
-
if (
|
|
65937
|
-
return
|
|
65936
|
+
if (filters2 && filters2[filterName]) {
|
|
65937
|
+
return filters2[filterName](text2, attrs2);
|
|
65938
65938
|
} else {
|
|
65939
65939
|
return runFilter(filterName, text2, attrs2, dir, funcName);
|
|
65940
65940
|
}
|
|
@@ -65947,11 +65947,11 @@ var require_handle_filters = __commonJS({
|
|
|
65947
65947
|
}
|
|
65948
65948
|
function filterFileWithFallback(filter2, filename2, file, attrs2) {
|
|
65949
65949
|
var filterName = getFilterName(filter2);
|
|
65950
|
-
if (
|
|
65951
|
-
if (
|
|
65952
|
-
return
|
|
65950
|
+
if (filters2 && filters2[filterName]) {
|
|
65951
|
+
if (filters2[filterName].renderBuffer) {
|
|
65952
|
+
return filters2[filterName].renderBuffer(file.raw, attrs2);
|
|
65953
65953
|
} else {
|
|
65954
|
-
return
|
|
65954
|
+
return filters2[filterName](file.str, attrs2);
|
|
65955
65955
|
}
|
|
65956
65956
|
} else {
|
|
65957
65957
|
return filterWithFallback(filter2, filename2, attrs2, "renderFile");
|
|
@@ -65976,11 +65976,11 @@ var require_handle_filters = __commonJS({
|
|
|
65976
65976
|
}
|
|
65977
65977
|
return ast;
|
|
65978
65978
|
}
|
|
65979
|
-
function handleNestedFilters(node,
|
|
65979
|
+
function handleNestedFilters(node, filters2, options, filterAliases) {
|
|
65980
65980
|
if (node.block.nodes[0] && node.block.nodes[0].type === "Filter") {
|
|
65981
65981
|
node.block.nodes[0] = handleFilters(
|
|
65982
65982
|
node.block,
|
|
65983
|
-
|
|
65983
|
+
filters2,
|
|
65984
65984
|
options,
|
|
65985
65985
|
filterAliases
|
|
65986
65986
|
).nodes[0];
|
|
@@ -68094,7 +68094,7 @@ var require_lib14 = __commonJS({
|
|
|
68094
68094
|
var stripComments = require_pug_strip_comments();
|
|
68095
68095
|
var parse = require_pug_parser();
|
|
68096
68096
|
var load = require_pug_load();
|
|
68097
|
-
var
|
|
68097
|
+
var filters2 = require_pug_filters();
|
|
68098
68098
|
var link = require_pug_linker();
|
|
68099
68099
|
var generateCode = require_pug_code_gen();
|
|
68100
68100
|
var runtime = require_pug_runtime();
|
|
@@ -68215,7 +68215,7 @@ var require_lib14 = __commonJS({
|
|
|
68215
68215
|
filtersSet[key] = options.filters[key];
|
|
68216
68216
|
});
|
|
68217
68217
|
}
|
|
68218
|
-
ast =
|
|
68218
|
+
ast = filters2.handleFilters(
|
|
68219
68219
|
ast,
|
|
68220
68220
|
filtersSet,
|
|
68221
68221
|
options.filterOptions,
|
|
@@ -69146,6 +69146,11 @@ var load_less_default = plugin;
|
|
|
69146
69146
|
var import_pug = __toESM(require_lib14());
|
|
69147
69147
|
var import_fs4 = __toESM(require("fs"));
|
|
69148
69148
|
var import_path5 = __toESM(require("path"));
|
|
69149
|
+
var filters = {
|
|
69150
|
+
escape: (str) => {
|
|
69151
|
+
return str.replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">");
|
|
69152
|
+
}
|
|
69153
|
+
};
|
|
69149
69154
|
function pugTransformer(test, onFound) {
|
|
69150
69155
|
return {
|
|
69151
69156
|
preCodeGen(ast) {
|
|
@@ -69182,7 +69187,8 @@ async function loadAsJS2(filepath, options) {
|
|
|
69182
69187
|
const contents = "export default " + import_pug.default.compileClient(fileData, {
|
|
69183
69188
|
name: "render",
|
|
69184
69189
|
filename: filepath,
|
|
69185
|
-
basedir: options.outbase
|
|
69190
|
+
basedir: options.outbase,
|
|
69191
|
+
filters
|
|
69186
69192
|
});
|
|
69187
69193
|
return {
|
|
69188
69194
|
contents,
|
|
@@ -69199,7 +69205,8 @@ async function loadAsHtml(filepath, options) {
|
|
|
69199
69205
|
pugTransformer(isScriptNodeWithSrcAttr, (nodes) => {
|
|
69200
69206
|
nodes;
|
|
69201
69207
|
})
|
|
69202
|
-
]
|
|
69208
|
+
],
|
|
69209
|
+
filters
|
|
69203
69210
|
});
|
|
69204
69211
|
return {
|
|
69205
69212
|
contents,
|
|
@@ -69216,7 +69223,8 @@ async function loadAsEntrypoint(filepath, options) {
|
|
|
69216
69223
|
pugTransformer(isScriptNodeWithSrcAttr, (nodes) => {
|
|
69217
69224
|
nodes;
|
|
69218
69225
|
})
|
|
69219
|
-
]
|
|
69226
|
+
],
|
|
69227
|
+
filters
|
|
69220
69228
|
});
|
|
69221
69229
|
return {
|
|
69222
69230
|
contents,
|
|
@@ -69228,7 +69236,8 @@ async function loadAsFile(filepath, options) {
|
|
|
69228
69236
|
const contents = import_pug.default.render(fileData, {
|
|
69229
69237
|
name: "render",
|
|
69230
69238
|
filename: filepath,
|
|
69231
|
-
basedir: options.outbase
|
|
69239
|
+
basedir: options.outbase,
|
|
69240
|
+
filters
|
|
69232
69241
|
});
|
|
69233
69242
|
return {
|
|
69234
69243
|
contents,
|
|
@@ -69404,6 +69413,10 @@ var esbuilder = {
|
|
|
69404
69413
|
if (jsTypeFile.test(ext)) {
|
|
69405
69414
|
return jsOutExt;
|
|
69406
69415
|
}
|
|
69416
|
+
switch (ext) {
|
|
69417
|
+
case "less":
|
|
69418
|
+
return "css";
|
|
69419
|
+
}
|
|
69407
69420
|
return ext;
|
|
69408
69421
|
};
|
|
69409
69422
|
const exampleFile = build2[0];
|