From c65eee9ed3bf931440d26c6949f6562181843917 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Tue, 23 Aug 2016 09:16:12 +0000 Subject: [PATCH] Use almond.js via npm (instead of bower) --- bower.json | 1 - src/build-mobile.js | 2 +- src/build-no-dependencies.js | 2 +- src/build-no-jquery.js | 2 +- src/build.js | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bower.json b/bower.json index 0e4e934b6..9cc056dfe 100644 --- a/bower.json +++ b/bower.json @@ -10,7 +10,6 @@ "dependencies": { "requirejs": "~2.2.0", "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": "*", "bootstrap": "~3.2.0", diff --git a/src/build-mobile.js b/src/build-mobile.js index a3c797ff9..b2a7818aa 100644 --- a/src/build-mobile.js +++ b/src/build-mobile.js @@ -1,6 +1,6 @@ ({ baseUrl: "../", - name: "components/almond/almond.js", + name: "node_modules/almond/almond.js", out: "../dist/converse-mobile.min.js", mainConfigFile: '../config.js', excludeShallow: [ diff --git a/src/build-no-dependencies.js b/src/build-no-dependencies.js index 0c76eaa8f..38c45a332 100644 --- a/src/build-no-dependencies.js +++ b/src/build-no-dependencies.js @@ -1,6 +1,6 @@ ({ baseUrl: "../", - name: "components/almond/almond.js", + name: "node_modules/almond/almond.js", out: "../dist/converse-no-dependencies.min.js", include: ['converse'], excludeShallow: [ diff --git a/src/build-no-jquery.js b/src/build-no-jquery.js index 5a77b64e3..5092fe0b8 100644 --- a/src/build-no-jquery.js +++ b/src/build-no-jquery.js @@ -1,6 +1,6 @@ ({ baseUrl: "../", - name: "components/almond/almond.js", + name: "node_modules/almond/almond.js", out: "../dist/converse.nojquery.min.js", include: ['converse'], exclude: ['jquery', 'jquery-private'], diff --git a/src/build.js b/src/build.js index b9b2f7fb9..02e49d02d 100644 --- a/src/build.js +++ b/src/build.js @@ -1,6 +1,6 @@ ({ baseUrl: "../", - name: "components/almond/almond.js", + name: "node_modules/almond/almond.js", out: "../dist/converse.min.js", mainConfigFile: '../config.js', include: ['converse'],