refactor folders structure

gildas-lormeau · Feb 17, 2022 · 41ca36a · 41ca36a
1 parent c7cb588
commit 41ca36a
Show file tree

Hide file tree

Showing 165 changed files with 249 additions and 305 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -15,7 +15,7 @@ module.exports = {
 		"sourceType": "module"
 	},
 	"ignorePatterns": [
-		"dist/"
+		"/lib/"
 	],
 	"rules": {
 		"indent": [

diff --git a/build-extension.sh b/build-extension.sh
@@ -1,40 +1,40 @@
 #!/bin/sh
 npx rollup -c rollup.config.js
 
-zip -r singlefile-extension-source.zip manifest.json package.json _locales extension common lib rollup*.js .eslintrc.js build-extension.sh
+zip -r singlefile-extension-source.zip manifest.json package.json _locales src rollup*.js .eslintrc.js build-extension.sh
 
 rm singlefile-extension-firefox.zip singlefile-extension-chromium.zip singlefile-extension-edge.zip
 cp manifest.json manifest.copy.json
-cp extension/core/bg/downloads.js downloads.copy.js
-sed -i 's/207618107333-3pj2pmelhnl4sf3rpctghs9cean3q8nj/207618107333-7tjs1im1pighftpoepea2kvkubnfjj44/g' extension/core/bg/downloads.js
+cp src/extension/core/bg/downloads.js downloads.copy.js
+sed -i 's/207618107333-3pj2pmelhnl4sf3rpctghs9cean3q8nj/207618107333-7tjs1im1pighftpoepea2kvkubnfjj44/g' src/extension/core/bg/downloads.js
 
-cp extension/core/bg/config.js config.copy.js
-cp extension/core/bg/companion.js companion.copy.js
+cp src/extension/core/bg/config.js config.copy.js
+cp src/extension/core/bg/companion.js companion.copy.js
 jq "del(.options_page,.background.persistent,.optional_permissions[0],.permissions[3],.oauth2)" manifest.copy.json > manifest.json
 sed -i 's/207618107333-3pj2pmelhnl4sf3rpctghs9cean3q8nj/207618107333-7tjs1im1pighftpoepea2kvkubnfjj44/g' manifest.json
-sed -i 's/forceWebAuthFlow: false/forceWebAuthFlow: true/g' extension/core/bg/config.js
-sed -i 's/enabled: true/enabled: false/g' extension/core/bg/companion.js
-zip -r singlefile-extension-firefox.zip manifest.json dist _locales extension
-mv config.copy.js extension/core/bg/config.js
-mv companion.copy.js extension/core/bg/companion.js
+sed -i 's/forceWebAuthFlow: false/forceWebAuthFlow: true/g' src/extension/core/bg/config.js
+sed -i 's/enabled: true/enabled: false/g' src/extension/core/bg/companion.js
+zip -r singlefile-extension-firefox.zip manifest.json lib _locales src/extension
+mv config.copy.js src/extension/core/bg/config.js
+mv companion.copy.js src/extension/core/bg/companion.js
 
 jq "del(.browser_specific_settings,.permissions[0],.permissions[1],.options_ui.browser_style)" manifest.copy.json > manifest.json
 sed -i 's/207618107333-3pj2pmelhnl4sf3rpctghs9cean3q8nj/207618107333-7tjs1im1pighftpoepea2kvkubnfjj44/g' manifest.json
-zip -r singlefile-extension-chromium.zip manifest.json dist _locales extension
+zip -r singlefile-extension-chromium.zip manifest.json lib _locales src/extension
 
-cp extension/core/bg/config.js config.copy.js
+cp src/extension/core/bg/config.js config.copy.js
 jq "del(.browser_specific_settings,.permissions[0],.permissions[1],.options_ui.browser_style)" manifest.copy.json > manifest.json
 sed -i 's/207618107333-3pj2pmelhnl4sf3rpctghs9cean3q8nj/207618107333-7tjs1im1pighftpoepea2kvkubnfjj44/g' manifest.json
-sed -i 's/forceWebAuthFlow: false/forceWebAuthFlow: true/g' extension/core/bg/config.js
+sed -i 's/forceWebAuthFlow: false/forceWebAuthFlow: true/g' src/extension/core/bg/config.js
 mkdir _locales.copy
 cp -R _locales/* _locales.copy
 rm -rf _locales/*
 cp -R _locales.copy/en _locales
-zip -r singlefile-extension-edge.zip manifest.json dist _locales extension
+zip -r singlefile-extension-edge.zip manifest.json lib _locales src/extension
 rm -rf _locales/*
 mv _locales.copy/* _locales
 rmdir _locales.copy
-mv config.copy.js extension/core/bg/config.js
+mv config.copy.js src/extension/core/bg/config.js
 
 mv manifest.copy.json manifest.json
-mv downloads.copy.js extension/core/bg/downloads.js
+mv downloads.copy.js src/extension/core/bg/downloads.js
diff --git a/cli/back-ends/common/scripts.js b/cli/back-ends/common/scripts.js
@@ -26,18 +26,18 @@
 const fs = require("fs");
 
 const SCRIPTS = [
-	"dist/infobar.js"
+	"lib/infobar.js"
 ];
 
 const INDEX_SCRIPTS = [
-	"dist/single-file.js",
-	"dist/single-file-bootstrap.js"
+	"lib/single-file.js",
+	"lib/single-file-bootstrap.js"
 ];
 
 const WEB_SCRIPTS = [
-	"/dist/web/hooks/hooks-web.js",
-	"/dist/web/hooks/hooks-frames-web.js",
-	"/dist/web/infobar-web.js"
+	"/lib/web/hooks/hooks-web.js",
+	"/lib/web/hooks/hooks-frames-web.js",
+	"/lib/web/infobar-web.js"
 ];
 
 exports.get = async options => {

diff --git a/dist/extension-background.js b/dist/extension-background.js
diff --git a/dist/extension-core.js b/dist/extension-core.js
diff --git a/dist/infobar.js b/dist/infobar.js
diff --git a/dist/single-file-bootstrap.js b/dist/single-file-bootstrap.js
diff --git a/dist/single-file-frames.js b/dist/single-file-frames.js
diff --git a/dist/single-file.js b/dist/single-file.js
diff --git a/extension/core/bg/background.html b/extension/core/bg/background.html
diff --git a/extension/lib/woleet/woleet.js b/extension/lib/woleet/woleet.js
diff --git a/extension/ui/pages/editor.html b/extension/ui/pages/editor.html
diff --git a/dist/chrome-browser-polyfill.js → lib/chrome-browser-polyfill.js b/dist/chrome-browser-polyfill.js → lib/chrome-browser-polyfill.js
diff --git a/lib/extension-background.js b/lib/extension-background.js
diff --git a/dist/extension-bootstrap.js → lib/extension-bootstrap.js b/dist/extension-bootstrap.js → lib/extension-bootstrap.js
diff --git a/lib/extension-core.js b/lib/extension-core.js
diff --git a/dist/extension-frames.js → lib/extension-frames.js b/dist/extension-frames.js → lib/extension-frames.js
diff --git a/dist/extension.js → lib/extension.js b/dist/extension.js → lib/extension.js
diff --git a/lib/infobar.js b/lib/infobar.js
diff --git a/dist/single-file-background.js → lib/single-file-background.js b/dist/single-file-background.js → lib/single-file-background.js
diff --git a/lib/single-file-bootstrap.js b/lib/single-file-bootstrap.js
diff --git a/lib/single-file-frames.js b/lib/single-file-frames.js
diff --git a/lib/single-file.js b/lib/single-file.js
diff --git a/dist/web/editor/editor-helper-web.js → lib/web/editor/editor-helper-web.js b/dist/web/editor/editor-helper-web.js → lib/web/editor/editor-helper-web.js
diff --git a/dist/web/editor/editor-init-web.js → lib/web/editor/editor-init-web.js b/dist/web/editor/editor-init-web.js → lib/web/editor/editor-init-web.js
diff --git a/dist/web/editor/editor-web.js → lib/web/editor/editor-web.js b/dist/web/editor/editor-web.js → lib/web/editor/editor-web.js
@@ -1006,7 +1006,7 @@ table {
 			if (initScriptContentMatch && initScriptContentMatch[0]) {
 				initScriptContent = initScriptContentMatch[0];
 			}
-			content = content.replace(/<script data-template-shadow-root.*<\/script>/g, "<script data-template-shadow-root src=/dist/web/editor/editor-init-web.js></script>");
+			content = content.replace(/<script data-template-shadow-root.*<\/script>/g, "<script data-template-shadow-root src=/lib/web/editor/editor-init-web.js></script>");
 			const contentDocument = (new DOMParser()).parseFromString(content, "text/html");
 			if (detectSavedPage(contentDocument)) {
 				if (contentDocument.doctype) {

diff --git a/dist/web/hooks/hooks-frames-web.js → lib/web/hooks/hooks-frames-web.js b/dist/web/hooks/hooks-frames-web.js → lib/web/hooks/hooks-frames-web.js
diff --git a/dist/web/hooks/hooks-web.js → lib/web/hooks/hooks-web.js b/dist/web/hooks/hooks-web.js → lib/web/hooks/hooks-web.js
diff --git a/dist/web/infobar-web.js → lib/web/infobar-web.js b/dist/web/infobar-web.js → lib/web/infobar-web.js