Merge branch 'main' into camera1

ionic-team · Nov 16, 2020 · 1c8c122 · 1c8c122
2 parents f651adc + 8f9cae2
commit 1c8c122
Show file tree

Hide file tree

Showing 34 changed files with 130 additions and 240 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -54,6 +54,21 @@ This script is for setting the version (or version range) of Capacitor packages
 
 This script is for switching between Capacitor packages from npm and Capacitor packages installed locally. It will also run `lerna bootstrap` for you.
 
+> If you get npm errors, you can try installing from scratch:
+>
+> 1. Reset the changes in `package.json` files.
+> 1. Clear out all `node_modules`.
+>
+>     ```shell
+>     npx lerna exec 'rm -fr package-lock.json && rm -fr node_modules'
+>     rm -fr node_modules
+>     ```
+> 1. Install with local dependencies:
+>
+>     ```
+>     npm run toggle-local
+>     ```
+
 #### `npm run apply-patches "<package>"`
 
 This script is for copying git changes from one plugin to all plugins.

diff --git a/action-sheet/android/src/main/res/layout/bridge_layout_main.xml b/action-sheet/android/src/main/res/layout/bridge_layout_main.xml
diff --git a/action-sheet/package.json b/action-sheet/package.json
@@ -5,6 +5,13 @@
   "main": "dist/plugin.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
+  "files": [
+    "android/src/main/",
+    "android/build.gradle",
+    "dist/",
+    "ios/Plugin/",
+    "CapacitorActionSheet.podspec"
+  ],
   "author": "Ionic <hi@ionicframework.com>",
   "license": "MIT",
   "repository": {

diff --git a/app-launcher/android/src/main/res/layout/bridge_layout_main.xml b/app-launcher/android/src/main/res/layout/bridge_layout_main.xml
diff --git a/app-launcher/package.json b/app-launcher/package.json
@@ -5,6 +5,13 @@
   "main": "dist/plugin.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
+  "files": [
+    "android/src/main/",
+    "android/build.gradle",
+    "dist/",
+    "ios/Plugin",
+    "CapacitorAppLauncher.podspec"
+  ],
   "author": "Ionic <hi@ionicframework.com>",
   "license": "MIT",
   "repository": {

diff --git a/app/android/src/main/res/layout/bridge_layout_main.xml b/app/android/src/main/res/layout/bridge_layout_main.xml
diff --git a/app/package.json b/app/package.json
@@ -5,6 +5,13 @@
   "main": "dist/plugin.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
+  "files": [
+    "android/src/main/",
+    "android/build.gradle",
+    "dist/",
+    "ios/Plugin/",
+    "CapacitorApp.podspec"
+  ],
   "author": "Ionic <hi@ionicframework.com>",
   "license": "MIT",
   "repository": {

diff --git a/browser/android/src/main/res/layout/bridge_layout_main.xml b/browser/android/src/main/res/layout/bridge_layout_main.xml
diff --git a/browser/package.json b/browser/package.json
@@ -5,6 +5,13 @@
   "main": "dist/plugin.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
+  "files": [
+    "android/src/main/",
+    "android/build.gradle",
+    "dist/",
+    "ios/Plugin/",
+    "CapacitorBrowser.podspec"
+  ],
   "author": "Ionic <hi@ionicframework.com>",
   "license": "MIT",
   "repository": {

diff --git a/clipboard/android/src/main/res/layout/bridge_layout_main.xml b/clipboard/android/src/main/res/layout/bridge_layout_main.xml
diff --git a/clipboard/package.json b/clipboard/package.json
@@ -5,6 +5,13 @@
   "main": "dist/plugin.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
+  "files": [
+    "android/src/main/",
+    "android/build.gradle",
+    "dist/",
+    "ios/Plugin/",
+    "CapacitorClipboard.podspec"
+  ],
   "author": "Ionic <hi@ionicframework.com>",
   "license": "MIT",
   "repository": {

diff --git a/device/android/src/main/res/layout/bridge_layout_main.xml b/device/android/src/main/res/layout/bridge_layout_main.xml
diff --git a/device/package.json b/device/package.json
@@ -5,6 +5,13 @@
   "main": "dist/plugin.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
+  "files": [
+    "android/src/main/",
+    "android/build.gradle",
+    "dist/",
+    "ios/Plugin/",
+    "CapacitorDevice.podspec"
+  ],
   "author": "Ionic <hi@ionicframework.com>",
   "license": "MIT",
   "repository": {

diff --git a/dialog/android/src/main/res/layout/bridge_layout_main.xml b/dialog/android/src/main/res/layout/bridge_layout_main.xml
diff --git a/dialog/package.json b/dialog/package.json
@@ -5,6 +5,13 @@
   "main": "dist/plugin.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
+  "files": [
+    "android/src/main/",
+    "android/build.gradle",
+    "dist/",
+    "ios/Plugin/",
+    "CapacitorDialog.podspec"
+  ],
   "author": "Ionic <hi@ionicframework.com>",
   "license": "MIT",
   "repository": {

diff --git a/haptics/android/src/main/res/layout/bridge_layout_main.xml b/haptics/android/src/main/res/layout/bridge_layout_main.xml
diff --git a/haptics/package.json b/haptics/package.json
@@ -5,6 +5,13 @@
   "main": "dist/plugin.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
+  "files": [
+    "android/src/main/",
+    "android/build.gradle",
+    "dist/",
+    "ios/Plugin/",
+    "CapacitorHaptics.podspec"
+  ],
   "author": "Ionic <hi@ionicframework.com>",
   "license": "MIT",
   "repository": {

diff --git a/keyboard/android/src/main/res/layout/bridge_layout_main.xml b/keyboard/android/src/main/res/layout/bridge_layout_main.xml
diff --git a/keyboard/package.json b/keyboard/package.json
@@ -5,6 +5,13 @@
   "main": "dist/plugin.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
+  "files": [
+    "android/src/main/",
+    "android/build.gradle",
+    "dist/",
+    "ios/Plugin/",
+    "CapacitorKeyboard.podspec"
+  ],
   "author": "Ionic <hi@ionicframework.com>",
   "license": "MIT",
   "repository": {

diff --git a/motion/package.json b/motion/package.json
@@ -5,6 +5,9 @@
   "main": "dist/plugin.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
+  "files": [
+    "dist/"
+  ],
   "author": "Ionic <hi@ionicframework.com>",
   "license": "MIT",
   "repository": {

diff --git a/network/android/src/main/res/layout/bridge_layout_main.xml b/network/android/src/main/res/layout/bridge_layout_main.xml
diff --git a/network/package.json b/network/package.json
@@ -5,6 +5,13 @@
   "main": "dist/plugin.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
+  "files": [
+    "android/src/main/",
+    "android/build.gradle",
+    "dist/",
+    "ios/Plugin/",
+    "CapacitorNetwork.podspec"
+  ],
   "author": "Ionic <hi@ionicframework.com>",
   "license": "MIT",
   "repository": {

diff --git a/screen-reader/android/src/main/res/layout/bridge_layout_main.xml b/screen-reader/android/src/main/res/layout/bridge_layout_main.xml
diff --git a/screen-reader/package.json b/screen-reader/package.json
@@ -5,6 +5,13 @@
   "main": "dist/plugin.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
+  "files": [
+    "android/src/main/",
+    "android/build.gradle",
+    "dist/",
+    "ios/Plugin/",
+    "CapacitorScreenReader.podspec"
+  ],
   "author": "Ionic <hi@ionicframework.com>",
   "license": "MIT",
   "repository": {

diff --git a/share/android/src/main/res/layout/bridge_layout_main.xml b/share/android/src/main/res/layout/bridge_layout_main.xml
diff --git a/share/package.json b/share/package.json
@@ -5,6 +5,13 @@
   "main": "dist/plugin.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
+  "files": [
+    "android/src/main/",
+    "android/build.gradle",
+    "dist/",
+    "ios/Plugin/",
+    "CapacitorShare.podspec"
+  ],
   "author": "Ionic <hi@ionicframework.com>",
   "license": "MIT",
   "repository": {