Clean up unusued files

2025-10-31 00:07:48 +02:00 · 2020-02-23 21:04:14 +00:00
parent 91ef985353
commit 3f267f3774
15 changed files with 43 additions and 7263 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -15,13 +15,13 @@ CliClient/tests/logs
 CliClient/tests/support
 CliClient/tests/sync
 CliClient/tests/tmp
-Clipper/joplin-webclipper/content_scripts/JSDOMParser.js
-Clipper/joplin-webclipper/content_scripts/Readability-readerable.js
-Clipper/joplin-webclipper/content_scripts/Readability.js
-Clipper/joplin-webclipper/dist
-Clipper/joplin-webclipper/icons
-Clipper/joplin-webclipper/popup/build
-Clipper/joplin-webclipper/popup/node_modules
+Clipper/content_scripts/JSDOMParser.js
+Clipper/content_scripts/Readability-readerable.js
+Clipper/content_scripts/Readability.js
+Clipper/dist
+Clipper/icons
+Clipper/popup/build
+Clipper/popup/node_modules
 docs/
 ElectronClient/dist
 ElectronClient/lib
--- a/Clipper/content_scripts/vendor.js
+++ b/Clipper/content_scripts/vendor.js
@@ -1,5 +0,0 @@
-/* eslint-disable no-unused-vars, @typescript-eslint/no-unused-vars */
-
-// Add here all the external scripts that the content script might need
-// and run browserify on it to create vendor.bundle.js
-const Readability = require('readability-node').Readability;
--- a/Clipper/main.js
+++ b/Clipper/main.js
--- a/Clipper/package.json
+++ b/Clipper/package.json
@@ -1,14 +1,8 @@
 {
  "name": "joplin-webclipper",
  "version": "1.0.0",
-  "description": "",
+  "description": "Joplin Web Clipper",
  "main": "main.js",
-  "author": "",
-  "license": "MIT",
-  "dependencies": {
-    "readability-node": "^0.1.0"
-  },
-  "devDependencies": {
-    "fs-extra": "^6.0.1"
-  }
+  "author": "Laurent Cozic",
+  "license": "MIT"
 }
--- a/Clipper/popup/index.html
+++ b/Clipper/popup/index.html
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-
-<!-- NOTE: I think this is not used at all -->
-
-<html>
-  <head>
-    <meta charset="utf-8">
-    <link rel="stylesheet" href="style.css"/>
-  </head>
-
-<body>
-  <div id="popup-content">
-    <div class="button" data-action="getCompletePageHtml">Complete HTMLxx</div>
-    <div class="button beast">Turtle</div>
-    <div class="button beast">Snake</div>
-    <div class="button reset">Reset</div>
-  </div>
-  <div id="error-content" class="hidden">
-    <p>Can't beastify this web page.</p><p>Try a different page.</p>
-  </div>
-  <script src="index.js"></script>
-</body>
-
-</html>
--- a/Clipper/popup/package.json
+++ b/Clipper/popup/package.json
@@ -12,7 +12,7 @@
  },
  "scripts": {
    "start": "react-scripts start",
-    "build": "react-scripts build",
+    "build": "SKIP_PREFLIGHT_CHECK=true react-scripts build",
    "test": "react-scripts test --env=jsdom",
    "eject": "react-scripts eject",
    "watch": "cra-build-watch",
--- a/Clipper/popup/scripts/postinstall.js
+++ b/Clipper/popup/scripts/postinstall.js
@@ -1,3 +1,11 @@
 const fs = require('fs-extra');

-fs.copySync(`${__dirname}/../../../../ReactNativeClient/lib/randomClipperPort.js`, `${__dirname}/../src/randomClipperPort.js`);
+const sourcePath = `${__dirname}../../../ReactNativeClient/lib/randomClipperPort.js`;
+
+// Mozilla insists on building the clipper from a tarball, not from the repository
+// so we add this check and only copy the file if it's present. Normally it rarely
+// changes anyway and it is committed to the repo.
+
+if (fs.pathExistsSync(sourcePath)) {
+	fs.copySync(sourcePath, `${__dirname}/../src/randomClipperPort.js`);
+}
--- a/Clipper/popup/src/App.css
+++ b/Clipper/popup/src/App.css
@@ -1,3 +1,9 @@
+body {
+	margin: 0;
+	padding: 0;
+	font-family: sans-serif;
+}
+
 .App {
 	width: 400px;
 	
--- a/Clipper/popup/src/index.css
+++ b/Clipper/popup/src/index.css
@@ -1,5 +0,0 @@
-body {
-  margin: 0;
-  padding: 0;
-  font-family: sans-serif;
-}
--- a/Clipper/popup/src/index.js
+++ b/Clipper/popup/src/index.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import './index.css';
 import App from './App';

 const { Provider } = require('react-redux');
--- a/Clipper/popup/style.css
+++ b/Clipper/popup/style.css
@@ -1,31 +0,0 @@
-html, body {
-  width: 100px;
-}
-
-.hidden {
-  display: none;
-}
-
-.button {
-  margin: 3% auto;
-  padding: 4px;
-  text-align: center;
-  font-size: 1.5em;
-  cursor: pointer;
-}
-
-.beast:hover {
-  background-color: #CFF2F2;
-}
-
-.beast {
-  background-color: #E5F2F2;
-}
-
-.reset {
-  background-color: #FBFBC9;
-}
-
-.reset:hover {
-  background-color: #EAEA9D;
-}
--- a/Clipper/popup/yarn.lock
+++ b/Clipper/popup/yarn.lock
--- a/Tools/release-clipper.js
+++ b/Tools/release-clipper.js
@@ -1,8 +1,8 @@
 const fs = require('fs-extra');
 const { execCommand } = require('./tool-utils.js');

-const clipperDir   = `${__dirname}/../Clipper/joplin-webclipper`;
-const tmpSourceDir = `${__dirname}/../Clipper/joplin-webclipper-source`;
+const clipperDir   = `${__dirname}/../Clipper`;
+const tmpSourceDir = `${__dirname}/../Clipper-source`;

 async function copyDir(baseSourceDir, sourcePath, baseDestDir) {
 	await fs.mkdirp(`${baseDestDir}/${sourcePath}`);
--- a/joplin.code-workspace
+++ b/joplin.code-workspace
@@ -57,8 +57,8 @@
 			"CliClient/tests/sync/": true,
 			"CliClient/tests/tmp/": true,
 			"CliClient/tests/logs/": true,
-			"Clipper/joplin-webclipper/dist/": true,
-			"Clipper/joplin-webclipper/popup/build/": true,
+			"Clipper/dist/": true,
+			"Clipper/popup/build/": true,
 			"ElectronClient/dist/": true,
 			"ElectronClient/fonts/": true,
 			"ElectronClient/gui/note-viewer/highlight/styles/": true,
--- a/joplin.sublime-project
+++ b/joplin.sublime-project
@@ -27,7 +27,14 @@
 				"*.bundle.js",
 				"yarn.lock",
 				"*.icns",
-				"*.base64"
+				"*.base64",
+				"Podfile.lock",
+				"ReactNativeClient/PluginAssetsLoader.js",
+				"ElectronClient/gui/NoteText2.js",
+				"ElectronClient/gui/ResourceScreen.js",
+				"ElectronClient/gui/ShareNoteDialog.js",
+				"ElectronClient/gui/TinyMCE.js",
+				"ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js"
 			],
 			"folder_exclude_patterns":
 			[
@@ -56,16 +63,18 @@
 				"ReactNativeClient/android/build",
 				"ReactNativeClient/android/local.properties",
 				"ReactNativeClient/node_modules",
+				"ReactNativeClient/pluginAssets",
 				"ElectronClient/gui/note-viewer/highlight/styles",
 				"tests/logs",
 				"ReactNativeClient/ios/build",
 				"ElectronClient/dist",
 				"_releases",
 				"ReactNativeClient/lib/csstojs",
-				"Clipper/joplin-webclipper/popup/build",
-				"Clipper/joplin-webclipper/dist",
+				"Clipper/popup/build",
+				"Clipper/dist",
 				"ReactNativeClient/lib/rnInjectedJs",
-				"ReactNativeClient/ios/Pods"
+				"ReactNativeClient/ios/Pods",
+				"CliClient/locales-build"
 			],
 			"path": "."
 		}