From 9bdb95c9e34cef640534e5e5a1e2225a80442000 Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期四, 09 六月 2022 15:48:15 +0800
Subject: [PATCH] TODO#139894 [ footer -最下方說明與保經代合作 ] 文案修改
---
PAMapp/node_modules/js-beautify/js/lib/beautifier.js | 161 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 103 insertions(+), 58 deletions(-)
diff --git a/PAMapp/node_modules/js-beautify/js/lib/beautifier.js b/PAMapp/node_modules/js-beautify/js/lib/beautifier.js
index 55ebb01..c899b26 100644
--- a/PAMapp/node_modules/js-beautify/js/lib/beautifier.js
+++ b/PAMapp/node_modules/js-beautify/js/lib/beautifier.js
@@ -94,8 +94,8 @@
-var Beautifier = __webpack_require__(2).Beautifier,
- Options = __webpack_require__(6).Options;
+var Beautifier = (__webpack_require__(2).Beautifier),
+ Options = (__webpack_require__(6).Options);
function js_beautify(js_source_text, options) {
var beautifier = new Beautifier(js_source_text, options);
@@ -142,14 +142,14 @@
-var Output = __webpack_require__(3).Output;
-var Token = __webpack_require__(4).Token;
+var Output = (__webpack_require__(3).Output);
+var Token = (__webpack_require__(4).Token);
var acorn = __webpack_require__(5);
-var Options = __webpack_require__(6).Options;
-var Tokenizer = __webpack_require__(8).Tokenizer;
-var line_starters = __webpack_require__(8).line_starters;
-var positionable_operators = __webpack_require__(8).positionable_operators;
-var TOKEN = __webpack_require__(8).TOKEN;
+var Options = (__webpack_require__(6).Options);
+var Tokenizer = (__webpack_require__(8).Tokenizer);
+var line_starters = (__webpack_require__(8).line_starters);
+var positionable_operators = (__webpack_require__(8).positionable_operators);
+var TOKEN = (__webpack_require__(8).TOKEN);
function in_array(what, arr) {
@@ -305,6 +305,7 @@
in_case_statement: false, // switch(..){ INSIDE HERE }
in_case: false, // we're on the exact line with "case 0:"
case_body: false, // the indented case-action block
+ case_block: false, // the indented case-action block is wrapped with {}
indentation_level: next_indent_level,
alignment: 0,
line_indent_level: flags_base ? flags_base.line_indent_level : next_indent_level,
@@ -804,10 +805,10 @@
)) {
// We don't support TypeScript,but we didn't break it for a very long time.
// We'll try to keep not breaking it.
- if (!in_array(this._last_last_text, ['class', 'interface'])) {
- this.set_mode(MODE.ObjectLiteral);
- } else {
+ if (in_array(this._last_last_text, ['class', 'interface']) && !in_array(second_token.text, [':', ','])) {
this.set_mode(MODE.BlockStatement);
+ } else {
+ this.set_mode(MODE.ObjectLiteral);
}
} else if (this._flags.last_token.type === TOKEN.OPERATOR && this._flags.last_token.text === '=>') {
// arrow function: (param1, paramN) => { statements }
@@ -923,7 +924,7 @@
if (current_token.type === TOKEN.RESERVED) {
if (in_array(current_token.text, ['set', 'get']) && this._flags.mode !== MODE.ObjectLiteral) {
current_token.type = TOKEN.WORD;
- } else if (current_token.text === 'import' && this._tokens.peek().text === '(') {
+ } else if (current_token.text === 'import' && in_array(this._tokens.peek().text, ['(', '.'])) {
current_token.type = TOKEN.WORD;
} else if (in_array(current_token.text, ['as', 'from']) && !this._flags.import_block) {
current_token.type = TOKEN.WORD;
@@ -983,7 +984,7 @@
if (this._flags.in_case_statement && reserved_array(current_token, ['case', 'default'])) {
this.print_newline();
- if (this._flags.last_token.type !== TOKEN.END_BLOCK && (this._flags.case_body || this._options.jslint_happy)) {
+ if (!this._flags.case_block && (this._flags.case_body || this._options.jslint_happy)) {
// switch cases following one another
this.deindent();
}
@@ -1297,7 +1298,9 @@
if (this._tokens.peek().type !== TOKEN.START_BLOCK) {
this.indent();
this.print_newline();
+ this._flags.case_block = false;
} else {
+ this._flags.case_block = true;
this._output.space_before_token = true;
}
return;
@@ -1395,7 +1398,7 @@
// http://www.ecma-international.org/ecma-262/5.1/#sec-7.9.1
// if there is a newline between -- or ++ and anything else we should preserve it.
- if (current_token.newlines && (current_token.text === '--' || current_token.text === '++')) {
+ if (current_token.newlines && (current_token.text === '--' || current_token.text === '++' || current_token.text === '~')) {
this.print_newline(false, true);
}
@@ -2155,7 +2158,7 @@
-var BaseOptions = __webpack_require__(7).Options;
+var BaseOptions = (__webpack_require__(7).Options);
var validPositionValues = ['before-newline', 'after-newline', 'preserve-newline'];
@@ -2453,13 +2456,13 @@
-var InputScanner = __webpack_require__(9).InputScanner;
-var BaseTokenizer = __webpack_require__(10).Tokenizer;
-var BASETOKEN = __webpack_require__(10).TOKEN;
-var Directives = __webpack_require__(14).Directives;
+var InputScanner = (__webpack_require__(9).InputScanner);
+var BaseTokenizer = (__webpack_require__(10).Tokenizer);
+var BASETOKEN = (__webpack_require__(10).TOKEN);
+var Directives = (__webpack_require__(14).Directives);
var acorn = __webpack_require__(5);
-var Pattern = __webpack_require__(13).Pattern;
-var TemplatablePattern = __webpack_require__(15).TemplatablePattern;
+var Pattern = (__webpack_require__(13).Pattern);
+var TemplatablePattern = (__webpack_require__(15).TemplatablePattern);
function in_array(what, arr) {
@@ -2499,7 +2502,7 @@
var dot_pattern = /[^\d\.]/;
var positionable_operators = (
- ">>> === !== " +
+ ">>> === !== &&= ??= ||= " +
"<< && >= ** != == <= >> || ?? |> " +
"< / - + > : & % ? ^ | *").split(' ');
@@ -2507,7 +2510,7 @@
// Also, you must update possitionable operators separately from punct
var punct =
">>>= " +
- "... >>= <<= === >>> !== **= " +
+ "... >>= <<= === >>> !== **= &&= ??= ||= " +
"=> ^= :: /= << <= == && -= >= >> != -- += ** || ?? ++ %= &= *= |= |> " +
"= ! ? > < : / ^ - + * & % ~ |";
@@ -2551,7 +2554,7 @@
html_comment_end: pattern_reader.matching(/-->/),
include: pattern_reader.starting_with(/#include/).until_after(acorn.lineBreak),
shebang: pattern_reader.starting_with(/#!/).until_after(acorn.lineBreak),
- xml: pattern_reader.matching(/[\s\S]*?<(\/?)([-a-zA-Z:0-9_.]+|{[\s\S]+?}|!\[CDATA\[[\s\S]*?\]\]|)(\s+{[\s\S]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*('[^']*'|"[^"]*"|{[\s\S]+?}))*\s*(\/?)\s*>/),
+ xml: pattern_reader.matching(/[\s\S]*?<(\/?)([-a-zA-Z:0-9_.]+|{[^}]+?}|!\[CDATA\[[^\]]*?\]\]|)(\s*{[^}]+?}|\s+[-a-zA-Z:0-9_.]+|\s+[-a-zA-Z:0-9_.]+\s*=\s*('[^']*'|"[^"]*"|{([^{}]|{[^}]+?})+?}))*\s*(\/?)\s*>/),
single_quote: templatable.until(/['\\\n\r\u2028\u2029]/),
double_quote: templatable.until(/["\\\n\r\u2028\u2029]/),
template_text: templatable.until(/[`\\$]/),
@@ -3223,10 +3226,10 @@
-var InputScanner = __webpack_require__(9).InputScanner;
-var Token = __webpack_require__(4).Token;
-var TokenStream = __webpack_require__(11).TokenStream;
-var WhitespacePattern = __webpack_require__(12).WhitespacePattern;
+var InputScanner = (__webpack_require__(9).InputScanner);
+var Token = (__webpack_require__(4).Token);
+var TokenStream = (__webpack_require__(11).TokenStream);
+var WhitespacePattern = (__webpack_require__(12).WhitespacePattern);
var TOKEN = {
START: 'TK_START',
@@ -3453,7 +3456,7 @@
-var Pattern = __webpack_require__(13).Pattern;
+var Pattern = (__webpack_require__(13).Pattern);
function WhitespacePattern(input_scanner, parent) {
Pattern.call(this, input_scanner, parent);
@@ -3732,7 +3735,7 @@
-var Pattern = __webpack_require__(13).Pattern;
+var Pattern = (__webpack_require__(13).Pattern);
var template_names = {
@@ -3949,8 +3952,8 @@
-var Beautifier = __webpack_require__(17).Beautifier,
- Options = __webpack_require__(18).Options;
+var Beautifier = (__webpack_require__(17).Beautifier),
+ Options = (__webpack_require__(18).Options);
function css_beautify(source_text, options) {
var beautifier = new Beautifier(source_text, options);
@@ -3997,10 +4000,10 @@
-var Options = __webpack_require__(18).Options;
-var Output = __webpack_require__(3).Output;
-var InputScanner = __webpack_require__(9).InputScanner;
-var Directives = __webpack_require__(14).Directives;
+var Options = (__webpack_require__(18).Options);
+var Output = (__webpack_require__(3).Output);
+var InputScanner = (__webpack_require__(9).InputScanner);
+var Directives = (__webpack_require__(14).Directives);
var directives_core = new Directives(/\/\*/, /\*\//);
@@ -4036,6 +4039,9 @@
"@supports": true,
"@document": true
};
+ this.NON_SEMICOLON_NEWLINE_PROPERTY = [
+ "grid-template"
+ ];
}
@@ -4160,7 +4166,9 @@
var enteringConditionalGroup = false;
var insideAtExtend = false;
var insideAtImport = false;
+ var insideScssMap = false;
var topCharacter = this._ch;
+ var insideNonSemiColonValues = false;
var whitespace;
var isAfterSpace;
var previous_ch;
@@ -4212,7 +4220,7 @@
// Ensures any new lines following the comment are preserved
this.eatWhitespace(true);
- } else if (this._ch === '@') {
+ } else if (this._ch === '@' || this._ch === '$') {
this.preserveSingleSpace(isAfterSpace);
// deal with less propery mixins @{...}
@@ -4283,7 +4291,12 @@
this.indent();
this._output.set_indent(this._indentLevel);
} else {
- this.indent();
+ // inside mixin and first param is object
+ if (previous_ch === '(') {
+ this._output.space_before_token = false;
+ } else if (previous_ch !== ',') {
+ this.indent();
+ }
this.print_string(this._ch);
}
@@ -4315,7 +4328,21 @@
this._output.add_new_line(true);
}
}
+ if (this._input.peek() === ')') {
+ this._output.trim(true);
+ if (this._options.brace_style === "expand") {
+ this._output.add_new_line(true);
+ }
+ }
} else if (this._ch === ":") {
+
+ for (var i = 0; i < this.NON_SEMICOLON_NEWLINE_PROPERTY.length; i++) {
+ if (this._input.lookBack(this.NON_SEMICOLON_NEWLINE_PROPERTY[i])) {
+ insideNonSemiColonValues = true;
+ break;
+ }
+ }
+
if ((insideRule || enteringConditionalGroup) && !(this._input.lookBack("&") || this.foundNestedPseudoClass()) && !this._input.lookBack("(") && !insideAtExtend && parenLevel === 0) {
// 'property: value' delimiter
// which could be in a conditional group query
@@ -4348,6 +4375,7 @@
this.print_string(this._ch + this.eatString(this._ch));
this.eatWhitespace(true);
} else if (this._ch === ';') {
+ insideNonSemiColonValues = false;
if (parenLevel === 0) {
if (insidePropertyValue) {
this.outdent();
@@ -4389,20 +4417,32 @@
} else {
this.preserveSingleSpace(isAfterSpace);
this.print_string(this._ch);
- this.eatWhitespace();
- parenLevel++;
- this.indent();
+
+ // handle scss/sass map
+ if (insidePropertyValue && previous_ch === "$" && this._options.selector_separator_newline) {
+ this._output.add_new_line();
+ insideScssMap = true;
+ } else {
+ this.eatWhitespace();
+ parenLevel++;
+ this.indent();
+ }
}
} else if (this._ch === ')') {
if (parenLevel) {
parenLevel--;
this.outdent();
}
+ if (insideScssMap && this._input.peek() === ";" && this._options.selector_separator_newline) {
+ insideScssMap = false;
+ this.outdent();
+ this._output.add_new_line();
+ }
this.print_string(this._ch);
} else if (this._ch === ',') {
this.print_string(this._ch);
this.eatWhitespace(true);
- if (this._options.selector_separator_newline && !insidePropertyValue && parenLevel === 0 && !insideAtImport && !insideAtExtend) {
+ if (this._options.selector_separator_newline && (!insidePropertyValue || insideScssMap) && parenLevel === 0 && !insideAtImport && !insideAtExtend) {
this._output.add_new_line();
} else {
this._output.space_before_token = true;
@@ -4436,8 +4476,13 @@
this.print_string(' ');
this.print_string(this._ch);
} else {
- this.preserveSingleSpace(isAfterSpace);
+ var preserveAfterSpace = previous_ch === '"' || previous_ch === '\'';
+ this.preserveSingleSpace(preserveAfterSpace || isAfterSpace);
this.print_string(this._ch);
+
+ if (!this._output.just_added_newline() && this._input.peek() === '\n' && insideNonSemiColonValues) {
+ this._output.add_new_line();
+ }
}
}
@@ -4483,7 +4528,7 @@
-var BaseOptions = __webpack_require__(7).Options;
+var BaseOptions = (__webpack_require__(7).Options);
function Options(options) {
BaseOptions.call(this, options, 'css');
@@ -4545,8 +4590,8 @@
-var Beautifier = __webpack_require__(20).Beautifier,
- Options = __webpack_require__(21).Options;
+var Beautifier = (__webpack_require__(20).Beautifier),
+ Options = (__webpack_require__(21).Options);
function style_html(html_source, options, js_beautify, css_beautify) {
var beautifier = new Beautifier(html_source, options, js_beautify, css_beautify);
@@ -4593,10 +4638,10 @@
-var Options = __webpack_require__(21).Options;
-var Output = __webpack_require__(3).Output;
-var Tokenizer = __webpack_require__(22).Tokenizer;
-var TOKEN = __webpack_require__(22).TOKEN;
+var Options = (__webpack_require__(21).Options);
+var Output = (__webpack_require__(3).Output);
+var Tokenizer = (__webpack_require__(22).Tokenizer);
+var TOKEN = (__webpack_require__(22).TOKEN);
var lineBreak = /\r\n|[\r\n]/;
var allLineBreaks = /\r\n|[\r\n]/g;
@@ -5177,7 +5222,7 @@
// handle "{{#> myPartial}}
if (raw_token.text === '{{#>' && this.tag_check === '>' && raw_token.next !== null) {
- this.tag_check = raw_token.next.text;
+ this.tag_check = raw_token.next.text.split(' ')[0];
}
}
this.tag_check = this.tag_check.toLowerCase();
@@ -5464,7 +5509,7 @@
-var BaseOptions = __webpack_require__(7).Options;
+var BaseOptions = (__webpack_require__(7).Options);
function Options(options) {
BaseOptions.call(this, options, 'html');
@@ -5561,11 +5606,11 @@
-var BaseTokenizer = __webpack_require__(10).Tokenizer;
-var BASETOKEN = __webpack_require__(10).TOKEN;
-var Directives = __webpack_require__(14).Directives;
-var TemplatablePattern = __webpack_require__(15).TemplatablePattern;
-var Pattern = __webpack_require__(13).Pattern;
+var BaseTokenizer = (__webpack_require__(10).Tokenizer);
+var BASETOKEN = (__webpack_require__(10).TOKEN);
+var Directives = (__webpack_require__(14).Directives);
+var TemplatablePattern = (__webpack_require__(15).TemplatablePattern);
+var Pattern = (__webpack_require__(13).Pattern);
var TOKEN = {
TAG_OPEN: 'TK_TAG_OPEN',
--
Gitblit v1.8.0