Store lerna packages in the src directory

- Also update versions in package.json
- Update Makefile

Makefile

@@ -25,10 +25,10 @@ UGLIFYJS		?= node_modules/.bin/uglifyjs
 
 
 # In the case user wishes to use RVM
-USE_RVM                 ?= false
-RVM_RUBY_VERSION        ?= 2.4.2
+USE_RVM				 ?= false
+RVM_RUBY_VERSION		?= 2.4.2
 ifeq ($(USE_RVM),true)
-	RVM_USE                 = rvm use $(RVM_RUBY_VERSION)
+	RVM_USE				 = rvm use $(RVM_RUBY_VERSION)
 endif
 
 # Internal variables.
@@ -41,21 +41,23 @@ all: dev dist
 help:
 	@echo "Please use \`make <target>' where <target> is one of the following:"
 	@echo ""
-	@echo " all           A synonym for 'make dev'."
-	@echo " build         Create minified builds of converse.js and all its dependencies."
-	@echo " clean         Remove all NPM and Ruby packages."
-	@echo " css           Generate CSS from the Sass files."
-	@echo " dev           Set up the development environment. To force a fresh start, run 'make clean' first."
-	@echo " html          Make standalone HTML files of the documentation."
-	@echo " po            Generate gettext PO files for each i18n language."
-	@echo " po2json       Generate JSON files from the language PO files."
-	@echo " pot           Generate a gettext POT file to be used for translations."
-	@echo " release       Prepare a new release of converse.js. E.g. make release VERSION=0.9.5"
-	@echo " serve         Serve this directory via a webserver on port 8000."
-	@echo " stamp-npm     Install NPM dependencies"
-	@echo " stamp-bundler Install Bundler (Ruby) dependencies"
-	@echo " watch         Tells Sass to watch the .scss files for changes and then automatically update the CSS files."
-	@echo " logo          Generate PNG logos of multiple sizes."
+	@echo " all		   		A synonym for 'make dev'."
+	@echo " build		 	Create minified builds of converse.js and all its dependencies."
+	@echo " clean		 	Remove all NPM and Ruby packages."
+	@echo " check			Run all tests."
+	@echo " css		   		Generate CSS from the Sass files."
+	@echo " dev		   		Set up the development environment. To force a fresh start, run 'make clean' first."
+	@echo " html		  	Make standalone HTML files of the documentation."
+	@echo " po				Generate gettext PO files for each i18n language."
+	@echo " po2json	   		Generate JSON files from the language PO files."
+	@echo " pot		   		Generate a gettext POT file to be used for translations."
+	@echo " release	   		Prepare a new release of converse.js. E.g. make release VERSION=0.9.5"
+	@echo " serve		 	Serve this directory via a webserver on port 8000."
+	@echo " serve_bg	  	Same as "serve", but do it in the background
+	@echo " stamp-npm	 	Install NPM dependencies"
+	@echo " stamp-bundler 	Install Bundler (Ruby) dependencies"
+	@echo " watch		 	Tells Sass to watch the .scss files for changes and then automatically update the CSS files."
+	@echo " logo		  	Generate PNG logos of multiple sizes."
 
 
 ########################################################################
@@ -112,7 +114,7 @@ release:
 $(LERNA):
 	npm install lerna
 
-stamp-npm: $(LERNA) package.json package-lock.json packages/headless/package.json
+stamp-npm: $(LERNA) package.json package-lock.json src/headless/package.json
 	$(LERNA) bootstrap --hoist
 	touch stamp-npm
 
@@ -164,15 +166,15 @@ watch: dev
 
 .PHONY: logo
 logo: logo/conversejs-transparent16.png \
-      logo/conversejs-transparent19.png \
-      logo/conversejs-transparent48.png \
-      logo/conversejs-transparent128.png \
-      logo/conversejs-transparent512.png \
-      logo/conversejs-filled16.png \
-      logo/conversejs-filled19.png \
-      logo/conversejs-filled48.png \
-      logo/conversejs-filled128.png \
-      logo/conversejs-filled512.png \
+	  logo/conversejs-transparent19.png \
+	  logo/conversejs-transparent48.png \
+	  logo/conversejs-transparent128.png \
+	  logo/conversejs-transparent512.png \
+	  logo/conversejs-filled16.png \
+	  logo/conversejs-filled19.png \
+	  logo/conversejs-filled48.png \
+	  logo/conversejs-filled128.png \
+	  logo/conversejs-filled512.png \
 
 logo/conversejs-transparent%.png:: logo/conversejs-transparent.svg
 	$(INKSCAPE) -e $@ -w $* $<
@@ -205,7 +207,7 @@ dist/converse-no-dependencies.min.js: src webpack.config.js stamp-npm @converse/
 dist/converse-no-dependencies-es2015.js: src webpack.config.js stamp-npm @converse/headless
 	./node_modules/.bin/npx  webpack --mode=development --type=nodeps --lang=es2015
 
-@converse/headless: packages/headless
+@converse/headless: src/headless
 
 .PHONY: dist
 dist:: build

lerna.json

@@ -1,7 +1,7 @@
 {
   "packages": [
     ".",
-    "packages/*"
+    "src/*"
   ],
-  "version": "4.0.2"
+  "version": "4.0.3"
 }

package-lock.json

@@ -16848,10 +16848,7 @@
       }
     },
     "strophe.js": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/strophe.js/-/strophe.js-1.3.0.tgz",
-      "integrity": "sha512-1NSLqtpHevIGb0xQEY33XqaH+/cfrKenLwD5Vwn9QqY/cB21JGDUNg5afhDePXlaFViWHE6M80UkfIzQLbUGKQ==",
-      "dev": true
+      "version": "github:strophe/strophejs#a2692dcfdaf7d591254ac73f3d8584992b6f8da7"
     },
     "strophejs-plugin-ping": {
       "version": "0.0.3",
@@ -16859,7 +16856,7 @@
       "integrity": "sha512-HS/ArEGKXfu36fihjUSfjqmqOSyppQTJUbrkfEtOBRJmnaP3LsRRe5T2S3dmCdsWHKORaJYc/OHSKfFlxHPdqw==",
       "dev": true,
       "requires": {
-        "strophe.js": "1.3.0"
+        "strophe.js": "github:strophe/strophejs#a2692dcfdaf7d591254ac73f3d8584992b6f8da7"
       }
     },
     "strophejs-plugin-register": {

package.json

@@ -10,7 +10,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/jcbrand/converse.js.git"
+    "url": "git://github.com/conversejs/converse.js.git"
   },
   "keywords": [
     "XMPP",
@@ -42,8 +42,8 @@
     "backbone": "1.3.3",
     "backbone.browserStorage": "0.0.4",
     "backbone.nativeview": "^0.3.3",
-    "backbone.overview": "1.0.2",
-    "backbone.vdomview": "1.0.1",
+    "backbone.overview": "^1.0.2",
+    "backbone.vdomview": "^1.0.1",
     "bootstrap": "^4.0.0",
     "bootstrap.native": "^2.0.23",
     "bourbon": "^4.3.2",

src/headless/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@converse/headless",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "description": "Converse.js Headless build",
   "author": "cmrd Senya <senya@riseup.net>",
-  "homepage": "https://github.com/jcbrand/converse.js",
+  "homepage": "https://github.com/conversejs/converse.js",
   "license": "MPL-2.0",
   "main": "converse-core.js",
   "files": [
@@ -12,18 +12,18 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/jcbrand/converse.js.git"
+    "url": "git+https://github.com/conversejs/converse.js.git"
   },
   "scripts": {
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "bugs": {
-    "url": "https://github.com/jcbrand/converse.js/issues"
+    "url": "https://github.com/conversejs/converse.js/issues"
   },
   "gitHead": "9641dcdc820e029b05930479c242d2b707bbe8e2",
   "dependencies": {
     "backbone": "1.3.3",
-    "backbone.browserStorage": "0.0.3",
+    "backbone.browserStorage": "0.0.4",
     "backbone.nativeview": "^0.3.3",
     "backbone.overview": "^1.0.2",
     "backbone.vdomview": "^1.0.1",
@@ -35,8 +35,8 @@
     "pluggable.js": "2.0.0",
     "sizzle": "^2.3.3",
     "strophe.js": "strophe/strophejs#a2692dcfdaf7d591254ac73f3d8584992b6f8da7",
-    "strophejs-plugin-ping": "0.0.1",
-    "strophejs-plugin-rsm": "0.0.1",
+    "strophejs-plugin-ping": "0.0.3",
+    "strophejs-plugin-rsm": "0.0.2",
     "urijs": "^1.19.1"
   }
 }