refactor(core): merge native-bridge.js into core runtime (ionic-team#3748)

Author: adamdbradley

.eslintignore

@@ -1,3 +1,4 @@
 build
 cli/assets
 dist
+types

.gitignore

@@ -1,5 +1,6 @@
 .idea/
-dist
+dist/
+types/
 .sourcemaps
 xcuserdata/
 node_modules/

.prettierignore

@@ -1,3 +1,4 @@
 build
+core/types
 cli/assets
 dist

android/capacitor/src/main/java/com/getcapacitor/Bridge.java

@@ -666,15 +666,14 @@ protected void savePermissionCall(PluginCall call) {
     private JSInjector getJSInjector() {
         try {
             String globalJS = JSExport.getGlobalJS(context, isDevMode());
-            String coreJS = JSExport.getCoreJS(context);
             String pluginJS = JSExport.getPluginJS(plugins.values());
             String cordovaJS = JSExport.getCordovaJS(context);
             String cordovaPluginsJS = JSExport.getCordovaPluginJS(context);
             String cordovaPluginsFileJS = JSExport.getCordovaPluginsFileJS(context);
             String localUrlJS = "window.WEBVIEW_SERVER_URL = '" + localUrl + "';";
 
-            return new JSInjector(globalJS, coreJS, pluginJS, cordovaJS, cordovaPluginsJS, cordovaPluginsFileJS, localUrlJS);
-        } catch (JSExportException ex) {
+            return new JSInjector(globalJS, pluginJS, cordovaJS, cordovaPluginsJS, cordovaPluginsFileJS, localUrlJS);
+        } catch (Exception ex) {
             Logger.error("Unable to export Capacitor JS. App will not function!", ex);
         }
         return null;

android/capacitor/src/main/java/com/getcapacitor/JSExport.java

@@ -15,15 +15,7 @@ public class JSExport {
     private static String CALLBACK_PARAM = "_callback";
 
     public static String getGlobalJS(Context context, boolean isDebug) {
-        return "window.Capacitor = { DEBUG: " + isDebug + " };";
-    }
-
-    public static String getCoreJS(Context context) throws JSExportException {
-        try {
-            return getJS(context, "public/native-bridge.js");
-        } catch (IOException ex) {
-            throw new JSExportException("Unable to load native-bridge.js. Capacitor will not function!", ex);
-        }
+        return "window.Capacitor = { DEBUG: " + isDebug + ", Plugins: {} };";
     }
 
     private static String getJS(Context context, String fileName) throws IOException {
@@ -70,10 +62,11 @@ public static String getPluginJS(Collection<PluginHandle> plugins) {
         for (PluginHandle plugin : plugins) {
             lines.add(
                 "(function(w) {\n" +
-                "var a = w.Capacitor; var p = a.Plugins;\n" +
-                "var t = p['" +
+                "var a = (w.Capacitor = w.Capacitor || {});\n" +
+                "var p = (a.Plugins = a.Plugins || {});\n" +
+                "var t = (p['" +
                 plugin.getId() +
-                "'] = {};\n" +
+                "'] = {});\n" +
                 "t.addListener = function(eventName, callback) {\n" +
                 "  return w.Capacitor.addListener('" +
                 plugin.getId() +

android/capacitor/src/main/java/com/getcapacitor/JSInjector.java

@@ -14,28 +14,25 @@
 class JSInjector {
 
     private String globalJS;
-    private String coreJS;
     private String pluginJS;
     private String cordovaJS;
     private String cordovaPluginsJS;
     private String cordovaPluginsFileJS;
     private String localUrlJS;
 
-    public JSInjector(String globalJS, String coreJS, String pluginJS) {
-        this(globalJS, coreJS, pluginJS, ""/* cordovaJS */, ""/* cordovaPluginsJS */, ""/* cordovaPluginsFileJS */, ""/* localUrlJS */);
+    public JSInjector(String globalJS, String pluginJS) {
+        this(globalJS, pluginJS, ""/* cordovaJS */, ""/* cordovaPluginsJS */, ""/* cordovaPluginsFileJS */, ""/* localUrlJS */);
     }
 
     public JSInjector(
         String globalJS,
-        String coreJS,
         String pluginJS,
         String cordovaJS,
         String cordovaPluginsJS,
         String cordovaPluginsFileJS,
         String localUrlJS
     ) {
         this.globalJS = globalJS;
-        this.coreJS = coreJS;
         this.pluginJS = pluginJS;
         this.cordovaJS = cordovaJS;
         this.cordovaPluginsJS = cordovaPluginsJS;
@@ -52,8 +49,6 @@ public String getScriptString() {
         return (
             globalJS +
             "\n\n" +
-            coreJS +
-            "\n\n" +
             pluginJS +
             "\n\n" +
             cordovaJS +

cli/src/tasks/copy.ts

@@ -16,8 +16,7 @@ import {
   writeCordovaAndroidManifest,
 } from '../cordova';
 import type { Config } from '../definitions';
-import { logger, logFatal } from '../log';
-import { resolveNode } from '../util/node';
+import { logger } from '../log';
 import { allSerial } from '../util/promise';
 import { copyWeb } from '../web/copy';
 
@@ -63,13 +62,11 @@ export async function copy(
 
     if (platformName === config.ios.name) {
       await copyWebDir(config, config.ios.webDirAbs);
-      await copyNativeBridge(config.app.rootDir, config.ios.webDirAbs);
       await copyCapacitorConfig(config, config.ios.nativeTargetDirAbs);
       const cordovaPlugins = await getCordovaPlugins(config, platformName);
       await handleCordovaPluginsJS(cordovaPlugins, config, platformName);
     } else if (platformName === config.android.name) {
       await copyWebDir(config, config.android.webDirAbs);
-      await copyNativeBridge(config.app.rootDir, config.android.webDirAbs);
       await copyCapacitorConfig(config, config.android.assetsDirAbs);
       const cordovaPlugins = await getCordovaPlugins(config, platformName);
       await handleCordovaPluginsJS(cordovaPlugins, config, platformName);
@@ -82,28 +79,6 @@ export async function copy(
   });
 }
 
-async function copyNativeBridge(rootDir: string, nativeAbsDir: string) {
-  const nativeRelDir = relative(rootDir, nativeAbsDir);
-  const bridgePath = resolveNode(
-    rootDir,
-    '@capacitor/core',
-    'native-bridge.js',
-  );
-  if (!bridgePath) {
-    logFatal(
-      `Unable to find node_modules/@capacitor/core/native-bridge.js.\n` +
-        `Are you sure ${c.strong('@capacitor/core')} is installed?`,
-    );
-  }
-
-  await runTask(
-    `Copying ${c.strong('native-bridge.js')} to ${nativeRelDir}`,
-    async () => {
-      return fsCopy(bridgePath!, join(nativeAbsDir, 'native-bridge.js'));
-    },
-  );
-}
-
 async function copyCapacitorConfig(config: Config, nativeAbsDir: string) {
   const nativeRelDir = relative(config.app.rootDir, nativeAbsDir);
   const nativeConfigFile = 'capacitor.config.json';

cli/tsconfig.json

@@ -12,7 +12,5 @@
     "strict": true,
     "target": "es2019"
   },
-  "files": [
-    "src/index.ts"
-  ]
+  "files": ["src/index.ts"]
 }