Browse Source

Don't make bundled dependencies devDependencies

Otherwise you need to manually include them in downstream consumer projects
JC Brand 4 years ago
parent
commit
8966290369
4 changed files with 49 additions and 58 deletions
  1. 30 41
      package-lock.json
  2. 12 11
      package.json
  3. 5 5
      spec/http-file-upload.js
  4. 2 1
      src/headless/package.json

+ 30 - 41
package-lock.json

@@ -2939,11 +2939,25 @@
 		"@converse/headless": {
 			"version": "file:src/headless",
 			"dev": true,
+			"requires": {
+				"@converse/skeletor": "github:conversejs/skeletor#fe855404babc08cbb1018231eb49a7b7e497539c",
+				"filesize": "^6.1.0",
+				"localforage": "^1.9.0",
+				"localforage-driver-memory": "^1.0.5",
+				"localforage-setitems": "^1.4.0",
+				"localforage-webextensionstorage-driver": "^2.0.0",
+				"lodash-es": "^4.17.15",
+				"pluggable.js": "2.0.1",
+				"sizzle": "^2.3.5",
+				"sprintf-js": "^1.1.2",
+				"strophe.js": "1.4.2"
+			},
 			"dependencies": {
 				"filesize": {
 					"version": "6.1.0",
 					"resolved": "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz",
-					"integrity": "sha512-LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg=="
+					"integrity": "sha512-LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg==",
+					"dev": true
 				},
 				"fs-extra": {
 					"version": "8.1.0",
@@ -2970,11 +2984,6 @@
 					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
 					"integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
 				},
-				"immediate": {
-					"version": "3.0.6",
-					"resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
-					"integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
-				},
 				"jed": {
 					"version": "1.1.1",
 					"resolved": "https://registry.npmjs.org/jed/-/jed-1.1.1.tgz",
@@ -2989,18 +2998,11 @@
 						"universalify": "^0.1.2"
 					}
 				},
-				"lie": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
-					"integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
-					"requires": {
-						"immediate": "~3.0.5"
-					}
-				},
 				"localforage": {
-					"version": "1.7.3",
-					"resolved": "https://registry.npmjs.org/localforage/-/localforage-1.7.3.tgz",
-					"integrity": "sha512-1TulyYfc4udS7ECSBT2vwJksWbkwwTX8BzeUIiq8Y07Riy7bDAAnxDaPU/tWyOVmQAcWJIEIFP9lPfBGqVoPgQ==",
+					"version": "1.9.0",
+					"resolved": "https://registry.npmjs.org/localforage/-/localforage-1.9.0.tgz",
+					"integrity": "sha512-rR1oyNrKulpe+VM9cYmcFn6tsHuokyVHFaCM3+osEmxaHTbEk8oQu6eGDfS6DQLWi/N67XRmB8ECG37OES368g==",
+					"dev": true,
 					"requires": {
 						"lie": "3.1.1"
 					}
@@ -3009,6 +3011,7 @@
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/pluggable.js/-/pluggable.js-2.0.1.tgz",
 					"integrity": "sha512-SBt6v6Tbp20Jf8hU0cpcc/+HBHGMY8/Q+yA6Ih0tBQE8tfdZ6U4PRG0iNvUUjLx/hVyOP53n0UfGBymlfaaXCg==",
+					"dev": true,
 					"requires": {
 						"lodash": "^4.17.11"
 					}
@@ -3281,8 +3284,7 @@
 		"@fortawesome/fontawesome-free": {
 			"version": "5.14.0",
 			"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.14.0.tgz",
-			"integrity": "sha512-OfdMsF+ZQgdKHP9jUbmDcRrP0eX90XXrsXIdyjLbkmSBzmMXPABB8eobUJtivaupucYaByz6WNe1PI1JuYm3qA==",
-			"dev": true
+			"integrity": "sha512-OfdMsF+ZQgdKHP9jUbmDcRrP0eX90XXrsXIdyjLbkmSBzmMXPABB8eobUJtivaupucYaByz6WNe1PI1JuYm3qA=="
 		},
 		"@glimmer/interfaces": {
 			"version": "0.41.4",
@@ -4564,8 +4566,7 @@
 		"@lit/reactive-element": {
 			"version": "1.0.0-rc.1",
 			"resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.0.0-rc.1.tgz",
-			"integrity": "sha512-TLRPKOhQLNOMcpCXHiTKrNKX5eNzhf9y07jp27MXkjTH1IbXFvcT9/mVdOG/3qfMkip+iO6CEfv5a+y0wFhQig==",
-			"dev": true
+			"integrity": "sha512-TLRPKOhQLNOMcpCXHiTKrNKX5eNzhf9y07jp27MXkjTH1IbXFvcT9/mVdOG/3qfMkip+iO6CEfv5a+y0wFhQig=="
 		},
 		"@mrmlnc/readdir-enhanced": {
 			"version": "2.2.1",
@@ -6176,14 +6177,12 @@
 		"bootstrap": {
 			"version": "4.6.0",
 			"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz",
-			"integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==",
-			"dev": true
+			"integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw=="
 		},
 		"bootstrap.native": {
 			"version": "2.0.27",
 			"resolved": "https://registry.npmjs.org/bootstrap.native/-/bootstrap.native-2.0.27.tgz",
-			"integrity": "sha512-gv2eN4zXHOLN/oPotTxb8CJr9Dk0xlM9YURyHCWjq1Lyt2I669bri/Bp8b0HPOKX7JqRVh+Sk/VwEe0OcQN2fw==",
-			"dev": true
+			"integrity": "sha512-gv2eN4zXHOLN/oPotTxb8CJr9Dk0xlM9YURyHCWjq1Lyt2I669bri/Bp8b0HPOKX7JqRVh+Sk/VwEe0OcQN2fw=="
 		},
 		"bootstrap.native-loader": {
 			"version": "2.0.0",
@@ -7888,8 +7887,7 @@
 		"cssfilter": {
 			"version": "0.0.10",
 			"resolved": "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz",
-			"integrity": "sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4=",
-			"dev": true
+			"integrity": "sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4="
 		},
 		"currently-unhandled": {
 			"version": "0.4.1",
@@ -7951,8 +7949,7 @@
 		"dayjs": {
 			"version": "1.10.4",
 			"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.4.tgz",
-			"integrity": "sha512-RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw==",
-			"dev": true
+			"integrity": "sha512-RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw=="
 		},
 		"debug": {
 			"version": "3.1.0",
@@ -9448,8 +9445,7 @@
 		"favico.js-slevomat": {
 			"version": "0.3.11",
 			"resolved": "https://registry.npmjs.org/favico.js-slevomat/-/favico.js-slevomat-0.3.11.tgz",
-			"integrity": "sha512-fP1e3RqjT+zNo0yU0LBaSbJrQ7DWUbt+yVigkZ2VXRjNpAm6ZEsoM9FnN5Gdf/9r8/SlS84X7OhBESD6f7EihQ==",
-			"dev": true
+			"integrity": "sha512-fP1e3RqjT+zNo0yU0LBaSbJrQ7DWUbt+yVigkZ2VXRjNpAm6ZEsoM9FnN5Gdf/9r8/SlS84X7OhBESD6f7EihQ=="
 		},
 		"faye-websocket": {
 			"version": "0.11.3",
@@ -12299,8 +12295,7 @@
 		"jed": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/jed/-/jed-1.1.1.tgz",
-			"integrity": "sha1-elSbvZ/+FYWwzQoZHiAwVb7ldLQ=",
-			"dev": true
+			"integrity": "sha1-elSbvZ/+FYWwzQoZHiAwVb7ldLQ="
 		},
 		"jest-docblock": {
 			"version": "25.3.0",
@@ -12968,7 +12963,6 @@
 			"version": "2.0.0-rc.1",
 			"resolved": "https://registry.npmjs.org/lit/-/lit-2.0.0-rc.1.tgz",
 			"integrity": "sha512-cf4r18feMhu56sO963a5MaHUn6OX2Am9sj9lzyGTYx2IPDhC9NP/Xh4rj9Ialo9dA+lI4brD7+9cxSzRIWHOmw==",
-			"dev": true,
 			"requires": {
 				"@lit/reactive-element": "^1.0.0-rc.1",
 				"lit-element": "^3.0.0-rc.1",
@@ -12979,7 +12973,6 @@
 					"version": "3.0.0-rc.1",
 					"resolved": "https://registry.npmjs.org/lit-element/-/lit-element-3.0.0-rc.1.tgz",
 					"integrity": "sha512-SQH7LODMy+42UTOGiyHUTXronvv8Cud0Y/8Q8/1jd/9Putuh66GjN7FEjyNRxVbpIygnPqMbG854J9Ct9IJlFw==",
-					"dev": true,
 					"requires": {
 						"@lit/reactive-element": "^1.0.0-rc.1",
 						"lit-html": "^2.0.0-rc.1"
@@ -12989,7 +12982,6 @@
 					"version": "2.0.0-rc.2",
 					"resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.0.0-rc.2.tgz",
 					"integrity": "sha512-rl3vtIQ0jq6r0GVbg+57Et9ra+iNhiz/v5V7uPTb6VxnjJaCCYKI7WkzKNlyzjMM2N/ytih3Uxb5vyyaOpjb0Q==",
-					"dev": true,
 					"requires": {
 						"@types/trusted-types": "^1.0.1"
 					}
@@ -22119,8 +22111,7 @@
 		"urijs": {
 			"version": "1.19.6",
 			"resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.6.tgz",
-			"integrity": "sha512-eSXsXZ2jLvGWeLYlQA3Gh36BcjF+0amo92+wHPyN1mdR8Nxf75fuEuYTd9c0a+m/vhCjRK0ESlE9YNLW+E1VEw==",
-			"dev": true
+			"integrity": "sha512-eSXsXZ2jLvGWeLYlQA3Gh36BcjF+0amo92+wHPyN1mdR8Nxf75fuEuYTd9c0a+m/vhCjRK0ESlE9YNLW+E1VEw=="
 		},
 		"urix": {
 			"version": "0.1.0",
@@ -23171,7 +23162,6 @@
 			"version": "1.0.8",
 			"resolved": "https://registry.npmjs.org/xss/-/xss-1.0.8.tgz",
 			"integrity": "sha512-3MgPdaXV8rfQ/pNn16Eio6VXYPTkqwa0vc7GkiymmY/DqR1SE/7VPAAVZz1GJsJFrllMYO3RHfEaiUGjab6TNw==",
-			"dev": true,
 			"requires": {
 				"commander": "^2.20.3",
 				"cssfilter": "0.0.10"
@@ -23180,8 +23170,7 @@
 				"commander": {
 					"version": "2.20.3",
 					"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-					"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-					"dev": true
+					"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
 				}
 			}
 		},

+ 12 - 11
package.json

@@ -71,29 +71,23 @@
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/preset-env": "^7.12.7",
     "@converse/headless": "file:src/headless",
-    "@fortawesome/fontawesome-free": "5.14.0",
     "autoprefixer": "^9.8.6",
     "babel-eslint": "^10.1.0",
     "babel-loader": "^8.2.2",
     "babel-plugin-lodash": "^3.3.4",
-    "bootstrap": "^4.6.0",
-    "bootstrap.native": "^2.0.27",
     "bootstrap.native-loader": "2.0.0",
     "clean-css-cli": "^4.3.0",
     "copy-webpack-plugin": "^6.3.2",
     "css-loader": "^3.5.3",
-    "dayjs": "1.10.4",
     "eslint": "^7.3.0",
     "exports-loader": "^0.7.0",
     "fast-text-encoding": "^1.0.3",
-    "favico.js-slevomat": "^0.3.11",
     "file-loader": "^6.0.0",
     "html-webpack-plugin": "^4.3.0",
     "http-server": "^0.12.3",
     "imports-loader": "^0.8.0",
     "install": "^0.13.0",
     "jasmine": "^3.5.0",
-    "jed": "1.1.1",
     "jsdoc": "^3.6.6",
     "karma": "^6.3.2",
     "karma-chrome-launcher": "^3.1.0",
@@ -102,7 +96,6 @@
     "karma-jasmine-html-reporter": "^1.5.4",
     "karma-webpack": "^5.0.0",
     "lerna": "^3.22.1",
-    "lit": "^2.0.0-rc.1",
     "mini-css-extract-plugin": "^1.5.1",
     "minimist": "^1.2.3",
     "npm": "^6.14.9",
@@ -116,12 +109,20 @@
     "sass-loader": "^11.0.1",
     "sinon": "^9.2.4",
     "style-loader": "^0.23.1",
-    "urijs": "^1.19.6",
     "webpack": "^5.36.1",
     "webpack-cli": "^4.5.0",
     "webpack-dev-server": "^3.11.2",
-    "webpack-merge": "^5.7.3",
-    "xss": "^1.0.8"
+    "webpack-merge": "^5.7.3"
   },
-  "dependencies": {}
+  "dependencies": {
+    "@fortawesome/fontawesome-free": "5.14.0",
+    "bootstrap": "^4.6.0",
+    "bootstrap.native": "^2.0.27",
+    "dayjs": "1.10.4",
+    "favico.js-slevomat": "^0.3.11",
+    "jed": "1.1.1",
+    "lit": "^2.0.0-rc.1",
+    "urijs": "^1.19.6",
+    "xss": "^1.0.8"
+  }
 }

+ 5 - 5
spec/http-file-upload.js

@@ -432,7 +432,7 @@ describe("XEP-0363: HTTP File Upload", function () {
                         iq => iq.querySelector('iq[to="montague.lit"] query[xmlns="http://jabber.org/protocol/disco#info"]')).length
                     );
 
-                    let stanza = _.find(IQ_stanzas, function (iq) {
+                    let stanza = IQ_stanzas.find(function (iq) {
                         return iq.querySelector(
                             'iq[to="montague.lit"] query[xmlns="http://jabber.org/protocol/disco#info"]');
                     });
@@ -454,8 +454,8 @@ describe("XEP-0363: HTTP File Upload", function () {
                     let entities = await _converse.api.disco.entities.get();
 
                     expect(entities.length).toBe(2);
-                    expect(_.includes(entities.pluck('jid'), 'montague.lit')).toBe(true);
-                    expect(_.includes(entities.pluck('jid'), 'romeo@montague.lit')).toBe(true);
+                    expect(entities.pluck('jid').includes('montague.lit')).toBe(true);
+                    expect(entities.pluck('jid').includes('romeo@montague.lit')).toBe(true);
 
                     expect(entities.get(_converse.domain).features.length).toBe(2);
                     expect(entities.get(_converse.domain).identities.length).toBe(1);
@@ -468,7 +468,7 @@ describe("XEP-0363: HTTP File Upload", function () {
                         }).length > 0;
                     }, 300);
 
-                    stanza = _.find(IQ_stanzas, function (iq) {
+                    stanza = IQ_stanzas.find(function (iq) {
                         return iq.querySelector('iq[to="montague.lit"] query[xmlns="http://jabber.org/protocol/disco#items"]');
                     });
                     var items_IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
@@ -496,7 +496,7 @@ describe("XEP-0363: HTTP File Upload", function () {
                         }).length > 0;
                     }, 300);
 
-                    stanza = _.find(IQ_stanzas, iq => iq.querySelector('iq[to="upload.montague.lit"] query[xmlns="http://jabber.org/protocol/disco#info"]'));
+                    stanza = IQ_stanzas.find(iq => iq.querySelector('iq[to="upload.montague.lit"] query[xmlns="http://jabber.org/protocol/disco#info"]'));
                     const IQ_id = IQ_ids[IQ_stanzas.indexOf(stanza)];
                     expect(Strophe.serialize(stanza)).toBe(
                         `<iq from="romeo@montague.lit/orchard" id="${IQ_id}" to="upload.montague.lit" type="get" xmlns="jabber:client">`+

+ 2 - 1
src/headless/package.json

@@ -35,7 +35,8 @@
     "url": "https://github.com/conversejs/converse.js/issues"
   },
   "gitHead": "9641dcdc820e029b05930479c242d2b707bbe8e2",
-  "devDependencies": {
+  "devDependencies": {},
+  "dependencies": {
     "@converse/skeletor": "conversejs/skeletor#fe855404babc08cbb1018231eb49a7b7e497539c",
     "filesize": "^6.1.0",
     "localforage": "^1.9.0",