Merge remote-tracking branch 'origin/develop' into vue

This commit is contained in:
nobody 2021-08-03 06:44:24 +02:00
commit 2d3f831455
No known key found for this signature in database
GPG Key ID: 8F6DE3D614FCFD7A
13 changed files with 44 additions and 14 deletions

View File

@ -159,6 +159,8 @@ https://cdnjs.cloudflare.com/ajax/libs/angular-ui-utils/0.1.1/angular-ui-utils.m
https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.2/animate.min.css
https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css
https://cdnjs.cloudflare.com/ajax/libs/animejs/3.2.1/anime.min.js
https://cdnjs.cloudflare.com/ajax/libs/aos/2.3.4/aos.css
https://cdnjs.cloudflare.com/ajax/libs/aos/2.3.4/aos.js
https://cdnjs.cloudflare.com/ajax/libs/autocomplete.js/0.38.0/autocomplete.min.js
https://cdnjs.cloudflare.com/ajax/libs/axios/0.21.1/axios.min.js
https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/7.12.1/polyfill.min.js
@ -1274,8 +1276,8 @@ https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/jax/output/HTML-CSS/fonts/T
https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/jax/output/HTML-CSS/imageFonts.js
https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/jax/output/HTML-CSS/jax.js
https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js
https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.19.2/css/mdb.min.css
https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.19.2/js/mdb.min.js
https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.20.0/css/mdb.min.css
https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/4.20.0/js/mdb.min.js
https://cdnjs.cloudflare.com/ajax/libs/mdb-ui-kit/3.9.0/mdb.min.css
https://cdnjs.cloudflare.com/ajax/libs/mdb-ui-kit/3.9.0/mdb.min.js
https://cdnjs.cloudflare.com/ajax/libs/Modaal/0.4.4/css/modaal.min.css
@ -1570,7 +1572,7 @@ https://cdnjs.cloudflare.com/ajax/libs/waypoints/4.0.1/shortcuts/inview.min.js
https://cdnjs.cloudflare.com/ajax/libs/waypoints/4.0.1/shortcuts/sticky.min.js
https://cdnjs.cloudflare.com/ajax/libs/waypoints/4.0.1/waypoints.debug.js
https://cdnjs.cloudflare.com/ajax/libs/waypoints/4.0.1/zepto.waypoints.min.js
https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.5.0/webcomponents-loader.min.js
https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/2.6.0/webcomponents-loader.min.js
https://cdnjs.cloudflare.com/ajax/libs/webfont/1.6.28/webfontloader.js
https://cdnjs.cloudflare.com/ajax/libs/webrtc-adapter/6.4.8/adapter.min.js
https://cdnjs.cloudflare.com/ajax/libs/webrtc-adapter/7.7.1/adapter.min.js

View File

@ -583,7 +583,7 @@ function create_url() {
url="$NETDNA_BOOTSTRAPCDN/$folder/$version/js/bootstrap.min.js"
fi
elif [ "$folder" = "webcomponentsjs" ]; then
url="$CLOUDFLARE/$folder/2.5.0/webcomponents-loader.min.js"
url="$CLOUDFLARE/$folder/2.6.0/webcomponents-loader.min.js"
elif [ "$folder" = "vue-i18n" ] && [[ "$version" != 8* ]]; then
url="$CLOUDFLARE/$folder/$version/vue-i18n.cjs.min.js"
elif [ "$path" = "../resources/twitter-bootstrap/fonts/glyphicons-halflings-regular.woff2" ]; then

View File

@ -128,6 +128,8 @@ mappings.cdn = {
'angular-sanitize/{version}/angular-sanitize.': resources.angularSanitize,
'animate.css/{version}/animate.': resources.animateCSS,
'animejs/{version}/anime.': resources.animejs,
'aos/{version}/aos.css': resources.aosCSS,
'aos/{version}/aos.js': resources.aosJS,
'axios/{version}/axios.': resources.axios,
'babel-polyfill/{version}/polyfill.': resources.babelPolyfill,
'babel-standalone/{version}/babel.': resources.babelStandalone,
@ -483,6 +485,8 @@ mappings.cdn = {
'angular-stripe-checkout@{version}/angular-stripe-checkout.js': resources.angularStripeCheckout,
'animate.css@{version}/animate.min.css': resources.animateCSS,
'animejs@{version}/lib/anime.': resources.animejs,
'aos@{version}/dist/aos.css': resources.aosCSS,
'aos@{version}/dist/aos.js': resources.aosJS,
'appboy-web-sdk@{version}/appboy.min.js': resources.appboyWebSdk,
'autocomplete.js@{version}/dist/autocomplete.': resources.autocompleteJS,
'axios@{version}/dist/axios.': resources.axios,

View File

@ -146,6 +146,13 @@ var resources = {
'animejs': {
'path': 'resources/animejs/{version}/anime.min.jsm'
},
// aos [Deprecated]
'aosCSS': {
'path': 'resources/aos/{version}/aos.css',
},
'aosJS': {
'path': 'resources/aos/{version}/aos.jsm',
},
// Appboy/Braze Web SDK
'appboyWebSdk': {
'path': 'resources/appboy-web-sdk/{version}/appboy.min.jsm'

View File

@ -202,7 +202,7 @@ shorthands.specialFiles = function (channelHost, channelPath, searchString) {
'bundle': 'Materialize'
};
} else if (/cdn\.jsdelivr\.net\/npm\/vue@(2|3)$/.test(CompleteURL)) {
let version = CompleteURL.slice(-1);
let version = CompleteURL.match(Resource.VERSION_EXPRESSION);
lastVersion = targets.setLastVersion(`/vue/${version}.`);
if (lastVersion === false) {
return false;

View File

@ -162,6 +162,8 @@ targets.setLastVersion = function (type, version) {
return '1.2.3';
} else if (type.startsWith('/angular-translate/2.')) {
return '2.18.4';
} else if (type.startsWith('/aos/2.')) {
return '2.3.4';
} else if (type.startsWith('/appboy-web-sdk/3.')) {
return '3.3.0';
} else if (type.startsWith('/axios/0.')) {
@ -442,7 +444,7 @@ targets.setLastVersion = function (type, version) {
} else if (type.startsWith('/markdown-it/')) {
return '12.1.0';
} else if (type.startsWith('/mdbootstrap/4.')) {
return '4.19.2';
return '4.20.0';
} else if (type.startsWith('/material-design-icons/2.')) {
return '2.8.94';
} else if (type.startsWith('/material-design-icons/3.')) {
@ -662,6 +664,8 @@ targets.determineResourceName = function (filename) {
};
const ListOfFiles = {
'aos.css': 'aos (CSS)',
'aos.jsm': 'aos (JS)',
'exif.min.jsm': 'Exif.js',
'bootstrap-icons.min.css': 'Bootstrap Icons',
'clappr.min.jsm': 'clappr',

View File

@ -150,7 +150,10 @@
<div class="description-option" data-i18n-content="blockGoogleFontsDescription">If you use the rules of the rule generator, requests to "fonts.googleapis.com" are allowed to substitute "Google Material Icons" automatically. If you want to block the other requests, enable this option.</div>
<div id="div-domains-allowlist-google-fonts">
<div class="description-option"><textarea rows="7" id="allowedDomainsGoogleFonts" class="input-text without-checkbox" data-option="allowedDomainsGoogleFonts" type="text"></textarea></div>
<div class="description-option" data-i18n-content="labelDomainsAllowlistGoogleFonts">These domains are allowed to load Google Fonts. One domain per line.</div>
<div class="description-option">
<span data-i18n-content="labelDomainsAllowlistGoogleFonts">These domains are allowed to load Google Fonts. One domain per line.</span><br>
<span class="monoblock">&#9989; example.com<br>&#9989; sub.example.com<br>&#10060; https://example.com<br>&#10060; https://*.example.com<br>&#10060; https://example.com/page/example.html</span>
</div>
</div>
</section>
<section class="option">
@ -180,7 +183,11 @@
<div id="html-filter-domains-title-exclude" class="title-option without-checkbox" data-i18n-content="htmlFilterDomainsTitleExclude">Do not apply HTML filter to these domains:</div>
<div id="html-filter-domains-title-include" class="title-option without-checkbox" data-i18n-content="htmlFilterDomainsTitleInclude">Apply HTML filter to these domains:</div>
<textarea rows="7" id="domainsManipulateDOM" class="input-text without-checkbox" data-option="domainsManipulateDOM" type="text"></textarea>
<div class="description-option without-checkbox" data-i18n-content="htmlFilterDomainsDescription">Enter the domains to be handled or ignored by the HTML filter. One domain per line.</div>
<!-- <div class="description-option without-checkbox" data-i18n-content="htmlFilterDomainsDescription">Enter the domains to be handled or ignored by the HTML filter. One domain per line.</div> -->
<div class="description-option without-checkbox">
<span data-i18n-content="htmlFilterDomainsDescription">Enter the domains to be handled or ignored by the HTML filter. One domain per line.</span><br>
<span class="monoblock">&#9989; example.com<br>&#9989; sub.example.com<br>&#10060; https://example.com<br>&#10060; https://*.example.com<br>&#10060; https://example.com/page/example.html</span>
</div>
</section>
<section class="option">
<div class="title-option">

View File

@ -36,6 +36,8 @@
<li>Google Material Icons v92 -> v94 (<a href="https://codeberg.org/nobody/LocalCDN/issues/593">#593</a>)</li>
<li>highlight.js v11.1.0 -> v11.2.0 (<a href="https://codeberg.org/nobody/LocalCDN/issues/594">#594</a>)</li>
<li>libphonenumber-js v1.9.22 -> v1.9.23 (<a href="https://codeberg.org/nobody/LocalCDN/issues/595">#595</a>)</li>
<li>mdbootstrap v4.19.2 -> v4.20.0 (<a href="https://codeberg.org/nobody/LocalCDN/issues/597">#597</a>)</li>
<li>webcomponents-loader v2.5.0 -> v2.6.0 (<a href="https://codeberg.org/nobody/LocalCDN/issues/599">#599</a>)</li>
</ul>
<p>Mapping</p>
<ul>
@ -44,15 +46,17 @@
<p>Added</p>
<ul>
<li>exif-js v2.3.0 (<a href="https://codeberg.org/nobody/LocalCDN/issues/590">#590</a>)</li>
<li>aos JS & CSS v2.3.4 (<a href="https://codeberg.org/nobody/LocalCDN/issues/598">#598</a>)</li>
</ul>
<p>Fixed</p>
<ul>
<li>Version detection of Vue.js (<a href="https://codeberg.org/nobody/LocalCDN/commit/465a18cb04e21968ee1b33519d77982475c28308">#465a18cb04</a>)</li>
<li>Version detection of Vue.js (<a href="https://codeberg.org/nobody/LocalCDN/issues/465a18cb04e21968ee1b33519d77982475c28308">#465a18cb04</a>, <a href="https://codeberg.org/nobody/LocalCDN/issues/598">#598</a>)</li>
<li>Latest version of toastr.js (<a href="https://codeberg.org/nobody/LocalCDN/issues/590">#590</a>)</li>
</ul>
<p>Improved</p>
<ul>
<li>FAQ and options page about generated rules (<a href="https://codeberg.org/nobody/LocalCDN/commit/edad875768e00d72ca64cb36d0aa700636e1b0e8">#edad875768</a>)</li>
<li>Examples for the allow list Google Fonts(<a href="https://codeberg.org/nobody/LocalCDN/issue/585">#585</a>)</li>
</ul>
</div>
<div id="generator-section">

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
!function(){"use strict";var n,t=!1,o=[],d=!1;function e(){window.WebComponents.ready=!0,document.dispatchEvent(new CustomEvent("WebComponentsReady",{bubbles:!0}))}function i(){window.customElements&&customElements.polyfillWrapFlushCallback&&customElements.polyfillWrapFlushCallback(function(e){n=e,d&&n()})}function r(){window.HTMLTemplateElement&&HTMLTemplateElement.bootstrap&&HTMLTemplateElement.bootstrap(window.document),t=!0,c().then(e)}function c(){d=!1;var e=o.map(function(e){return e instanceof Function?e():e});return o=[],Promise.all(e).then(function(){d=!0,n&&n()}).catch(function(e){console.error(e)})}window.WebComponents=window.WebComponents||{},window.WebComponents.ready=window.WebComponents.ready||!1,window.WebComponents.waitFor=window.WebComponents.waitFor||function(e){e&&(o.push(e),t&&c())},window.WebComponents._batchCustomElements=i;var a="webcomponents-loader.js",l=[];"attachShadow"in Element.prototype&&"getRootNode"in Element.prototype&&(!window.ShadyDOM||!window.ShadyDOM.force)||l.push("sd"),window.customElements&&!window.customElements.forcePolyfill||l.push("ce");var s,m,w,u=function(){var e=document.createElement("template");if(!("content"in e))return!0;if(!(e.content.cloneNode()instanceof DocumentFragment))return!0;var n=document.createElement("template");n.content.appendChild(document.createElement("div")),e.content.appendChild(n);var t=e.cloneNode(!0);return 0===t.content.childNodes.length||0===t.content.firstChild.content.childNodes.length}();window.Promise&&Array.from&&window.URL&&window.Symbol&&!u||(l=["sd-ce-pf"]),l.length?(s="bundles/webcomponents-"+l.join("-")+".js",m=window.WebComponents.root?window.WebComponents.root+s:document.querySelector('script[src*="'+a+'"]').src.replace(a,s),(w=document.createElement("script")).src=m,"loading"===document.readyState?(w.setAttribute("onload","window.WebComponents._batchCustomElements()"),document.write(w.outerHTML),document.addEventListener("DOMContentLoaded",r)):(w.addEventListener("load",function(){i(),r()}),w.addEventListener("error",function(){throw new Error("Could not load polyfill bundle"+m)}),document.head.appendChild(w))):"complete"===document.readyState?(t=!0,e()):(window.addEventListener("load",r),window.addEventListener("DOMContentLoaded",function(){window.removeEventListener("load",r),r()}))}();
!function(){"use strict";var n,t=!1,o=[],d=!1;function e(){window.WebComponents.ready=!0,document.dispatchEvent(new CustomEvent("WebComponentsReady",{bubbles:!0}))}function i(){window.customElements&&customElements.polyfillWrapFlushCallback&&customElements.polyfillWrapFlushCallback(function(e){n=e,d&&n()})}function c(){window.HTMLTemplateElement&&HTMLTemplateElement.bootstrap&&HTMLTemplateElement.bootstrap(window.document),t=!0,r().then(e)}function r(){d=!1;var e=o.map(function(e){return e instanceof Function?e():e});return o=[],Promise.all(e).then(function(){d=!0,n&&n()}).catch(function(e){console.error(e)})}window.WebComponents=window.WebComponents||{},window.WebComponents.ready=window.WebComponents.ready||!1,window.WebComponents.waitFor=window.WebComponents.waitFor||function(e){e&&(o.push(e),t&&r())},window.WebComponents._batchCustomElements=i;var l="webcomponents-loader.js",a=[];"attachShadow"in Element.prototype&&"getRootNode"in Element.prototype&&(!window.ShadyDOM||!window.ShadyDOM.force)||a.push("sd"),window.customElements&&!window.customElements.forcePolyfill||a.push("ce");var s,m=function(){var e=document.createElement("template");if(!("content"in e))return!0;if(!(e.content.cloneNode()instanceof DocumentFragment))return!0;var n=document.createElement("template");n.content.appendChild(document.createElement("div")),e.content.appendChild(n);e=e.cloneNode(!0);return 0===e.content.childNodes.length||0===e.content.firstChild.content.childNodes.length}();(a=!(window.Promise&&Array.from&&window.URL&&window.Symbol)||m?["sd-ce-pf"]:a).length?(a="bundles/webcomponents-"+a.join("-")+".js",s=window.WebComponents.root?window.WebComponents.root+a:document.querySelector('script[src*="'+l+'"]').src.replace(l,a),(a=document.createElement("script")).src=s,"loading"===document.readyState?(a.setAttribute("onload","window.WebComponents._batchCustomElements()"),document.write(a.outerHTML),document.addEventListener("DOMContentLoaded",c)):(a.addEventListener("load",function(){i(),c()}),a.addEventListener("error",function(){throw new Error("Could not load polyfill bundle"+s)}),document.head.appendChild(a))):"complete"===document.readyState?(t=!0,e()):(window.addEventListener("load",c),window.addEventListener("DOMContentLoaded",function(){window.removeEventListener("load",c),c()}))}();