From b0c942f65a7f4447fec1400fd1b390dda65c4598 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 13 Sep 2019 17:07:18 -0700
Subject: [PATCH] fix(cli): mimic cordova's js-module logic when no name
 attribute

Otherwise `<js-module>`'s with no name are installed as
`pluginId`.`undefined`, which can mess with `deviceready`.

Copies the logic directly from https://github.com/apache/cordova-common/blob/d73d7fab70d2a5110bae174e48065065373732c9/src/PlatformJson.js#L247
and https://github.com/apache/cordova-ios/blob/4562ef5608d57d471dc11212c9f432762886a32d/bin/templates/scripts/cordova/lib/plugman/pluginHandlers.js#L194

Closes https://github.com/ionic-team/capacitor/issues/1958.
---
 cli/src/cordova.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/cli/src/cordova.ts b/cli/src/cordova.ts
index e2dcd60f78..202c5f80ea 100644
--- a/cli/src/cordova.ts
+++ b/cli/src/cordova.ts
@@ -1,7 +1,7 @@
 import { Config } from './config';
 import { getJSModules, getPlatformElement, getPluginPlatform, getPlugins, getPluginType, printPlugins, Plugin, PluginType } from './plugin';
 import { copySync, ensureDirSync, readFileAsync, removeSync, writeFileAsync } from './util/fs';
-import { join, resolve } from 'path';
+import { basename, extname, join, resolve } from 'path';
 import { buildXmlElement, installDeps, log, logError, logFatal, logInfo, logWarn, readXML, resolveNode, writeXML } from './common';
 import { copy as fsCopy, existsSync } from 'fs-extra';
 import { getAndroidPlugins } from './android/common';
@@ -51,11 +51,12 @@ export function generateCordovaPluginsJSFile(config: Config, plugins: Plugin[],
       if (jsModule.runs) {
         runsModule = ',\n        "runs": true';
       }
-      const pluginModule = { 
+      const pluginModule = {
         clobber: clobberKey,
         merge: mergeKey,
+        // mimics Cordova's module name logic if the name attr is missing
         pluginContent: `{
-          "id": "${pluginId}.${jsModule.$.name}",
+          "id": "${pluginId + '.' + (jsModule.$.name || jsModule.$.src.match(/([^\/]+)\.js/)[1])}",
           "file": "plugins/${pluginId}/${jsModule.$.src}",
           "pluginId": "${pluginId}"${clobbersModule}${mergesModule}${runsModule}
         }`
@@ -107,7 +108,9 @@ export async function copyPluginsJS(config: Config, cordovaPlugins: Plugin[], pl
       copySync(join(p.rootPath, jsModule.$.src), filePath);
       let data = await readFileAsync(filePath, 'utf8');
       data = data.trim();
-      data = `cordova.define("${pluginId}.${jsModule.$.name}", function(require, exports, module) { \n${data}\n});`;
+      // mimics Cordova's module name logic if the name attr is missing
+      const name = pluginId + '.' + (jsModule.$.name || basename(jsModule.$.src, extname(jsModule.$.src)));
+      data = `cordova.define("${name}", function(require, exports, module) { \n${data}\n});`;
       data = data.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script\s*>/gi, "")
       await writeFileAsync(filePath, data, 'utf8');
     }));
@@ -207,7 +210,7 @@ export async function copyCordovaJSFiles(config: Config, platform: string) {
   let plugins: Plugin[] = [];
   if (platform === config.ios.name) {
     plugins = getIOSPlugins(allPlugins);
-  } else if (platform === config.android.name) { 
+  } else if (platform === config.android.name) {
     plugins = getAndroidPlugins(allPlugins);
   }
   const cordovaPlugins = plugins