Просмотр исходного кода

moved singlefile dependencies into extension/lib

Former-commit-id: 0c950e0873abdc864db1211340a0dd5c50d446b2
Gildas 6 лет назад
Родитель
Сommit
b146f8d3df

+ 0 - 0
extension/lib/browser-polyfill/chrome-browser-polyfill.js → extension/lib/single-file/browser-polyfill/chrome-browser-polyfill.js


+ 4 - 4
extension/lib/core/bg/scripts.js → extension/lib/single-file/core/bg/scripts.js

@@ -49,8 +49,8 @@ singlefile.extension.lib.core.bg.scripts = (() => {
 		"lib/single-file/processors/lazy/content/content-lazy-loader.js",
 		"lib/single-file/processors/hooks/content/content-hooks.js",
 		"extension/index.js",
-		"extension/lib/browser-polyfill/chrome-browser-polyfill.js",
-		"extension/lib/fetch/content/content-fetch.js",
+		"extension/lib/single-file/browser-polyfill/chrome-browser-polyfill.js",
+		"extension/lib/single-file/fetch/content/content-fetch.js",
 	];
 
 	const frameScriptFiles = [
@@ -59,8 +59,8 @@ singlefile.extension.lib.core.bg.scripts = (() => {
 		"lib/single-file/processors/hooks/content/content-hooks-frames.js",
 		"lib/single-file/processors/frame-tree/content/content-frame-tree.js",
 		"extension/index.js",
-		"extension/lib/browser-polyfill/chrome-browser-polyfill.js",
-		"extension/lib/fetch/content/content-fetch.js"
+		"extension/lib/single-file/browser-polyfill/chrome-browser-polyfill.js",
+		"extension/lib/single-file/fetch/content/content-fetch.js"
 	];
 
 	return {

+ 2 - 3
extension/lib/fetch/bg/fetch.js → extension/lib/single-file/fetch/bg/fetch.js

@@ -21,9 +21,9 @@
  *   Source.
  */
 
-/* global singlefile, browser, XMLHttpRequest */
+/* global browser, XMLHttpRequest */
 
-singlefile.extension.lib.fetch.bg.resources = (() => {
+(() => {
 
 	browser.runtime.onMessage.addListener((message, sender) => {
 		if (message.method && message.method.startsWith("singlefile.fetch")) {
@@ -34,7 +34,6 @@ singlefile.extension.lib.fetch.bg.resources = (() => {
 			});
 		}
 	});
-	return {};
 
 	async function onRequest(message, sender) {
 		if (message.method == "singlefile.fetch") {

+ 0 - 0
extension/lib/fetch/content/content-fetch.js → extension/lib/single-file/fetch/content/content-fetch.js


+ 2 - 3
extension/lib/frame-tree/bg/frame-tree.js → extension/lib/single-file/frame-tree/bg/frame-tree.js

@@ -21,9 +21,9 @@
  *   Source.
  */
 
-/* global singlefile, browser */
+/* global browser */
 
-singlefile.extension.lib.frameTree.bg.main = (() => {
+(() => {
 
 	"use strict";
 
@@ -33,6 +33,5 @@ singlefile.extension.lib.frameTree.bg.main = (() => {
 			return Promise.resolve({});
 		}
 	});
-	return {};
 
 })();

+ 2 - 3
extension/lib/lazy/bg/lazy-timeout.js → extension/lib/single-file/lazy/bg/lazy-timeout.js

@@ -21,9 +21,9 @@
  *   Source.
  */
 
-/* global singlefile, browser, setTimeout, clearTimeout */
+/* global browser, setTimeout, clearTimeout */
 
-singlefile.extension.lib.lazy.bg.main = (() => {
+(() => {
 
 	"use strict";
 
@@ -43,6 +43,5 @@ singlefile.extension.lib.lazy.bg.main = (() => {
 			return Promise.resolve({ id: message.id });
 		}
 	});
-	return {};
 
 })();

+ 1 - 1
extension/ui/devtools/devtools.html

@@ -6,7 +6,7 @@
 </head>
 
 <body>
-    <script type="text/javascript" src="/extension/lib/browser-polyfill/chrome-browser-polyfill.js"></script>
+    <script type="text/javascript" src="/extension/lib/single-file/browser-polyfill/chrome-browser-polyfill.js"></script>
     <script src="devtools.js"></script>
 </body>
 

+ 1 - 1
extension/ui/pages/options.html

@@ -302,7 +302,7 @@
 			</form>
 		</div>
 	</main>
-	<script type="text/javascript" src="/extension/lib/browser-polyfill/chrome-browser-polyfill.js"></script>
+	<script type="text/javascript" src="/extension/lib/single-file/browser-polyfill/chrome-browser-polyfill.js"></script>
 	<script type="text/javascript" src="../bg/ui-options.js"></script>
 </body>
 

+ 7 - 7
manifest.json

@@ -19,7 +19,7 @@
 			"js": [
 				"lib/single-file/index.js",
 				"extension/index.js",
-				"extension/lib/browser-polyfill/chrome-browser-polyfill.js",
+				"extension/lib/single-file/browser-polyfill/chrome-browser-polyfill.js",
 				"lib/single-file/single-file-helper.js",
 				"lib/single-file/processors/hooks/content/content-hooks-frames.js",
 				"lib/single-file/processors/frame-tree/content/content-frame-tree.js"
@@ -52,7 +52,7 @@
 		"scripts": [
 			"lib/single-file/index.js",
 			"extension/index.js",
-			"extension/lib/browser-polyfill/chrome-browser-polyfill.js",
+			"extension/lib/single-file/browser-polyfill/chrome-browser-polyfill.js",
 			"lib/single-file/vendor/css-minifier.js",
 			"lib/single-file/vendor/css-tree.js",
 			"lib/single-file/vendor/css-media-query-parser.js",
@@ -72,11 +72,11 @@
 			"lib/single-file/single-file.js",
 			"common/index.js",
 			"common/ui/content/content-infobar.js",
-			"extension/lib/core/bg/scripts.js",
-			"extension/lib/fetch/content/content-fetch.js",
-			"extension/lib/fetch/bg/fetch.js",
-			"extension/lib/frame-tree/bg/frame-tree.js",
-			"extension/lib/lazy/bg/lazy-timeout.js",
+			"extension/lib/single-file/core/bg/scripts.js",
+			"extension/lib/single-file/fetch/content/content-fetch.js",
+			"extension/lib/single-file/fetch/bg/fetch.js",
+			"extension/lib/single-file/frame-tree/bg/frame-tree.js",
+			"extension/lib/single-file/lazy/bg/lazy-timeout.js",
 			"extension/core/bg/config.js",
 			"extension/core/bg/tabs-data.js",
 			"extension/core/bg/business.js",