Move assets/resources into src/js/

aussiehash · Nov 27, 2024 · 4d525f1 · 4d525f1
1 parent adced29
commit 4d525f1
Show file tree

Hide file tree

Showing 17 changed files with 5 additions and 8 deletions.
diff --git a/platform/mv3/make-scriptlets.js b/platform/mv3/make-scriptlets.js
@@ -19,12 +19,8 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-'use strict';
-
-/******************************************************************************/
-
+import { builtinScriptlets } from './resources/scriptlets.js';
 import fs from 'fs/promises';
-import { builtinScriptlets } from './scriptlets.js';
 import { safeReplace } from './safe-replace.js';
 
 /******************************************************************************/

diff --git a/src/js/redirect-engine.js b/src/js/redirect-engine.js
@@ -316,7 +316,7 @@ class RedirectEngine {
         this.aliases = new Map();
 
         const fetches = [
-            import('/assets/resources/scriptlets.js').then(module => {
+            import('/js/resources/scriptlets.js').then(module => {
                 for ( const scriptlet of module.builtinScriptlets ) {
                     const details = {};
                     details.mime = mimeFromName(scriptlet.name);

diff --git a/assets/resources/attribute.js → src/js/resources/attribute.js b/assets/resources/attribute.js → src/js/resources/attribute.js
diff --git a/assets/resources/base.js → src/js/resources/base.js b/assets/resources/base.js → src/js/resources/base.js
diff --git a/assets/resources/cookie.js → src/js/resources/cookie.js b/assets/resources/cookie.js → src/js/resources/cookie.js
diff --git a/assets/resources/localstorage.js → src/js/resources/localstorage.js b/assets/resources/localstorage.js → src/js/resources/localstorage.js
diff --git a/assets/resources/parse-replace.js → src/js/resources/parse-replace.js b/assets/resources/parse-replace.js → src/js/resources/parse-replace.js
diff --git a/assets/resources/proxy-apply.js → src/js/resources/proxy-apply.js b/assets/resources/proxy-apply.js → src/js/resources/proxy-apply.js
diff --git a/assets/resources/replace-argument.js → src/js/resources/replace-argument.js b/assets/resources/replace-argument.js → src/js/resources/replace-argument.js
diff --git a/assets/resources/run-at.js → src/js/resources/run-at.js b/assets/resources/run-at.js → src/js/resources/run-at.js
diff --git a/assets/resources/safe-self.js → src/js/resources/safe-self.js b/assets/resources/safe-self.js → src/js/resources/safe-self.js
diff --git a/assets/resources/scriptlets.js → src/js/resources/scriptlets.js b/assets/resources/scriptlets.js → src/js/resources/scriptlets.js
diff --git a/assets/resources/set-constant.js → src/js/resources/set-constant.js b/assets/resources/set-constant.js → src/js/resources/set-constant.js
diff --git a/assets/resources/shared.js → src/js/resources/shared.js b/assets/resources/shared.js → src/js/resources/shared.js
@@ -21,7 +21,7 @@
 */
 
 // Code imported from main code base and exposed as injectable scriptlets
-import { ArglistParser } from '../../js/arglist-parser.js';
+import { ArglistParser } from '../arglist-parser.js';
 
 import { registerScriptlet } from './base.js';
 

diff --git a/assets/resources/spoof-css.js → src/js/resources/spoof-css.js b/assets/resources/spoof-css.js → src/js/resources/spoof-css.js
diff --git a/tools/copy-common-files.sh b/tools/copy-common-files.sh
@@ -12,6 +12,7 @@ cp -R src/css                      $DES/
 cp -R src/img                      $DES/
 mkdir $DES/js
 cp -R src/js/*.js                  $DES/js/
+cp -R src/js/resources             $DES/js/
 cp -R src/js/codemirror            $DES/js/
 cp -R src/js/scriptlets            $DES/js/
 cp -R src/js/wasm                  $DES/js/

diff --git a/tools/make-mv3.sh b/tools/make-mv3.sh
@@ -109,7 +109,7 @@ if [ "$QUICK" != "yes" ]; then
     cp platform/mv3/*.mjs "$TMPDIR"/
     cp platform/mv3/extension/js/utils.js "$TMPDIR"/js/
     cp "$UBO_DIR"/assets/assets.dev.json "$TMPDIR"/
-    cp "$UBO_DIR"/assets/resources/*.js "$TMPDIR"/
+    cp -R "$UBO_DIR"/src/js/resources "$TMPDIR"/
     cp -R platform/mv3/scriptlets "$TMPDIR"/
     mkdir -p "$TMPDIR"/web_accessible_resources
     cp "$UBO_DIR"/src/web_accessible_resources/* "$TMPDIR"/web_accessible_resources/