From 1404ac640b2d7391973d8d8dae060fef7d468f74 Mon Sep 17 00:00:00 2001
From: Eemeli Aro <eemeli@gmail.com>
Date: Sat, 12 Sep 2020 13:11:33 +0300
Subject: [PATCH] fix: Drop cli dependency on common-tags; streamline UMD
 wrapper

---
 packages/cli/package.json            |  1 -
 packages/cli/src/print-umd.js        | 24 ++++++++----------------
 packages/plurals/cardinals.js        | 10 +++-------
 packages/plurals/ordinals.js         | 10 +++-------
 packages/plurals/pluralCategories.js | 10 +++-------
 packages/plurals/plurals.js          | 10 +++-------
 6 files changed, 20 insertions(+), 45 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 9facc36..66e59a9 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -29,7 +29,6 @@
   },
   "dependencies": {
     "cldr-core": "^36.0.0",
-    "common-tags": "^1.8.0",
     "make-plural-compiler": "file:../compiler",
     "safe-identifier": "^0.4.2",
     "yargs": "^15.3.1"
diff --git a/packages/cli/src/print-umd.js b/packages/cli/src/print-umd.js
index 728af3a..5ad6e10 100644
--- a/packages/cli/src/print-umd.js
+++ b/packages/cli/src/print-umd.js
@@ -1,19 +1,11 @@
-import { source } from 'common-tags'
-
 // UMD pattern adapted from https://github.com/umdjs/umd/blob/master/returnExports.js
 export default function umd(global, value) {
-  return source`
-    (function (root, ${global}) {
-      Object.defineProperty(${global}, '__esModule', { value: true });
-      if (typeof define === 'function' && define.amd) {
-        define(${global});
-      } else if (typeof exports === 'object') {
-        module.exports = ${global};
-      } else {
-        root.${global} = ${global};
-      }
-    }(this, {
-    ${value}
-    }));
-  `
+  return `(function (root, ${global}) {
+  Object.defineProperty(${global}, '__esModule', { value: true });
+  if (typeof define === 'function' && define.amd) define(${global});
+  else if (typeof exports === 'object') module.exports = ${global};
+  else root.${global} = ${global};
+}(this, {
+${value}
+}));`
 }
diff --git a/packages/plurals/cardinals.js b/packages/plurals/cardinals.js
index 271c809..17a4041 100644
--- a/packages/plurals/cardinals.js
+++ b/packages/plurals/cardinals.js
@@ -22,13 +22,9 @@ function f(n) {
 
 (function (root, plurals) {
   Object.defineProperty(plurals, '__esModule', { value: true });
-  if (typeof define === 'function' && define.amd) {
-    define(plurals);
-  } else if (typeof exports === 'object') {
-    module.exports = plurals;
-  } else {
-    root.plurals = plurals;
-  }
+  if (typeof define === 'function' && define.amd) define(plurals);
+  else if (typeof exports === 'object') module.exports = plurals;
+  else root.plurals = plurals;
 }(this, {
 _in: e,
 
diff --git a/packages/plurals/ordinals.js b/packages/plurals/ordinals.js
index 61c2c3c..fe3b2f7 100644
--- a/packages/plurals/ordinals.js
+++ b/packages/plurals/ordinals.js
@@ -7,13 +7,9 @@ function b(n) {
 
 (function (root, plurals) {
   Object.defineProperty(plurals, '__esModule', { value: true });
-  if (typeof define === 'function' && define.amd) {
-    define(plurals);
-  } else if (typeof exports === 'object') {
-    module.exports = plurals;
-  } else {
-    root.plurals = plurals;
-  }
+  if (typeof define === 'function' && define.amd) define(plurals);
+  else if (typeof exports === 'object') module.exports = plurals;
+  else root.plurals = plurals;
 }(this, {
 _in: a,
 
diff --git a/packages/plurals/pluralCategories.js b/packages/plurals/pluralCategories.js
index 804fd12..8761ab1 100644
--- a/packages/plurals/pluralCategories.js
+++ b/packages/plurals/pluralCategories.js
@@ -7,13 +7,9 @@ var e = {cardinal:[o,t,x],ordinal:[x]};
 
 (function (root, pluralCategories) {
   Object.defineProperty(pluralCategories, '__esModule', { value: true });
-  if (typeof define === 'function' && define.amd) {
-    define(pluralCategories);
-  } else if (typeof exports === 'object') {
-    module.exports = pluralCategories;
-  } else {
-    root.pluralCategories = pluralCategories;
-  }
+  if (typeof define === 'function' && define.amd) define(pluralCategories);
+  else if (typeof exports === 'object') module.exports = pluralCategories;
+  else root.pluralCategories = pluralCategories;
 }(this, {
 _in: b,
 af: a,
diff --git a/packages/plurals/plurals.js b/packages/plurals/plurals.js
index 6b246c5..9f8ddfd 100644
--- a/packages/plurals/plurals.js
+++ b/packages/plurals/plurals.js
@@ -23,13 +23,9 @@ function e(n, ord) {
 
 (function (root, plurals) {
   Object.defineProperty(plurals, '__esModule', { value: true });
-  if (typeof define === 'function' && define.amd) {
-    define(plurals);
-  } else if (typeof exports === 'object') {
-    module.exports = plurals;
-  } else {
-    root.plurals = plurals;
-  }
+  if (typeof define === 'function' && define.amd) define(plurals);
+  else if (typeof exports === 'object') module.exports = plurals;
+  else root.plurals = plurals;
 }(this, {
 _in: d,