Merge pull request #44 from capacitor-community/dev-electron

Dev electron
capacitor-community · Sep 29, 2020 · 6ac509b · 6ac509b
2 parents faea058 + c1fb19c
commit 6ac509b
Show file tree

Hide file tree

Showing 49 changed files with 1,196 additions and 6,838 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 2.4.2-1 (2020-09-29)
+
+### Chores
+
+- Capacitor: update 2.4.2
+
+### ### Added Features
+
+- The electron plugin is now compatible with @capacitor-community/electron
+
 ## 2.4.1-1 (2020-09-22)
 
 ### Bug Fixes

diff --git a/README.md b/README.md
@@ -28,128 +28,85 @@
 ```bash
 npm install @capacitor-community/sqlite
 npx cap sync
+npx cap add ios
+npx cap add android
+npx cap add @capacitor-community/electron
 ```
 
+### iOS
+
 - On iOS, no further steps are needed.
 
+### Android
+
 - On Android, register the plugin in your main activity:
 
-  ```java
-  import com.getcapacitor.community.database.sqlite.CapacitorSQLite;
+```java
+import com.getcapacitor.community.database.sqlite.CapacitorSQLite;
 
-  public class MainActivity extends BridgeActivity {
+public class MainActivity extends BridgeActivity {
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-      super.onCreate(savedInstanceState);
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
 
-      // Initializes the Bridge
-      this.init(
-          savedInstanceState,
-          new ArrayList<Class<? extends Plugin>>() {
+    // Initializes the Bridge
+    this.init(
+        savedInstanceState,
+        new ArrayList<Class<? extends Plugin>>() {
 
-            {
-              // Additional plugins you've installed go here
-              // Ex: add(TotallyAwesomePlugin.class);
-              add(CapacitorSQLite.class);
-            }
+          {
+            // Additional plugins you've installed go here
+            // Ex: add(TotallyAwesomePlugin.class);
+            add(CapacitorSQLite.class);
           }
-        );
-    }
+        }
+      );
   }
-  ```
+}
+
+```
+
+### Electron
 
 - On Electron, go to the Electron folder of YOUR_APPLICATION
 
-  ```bash
-  npm install --save sqlite3
-  npm install --save-dev @types/sqlite3
-  npm install --save-dev electron-rebuild
-  ```
-
-  Modify the Electron package.json file by adding a script "postinstall"
-
-  ```json
-    "scripts": {
-      "electron:start": "electron ./",
-      "postinstall": "electron-rebuild -f -w sqlite3"
-    },
-  ```
-
-  Execute the postinstall script
-
-  ```bash
-  npm run postinstall
-  ```
-
-  Go back in the main folder of your application
-  Add a script in the index.html file of your application in the body tag
-
-  - case databases under `YourApplication/Electron/`
-
-  ```html
-  <body>
-    <app-root></app-root>
-    <script>
-      try {
-        if (
-          process &&
-          typeof process.versions.electron === 'string' &&
-          process.versions.hasOwnProperty('electron')
-        ) {
-          const sqlite3 = require('sqlite3');
-          const fs = require('fs');
-          const path = require('path');
-          window.sqlite3 = sqlite3;
-          window.fs = fs;
-          window.path = path;
-        }
-      } catch {
-        console.log("process doesn't exists");
-      }
-    </script>
-  </body>
-  ```
-
-  - case databases under `User/Databases/APP_NAME/`
-
-  ```html
-  <body>
-    <app-root></app-root>
-    <script>
-      try {
-        if (
-          process &&
-          typeof process.versions.electron === 'string' &&
-          process.versions.hasOwnProperty('electron')
-        ) {
-          const sqlite3 = require('sqlite3');
-          const fs = require('fs');
-          const path = require('path');
-          const homeDir = require('os').homedir();
-          window.sqlite3 = sqlite3;
-          window.fs = fs;
-          window.path = path;
-          window.appName = 'YOUR_APP_NAME';
-          window.homeDir = homeDir;
-        }
-      } catch {
-        console.log("process doesn't exists");
-      }
-    </script>
-  </body>
-  ```
-
-  Then build YOUR_APPLICATION
-
-  ```
-  npm run build
-  npx cap copy
-  npx cap copy web
-  npx cap open android
-  npx cap open ios
-  npx cap open electron
-  ```
+```bash
+npm install --save sqlite3
+npm install --save-dev @types/sqlite3
+npm install --save-dev electron-rebuild
+```
+
+Modify the Electron package.json file by adding a script "postinstall"
+
+```json
+  "scripts": {
+    "electron:start": "electron ./",
+    "postinstall": "electron-rebuild -f -w sqlite3"
+  },
+```
+
+Execute the postinstall script
+
+```bash
+npm run postinstall
+```
+
+#### Electron databases location
+
+- There are by default under `User/Databases/APP_NAME/`
+
+Then build YOUR_APPLICATION
+
+```
+npm run build
+npx cap copy
+npx cap copy @capacitor-community/electron
+npx cap copy web
+npx cap open android
+npx cap open ios
+npx cap open @capacitor-community/electron
+```
 
 ## Configuration
 

diff --git a/...ated/source/buildConfig/debug/com/getcapacitor/community/database/sqlite/BuildConfig.java b/...ated/source/buildConfig/debug/com/getcapacitor/community/database/sqlite/BuildConfig.java
diff --git a/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml b/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml
diff --git a/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json b/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json
diff --git a/android/build/intermediates/aar_main_jar/debug/classes.jar b/android/build/intermediates/aar_main_jar/debug/classes.jar
diff --git a/android/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/android/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
diff --git a/android/build/intermediates/annotations_typedef_file/debug/typedefs.txt b/android/build/intermediates/annotations_typedef_file/debug/typedefs.txt
diff --git a/android/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar b/android/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar