filippodb
/
LocalCDN-Firefox-Chrome-Brave
mirror of https://codeberg.org/nobody/LocalCDN.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

debug bowser addition

This commit is contained in:
Calum McConnell 2021-04-27 23:01:46 -04:00
parent f72a3e2c30
commit 2f7d67184e
No known key found for this signature in database
GPG Key ID: EFF5E1D7E0CD9B32
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/mappings.js
View File

@ -473,8 +473,7 @@ mappings.cdn = {
'bootstrap-vue@{version}/dist/bootstrap-vue.css': resources.bootstrapVueCSS, 'bootstrap-vue@{version}/dist/bootstrap-vue.css': resources.bootstrapVueCSS,
'bootstrap-vue@{version}/dist/bootstrap-vue.min.js': resources.bootstrapVueJS, 'bootstrap-vue@{version}/dist/bootstrap-vue.min.js': resources.bootstrapVueJS,
'bootstrap-vue@{version}/dist/bootstrap-vue.js': resources.bootstrapVueJS, 'bootstrap-vue@{version}/dist/bootstrap-vue.js': resources.bootstrapVueJS,
'bowser@{version}/bundled.js' : resources.bowserJS, 'bowser@{version}/': resources.bowserJS,
'bowser@{version}/es5.js' : resources.bowserJS,
'bulma@{version}/css/bulma.': resources.bulma, 'bulma@{version}/css/bulma.': resources.bulma,
'chart.js@{version}': resources.chartJs, 'chart.js@{version}': resources.chartJs,
'clipboard@{version}/dist/clipboard.': resources.clipboardJS, 'clipboard@{version}/dist/clipboard.': resources.clipboardJS,

22
core/request-analyzer.js
View File

@ -125,12 +125,19 @@ requestAnalyzer._findLocalTarget = function (resourceMappings, basePath, channel
}); });
resourcePath = channelPath.replace(basePath, ''); resourcePath = channelPath.replace(basePath, '');
if (Resource.SINGLE_NUMBER_EXPRESSION.test(channelPath)) {
versionNumber = channelPath.match(/\d/); // Evaluate first in case of version 'latest' and numerals in resource
resourcePattern = resourcePath.replace(versionNumber, Resource.VERSION_PLACEHOLDER); versionNumber = resourcePath.match(Resource.VERSION_EXPRESSION);
versionNumber = [`${versionNumber}.0`];
} else { // Handle weird version expressions
versionNumber = resourcePath.match(Resource.VERSION_EXPRESSION); if(!versionNumber){
if (Resource.SINGLE_NUMBER_EXPRESSION.test(channelPath)) {
versionNumber = channelPath.match(/\d/);
resourcePattern = resourcePath.replace(versionNumber, Resource.VERSION_PLACEHOLDER);
versionNumber = [`${versionNumber}.0`];
}
}
else {
resourcePattern = resourcePath.replace(versionNumber, Resource.VERSION_PLACEHOLDER); resourcePattern = resourcePath.replace(versionNumber, Resource.VERSION_PLACEHOLDER);
} }
@ -142,11 +149,10 @@ requestAnalyzer._findLocalTarget = function (resourceMappings, basePath, channel
} }
return shorthandResource; return shorthandResource;
} }
for (let resourceMold of Object.keys(resourceMappings)) { for (let resourceMold of Object.keys(resourceMappings)) {
if (resourcePattern.startsWith(resourceMold)) { if (resourcePattern.startsWith(resourceMold)) {
let targetPath, versionDelivered, versionRequested, bundle; let targetPath, versionDelivered, versionRequested, bundle;
targetPath = resourceMappings[resourceMold].path; targetPath = resourceMappings[resourceMold].path;
targetPath = targetPath.replace(Resource.VERSION_PLACEHOLDER, versionNumber); targetPath = targetPath.replace(Resource.VERSION_PLACEHOLDER, versionNumber);
// Replace the requested version with the latest depending on major version // Replace the requested version with the latest depending on major version

4
core/resources.js
View File

@ -253,8 +253,8 @@ var resources = {
'path': 'resources/bootstrap-vue/{version}/bootstrap-vue.min.css' 'path': 'resources/bootstrap-vue/{version}/bootstrap-vue.min.css'
}, },
// Bowser.js // Bowser.js
'bowserJs': { 'bowserJS': {
'path': 'resources/bowser/{version}/bundled.min.jsm' 'path': 'resources/bowser/{version}/bowser.min.jsm'
}, },
// Bulma // Bulma
'bulma': { 'bulma': {

3
modules/internal/targets.js
View File

@ -205,9 +205,8 @@ targets.setLastVersion = function (type, version) {
return '2.21.2'; return '2.21.2';
} else if (type.startsWith('/bootstrap-3-typeahead/4.')) { } else if (type.startsWith('/bootstrap-3-typeahead/4.')) {
return '4.0.2'; return '4.0.2';
} else if (type.startsWith('/bowser/2.')) { } else if (type.startsWith('/bowser/')) {
return '2.11.0' return '2.11.0'
}
} else if (type.startsWith('/bulma/0.')) { } else if (type.startsWith('/bulma/0.')) {
return '0.9.2'; return '0.9.2';
} else if (type.startsWith('/Chart.js/2.')) { } else if (type.startsWith('/Chart.js/2.')) {