npm - @browserless.io/browserless - Versions diffs - 2.30.1 → 2.31.1-beta-1 - Mend

@browserless.io/browserless 2.30.1 → 2.31.1-beta-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.

Files changed (440) hide show

package/extensions/ublocklite/dashboard.html CHANGED Viewed

@@ -13,18 +13,20 @@
 <link rel="stylesheet" href="css/dashboard-common.css">
 <link rel="stylesheet" href="css/filtering-mode.css">
 <link rel="stylesheet" href="css/settings.css">
+<link rel="stylesheet" href="css/develop.css">
-<link rel="shortcut icon" type="image/png" href="img/icon_64.png"/>
+<link rel="icon" type="image/png" href="img/icon_64.png"/>
 </head>
 <body data-pane="settings" class="loading">
     <!-- -------- -->
-    <div id="dashboard-nav">
+    <nav id="dashboard-nav">
         <span class="logo"><img data-i18n-title="extName" src="img/ublock.svg" alt="uBO Lite"></span><!--
      --><button class="tabButton" type="button" data-pane="settings" data-i18n="settingsPageName" tabindex="0"></button><!--
      --><button class="tabButton" type="button" data-pane="rulesets" data-i18n="aboutFilterLists" tabindex="0"></button><!--
+     --><button class="tabButton" type="button" data-pane="develop" data-i18n="developPageName"tabindex="0"></button><!--
      --><button class="tabButton" type="button" data-pane="about" data-i18n="aboutPageName" tabindex="0"></button>
-    </div>
+    </nav>
     <!-- -------- -->
     <section data-pane="settings">
         <div>
@@ -85,14 +87,13 @@
                 </label>
             </div>
             <p><label id="strictBlockMode" data-i18n="enableStrictBlockLabel"><span class="input checkbox"><input type="checkbox"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span>_</label><legend data-i18n="enableStrictBlockLegend"></legend>
-            <p id="developerMode" hidden><label><span class="input checkbox"><input type="checkbox"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span>Developer mode</label>
+            <p id="developerMode"><label data-i18n="developerModeLabel"><span class="input checkbox"><input type="checkbox"><svg viewBox="0 0 24 24"><path d="M1.73,12.91 8.1,19.28 22.79,4.59"/></svg></span>_</label><legend data-i18n="developerModeLegend"></legend>
         </div>
         <div>
             <h3 data-i18n="filteringMode0Name"></h3>
             <p data-i18n="noFilteringModeDescription">_</p>
-            <p><textarea id="trustedSites" spellcheck="false" placeholder="noFilteringModePlaceholder"></textarea>
-            </p>
+            <div id="trustedSites"></div>
         </div>
     </section>
     <!-- -------- -->
@@ -104,6 +105,20 @@
         <div id="lists"></div>
     </section>
     <!-- -------- -->
+    <section data-pane="develop">
+        <div>
+            <p>
+                <button id="dnrRulesApply" class="preferred iconified" type="button" disabled><span class="fa-icon">save</span><span data-i18n="saveButton">_</span><span class="hover"></span></button>
+                <button id="dnrRulesRevert" class="iconified" type="button" disabled><span class="fa-icon">undo</span><span data-i18n="revertButton">_</span><span class="hover"></span></button>
+                &emsp;
+                <button id="dnrRulesImport" class="iconified" type="button"><span class="fa-icon">download-alt</span><span data-i18n="importAndAppendButton">_</span><span class="hover"></span></button>
+                <button id="dnrRulesExport" class="iconified" type="button"><span class="fa-icon">upload-alt</span><span data-i18n="exportButton">_</span><span class="hover"></span></button><input type="file" accept="json/application">
+            </p>
+            <p data-i18n="dnrRulesSummary"></p>
+            <div id="cm-dnrRules"></div>
+        </div>
+    </section>
+    <!-- -------- -->
     <section data-pane="about">
         <div class="body">
             <div id="aboutNameVer" class="li"></div>
@@ -126,6 +141,7 @@
                 <div class="li"><span><a href="https://fontawesome.com/" target="_blank">FontAwesome font family</a> by <a href="https://github.com/davegandy">Dave Gandy</a></span></div>
                 <div class="li"><span><a href="https://github.com/mathiasbynens/punycode.js" target="_blank">Punycode.js</a> by <a href="https://github.com/mathiasbynens">Mathias Bynens</a></span></div>
                 <div class="li"><span><a href="https://flagpedia.net/" target="_blank">Flags of the World</a> by <a href="https://www.davidkrmela.com/">David Krmela</a></span></div>
+                <div class="li"><span><a href="https://codemirror.net/" target="_blank">CodeMirror 6</a> by <a href="https://github.com/marijnh">Marijn Haverbeke</a></span></div>
             </div>
         </div>
     </section>
@@ -156,11 +172,28 @@
             </span>
         </div>
     </div>
+    <template class="summary-panel">
+        <div class="info-panel summary-panel">
+            <div class="info"></div>
+        </div>
+    </template>
+    <template class="feedback-panel">
+        <div class="info-panel feedback-panel">
+            <div class="info"></div>
+            <div class="close"></div>
+        </div>
+    </template>
+    <template class="badmark-tooltip">
+        <div class="badmark-tooltip">
+        </div>
+    </template>
+<script src="lib/codemirror/cm6.bundle.ubol.min.js"></script>
 <script src="js/theme.js" type="module"></script>
 <script src="js/fa-icons.js" type="module"></script>
 <script src="js/i18n.js" type="module"></script>
 <script src="js/dashboard.js" type="module"></script>
 <script src="js/settings.js" type="module"></script>
+<script src="js/develop.js" type="module"></script>
 </body>
 </html>

package/extensions/ublocklite/img/icon_512.png ADDED Viewed

Binary file

package/extensions/ublocklite/js/background.js CHANGED Viewed

@@ -53,12 +53,14 @@ import {
 import {
     enableRulesets,
     excludeFromStrictBlock,
+    getEffectiveUserRules,
     getEnabledRulesetsDetails,
     getRulesetDetails,
     patchDefaultRulesets,
     setStrictBlockMode,
     updateDynamicRules,
     updateSessionRules,
+    updateUserRules,
 } from './ruleset-manager.js';
 import {
@@ -135,6 +137,17 @@ async function onPermissionsAdded(permissions) {
 /******************************************************************************/
+function setDeveloperMode(state) {
+    rulesetConfig.developerMode = state === true;
+    toggleDeveloperMode(rulesetConfig.developerMode);
+    return Promise.all([
+        updateUserRules(),
+        saveRulesetConfig(),
+    ]);
+}
+/******************************************************************************/
 function onMessage(request, sender, callback) {
     // Does not require trusted origin.
@@ -275,9 +288,7 @@ function onMessage(request, sender, callback) {
         return true;
     case 'setDeveloperMode':
-        rulesetConfig.developerMode = request.state;
-        toggleDeveloperMode(rulesetConfig.developerMode);
-        saveRulesetConfig().then(( ) => {
+        setDeveloperMode(request.state).then(( ) => {
             callback();
         });
         return true;
@@ -390,6 +401,18 @@ function onMessage(request, sender, callback) {
         });
         break;
+    case 'getEffectiveUserRules':
+        getEffectiveUserRules().then(result => {
+            callback(result);
+        });
+        return true;
+    case 'updateUserDnrRules':
+        updateUserRules().then(result => {
+            callback(result);
+        });
+        return true;
     default:
         break;
     }
@@ -472,8 +495,15 @@ async function startSession() {
         }
     }
-    // Required to ensure the up to date property is available when needed
-    adminReadEx('disabledFeatures');
+    // Required to ensure up to date properties are available when needed
+    adminReadEx('disabledFeatures').then(items => {
+        if ( Array.isArray(items) === false ) { return; }
+        if ( items.includes('develop') ) {
+            if ( rulesetConfig.developerMode ) {
+                setDeveloperMode(false);
+            }
+        }
+    });
 }
 /******************************************************************************/

package/extensions/ublocklite/js/dashboard.js CHANGED Viewed

@@ -19,6 +19,12 @@
     Home: https://github.com/gorhill/uBlock
 */
+import {
+    localRead,
+    localRemove,
+    localWrite,
+} from './ext.js';
 import { dom } from './dom.js';
 import { runtime } from './ext.js';
@@ -32,7 +38,18 @@ import { runtime } from './ext.js';
 dom.attr('a', 'target', '_blank');
 dom.on('#dashboard-nav', 'click', '.tabButton', ev => {
-    dom.body.dataset.pane = ev.target.dataset.pane;
+    const { pane } = ev.target.dataset;
+    dom.body.dataset.pane = pane;
+    if ( pane === 'settings' ) {
+        localRemove('activeDashboardPane');
+    } else {
+        localWrite('activeDashboardPane', pane);
+    }
+});
+localRead('activeDashboardPane').then(pane => {
+    if ( typeof pane !== 'string' ) { return; }
+    dom.body.dataset.pane = pane;
 });
 /******************************************************************************/