Move low hanging fruit from bower to NPM.

The goal is to eventually remove bower as a dependency.

Move low hanging fruit from bower to NPM.
The goal is to eventually remove bower as a dependency.
0098b868 · JC Brand · 66d80cc4 · 0098b868 · 0098b868 · 0098b868
Commit 0098b868 authored Aug 11, 2016 by JC Brand
Hide whitespace changes
Inline Side-by-side

Showing with 48 additions and 46 deletions

bower.json bower.json +0 -9

config.js config.js +35 -35

package.json package.json +13 -2

No files found.
--- a/bower.json
+++ b/bower.json
@@ -9,19 +9,10 @@
  },
  "dependencies": {
    "requirejs": "~2.2.0",
-    "jquery": "1.12.3",
-    "jed": "0.5.4",
-    "underscore": "~1.8.3",
-    "backbone": "1.1.2",
-    "backbone.browserStorage": "0.0.2",
-    "backbone.overview": "0.0.2",
-    "otr": "0.2.16",
    "crypto-js-evanvosberg": "https://github.com/evanvosberg/crypto-js.git#release-3.1.2-5",
    "almond": "~0.3.1",
    "requirejs-text": "~2.0.14",
    "requirejs-tpl-jcbrand": "*",
-    "momentjs": "~2.12.0",
-    "jquery.browser": ">=0.1.0",
    "bootstrap": "~3.2.0",
    "fontawesome": "~4.1.0",
    "typeahead.js": "https://raw.githubusercontent.com/jcbrand/typeahead.js/eedfb10505dd3a20123d1fafc07c1352d83f0ab3/dist/typeahead.jquery.js",

--- a/config.js
+++ b/config.js
@@ -14,15 +14,15 @@ if (typeof(require) === 'undefined') {
 require.config({
    baseUrl: '.',
    paths: {
-        "backbone":                 "components/backbone/backbone",
-        "backbone.browserStorage":  "components/backbone.browserStorage/backbone.browserStorage",
-        "backbone.overview":        "components/backbone.overview/backbone.overview",
-        "eventemitter":             "components/otr/build/dep/eventemitter",
-        "jquery":                   "components/jquery/dist/jquery",
+        "backbone":                 "node_modules/backbone/backbone",
+        "backbone.browserStorage":  "node_modules/backbone.browserStorage/backbone.browserStorage",
+        "backbone.overview":        "node_modules/backbone.overview/backbone.overview",
+        "eventemitter":             "node_modules/otr/build/dep/eventemitter",
+        "jquery":                   "node_modules/jquery/dist/jquery",
        "jquery-private":           "src/jquery-private",
-        "jquery.browser":           "components/jquery.browser/dist/jquery.browser",
+        "jquery.browser":           "node_modules/jquery.browser/dist/jquery.browser",
        "jquery.easing":            "components/jquery-easing-original/index",          // XXX: Only required for https://conversejs.org website
-        "moment":                   "components/momentjs/moment",
+        "moment":                   "node_modules/moment/moment",
        "pluggable":                "node_modules/pluggable.js/pluggable",
        "strophe":                  "components/strophejs/src/wrapper",
        "strophe-base64":           "components/strophejs/src/base64",
@@ -40,7 +40,7 @@ require.config({
        "text":                     'components/requirejs-text/text',
        "tpl":                      'components/requirejs-tpl-jcbrand/tpl',
        "typeahead":                "components/typeahead.js/index",
-        "underscore":               "components/underscore/underscore",
+        "underscore":               "node_modules/underscore/underscore",
        "utils":                    "src/utils",
        "polyfill":                 "src/polyfill",
        
@@ -65,23 +65,23 @@ require.config({
        // Off-the-record-encryption
        "bigint":               "src/bigint",
        "crypto":               "src/crypto",
-        "crypto.aes":           "components/otr/vendor/cryptojs/aes",
-        "crypto.cipher-core":   "components/otr/vendor/cryptojs/cipher-core",
-        "crypto.core":          "components/otr/vendor/cryptojs/core",
-        "crypto.enc-base64":    "components/otr/vendor/cryptojs/enc-base64",
+        "crypto.aes":           "node_modules/otr/vendor/cryptojs/aes",
+        "crypto.cipher-core":   "node_modules/otr/vendor/cryptojs/cipher-core",
+        "crypto.core":          "node_modules/otr/vendor/cryptojs/core",
+        "crypto.enc-base64":    "node_modules/otr/vendor/cryptojs/enc-base64",
        "crypto.evpkdf":        "components/crypto-js-evanvosberg/src/evpkdf",
-        "crypto.hmac":          "components/otr/vendor/cryptojs/hmac",
+        "crypto.hmac":          "node_modules/otr/vendor/cryptojs/hmac",
        "crypto.md5":           "components/crypto-js-evanvosberg/src/md5",
-        "crypto.mode-ctr":      "components/otr/vendor/cryptojs/mode-ctr",
-        "crypto.pad-nopadding": "components/otr/vendor/cryptojs/pad-nopadding",
-        "crypto.sha1":          "components/otr/vendor/cryptojs/sha1",
-        "crypto.sha256":        "components/otr/vendor/cryptojs/sha256",
-        "salsa20":              "components/otr/build/dep/salsa20",
+        "crypto.mode-ctr":      "node_modules/otr/vendor/cryptojs/mode-ctr",
+        "crypto.pad-nopadding": "node_modules/otr/vendor/cryptojs/pad-nopadding",
+        "crypto.sha1":          "node_modules/otr/vendor/cryptojs/sha1",
+        "crypto.sha256":        "node_modules/otr/vendor/cryptojs/sha256",
+        "salsa20":              "node_modules/otr/build/dep/salsa20",
        "otr":                  "src/otr",

        // Locales paths
        "locales":   "src/locales",
-        "jed":       "components/jed/jed",
+        "jed":       "node_modules/jed/jed",
        "af":        "locale/af/LC_MESSAGES/converse.json",
        "ca":        "locale/ca/LC_MESSAGES/converse.json",
        "de":        "locale/de/LC_MESSAGES/converse.json",
@@ -102,22 +102,22 @@ require.config({
        "zh":        "locale/zh/LC_MESSAGES/converse.json",

        "moment_with_locales": "src/moment_locales",
-        'moment_af':        "components/momentjs/locale/af",
-        'moment_de':        "components/momentjs/locale/de",
-        'moment_es':        "components/momentjs/locale/es",
-        'moment_fr':        "components/momentjs/locale/fr",
-        'moment_he':        "components/momentjs/locale/he",
-        'moment_hu':        "components/momentjs/locale/hu",
-        'moment_id':        "components/momentjs/locale/id",
-        'moment_it':        "components/momentjs/locale/it",
-        'moment_ja':        "components/momentjs/locale/ja",
-        'moment_nb':        "components/momentjs/locale/nb",
-        'moment_nl':        "components/momentjs/locale/nl",
-        'moment_pl':        "components/momentjs/locale/pl",
-        'moment_pt-br':     "components/momentjs/locale/pt-br",
-        'moment_ru':        "components/momentjs/locale/ru",
-        'moment_uk':        "components/momentjs/locale/uk",
-        'moment_zh':        "components/momentjs/locale/zh-cn",
+        'moment_af':        "node_modules/moment/locale/af",
+        'moment_de':        "node_modules/moment/locale/de",
+        'moment_es':        "node_modules/moment/locale/es",
+        'moment_fr':        "node_modules/moment/locale/fr",
+        'moment_he':        "node_modules/moment/locale/he",
+        'moment_hu':        "node_modules/moment/locale/hu",
+        'moment_id':        "node_modules/moment/locale/id",
+        'moment_it':        "node_modules/moment/locale/it",
+        'moment_ja':        "node_modules/moment/locale/ja",
+        'moment_nb':        "node_modules/moment/locale/nb",
+        'moment_nl':        "node_modules/moment/locale/nl",
+        'moment_pl':        "node_modules/moment/locale/pl",
+        'moment_pt-br':     "node_modules/moment/locale/pt-br",
+        'moment_ru':        "node_modules/moment/locale/ru",
+        'moment_uk':        "node_modules/moment/locale/uk",
+        'moment_zh':        "node_modules/moment/locale/zh-cn",

        // Templates
        "action":                   "src/templates/action",

--- a/package.json
+++ b/package.json
@@ -45,7 +45,18 @@
    "po2json": "^0.3.0"
  },
  "dependencies": {
-    "requirejs": "~2.1.15",
-    "pluggable.js": "https://github.com/jcbrand/pluggable.js.git#master"
+    "requirejs": "~2.2.0",
+    "pluggable.js": "https://github.com/jcbrand/pluggable.js.git#master",
+    "jquery": "1.12.3",
+    "jed": "0.5.4",
+    "underscore": "~1.8.3",
+    "backbone": "1.1.2",
+    "backbone.browserStorage": "0.0.2",
+    "backbone.overview": "0.0.2",
+    "otr": "0.2.16",
+    "crypto-js-evanvosberg": "https://github.com/evanvosberg/crypto-js.git#release-3.1.2-5",
+    "almond": "~0.3.1",
+    "moment": "~2.12.0",
+    "jquery.browser": ">=0.1.0"
  }
 }