From 18024b8bd21c77eb1e506f44e2147007c783aff6 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Mon, 22 Oct 2018 13:10:55 +0200 Subject: [PATCH] Store lerna packages in the `src` directory - Also update versions in package.json - Update Makefile --- Makefile | 60 ++++++++++--------- lerna.json | 4 +- package-lock.json | 7 +-- package.json | 6 +- .../headless/3rdparty/lodash.fp.js | 0 .../headless/backbone.noconflict.js | 0 .../headless/converse-chatboxes.js | 0 {packages => src}/headless/converse-core.js | 0 {packages => src}/headless/converse-disco.js | 0 {packages => src}/headless/converse-mam.js | 0 {packages => src}/headless/converse-muc.js | 0 {packages => src}/headless/converse-ping.js | 0 {packages => src}/headless/converse-vcard.js | 0 {packages => src}/headless/headless.js | 0 {packages => src}/headless/i18n.js | 0 {packages => src}/headless/lodash.fp.js | 0 .../headless/lodash.noconflict.js | 0 {packages => src}/headless/package.json | 14 ++--- {packages => src}/headless/polyfill.js | 0 .../headless/templates/audio.html | 0 .../headless/templates/field.html | 0 .../headless/templates/file.html | 0 .../headless/templates/form_captcha.html | 0 .../headless/templates/form_checkbox.html | 0 .../headless/templates/form_input.html | 0 .../headless/templates/form_select.html | 0 .../headless/templates/form_textarea.html | 0 .../headless/templates/form_url.html | 0 .../headless/templates/form_username.html | 0 .../headless/templates/image.html | 0 .../headless/templates/select_option.html | 0 .../headless/templates/vcard.html | 0 .../headless/templates/video.html | 0 {packages => src}/headless/utils/core.js | 0 {packages => src}/headless/utils/emoji.js | 0 {packages => src}/headless/utils/form.js | 0 {packages => src}/headless/utils/muc.js | 0 37 files changed, 45 insertions(+), 46 deletions(-) rename {packages => src}/headless/3rdparty/lodash.fp.js (100%) rename {packages => src}/headless/backbone.noconflict.js (100%) rename {packages => src}/headless/converse-chatboxes.js (100%) rename {packages => src}/headless/converse-core.js (100%) rename {packages => src}/headless/converse-disco.js (100%) rename {packages => src}/headless/converse-mam.js (100%) rename {packages => src}/headless/converse-muc.js (100%) rename {packages => src}/headless/converse-ping.js (100%) rename {packages => src}/headless/converse-vcard.js (100%) rename {packages => src}/headless/headless.js (100%) rename {packages => src}/headless/i18n.js (100%) rename {packages => src}/headless/lodash.fp.js (100%) rename {packages => src}/headless/lodash.noconflict.js (100%) rename {packages => src}/headless/package.json (73%) rename {packages => src}/headless/polyfill.js (100%) rename {packages => src}/headless/templates/audio.html (100%) rename {packages => src}/headless/templates/field.html (100%) rename {packages => src}/headless/templates/file.html (100%) rename {packages => src}/headless/templates/form_captcha.html (100%) rename {packages => src}/headless/templates/form_checkbox.html (100%) rename {packages => src}/headless/templates/form_input.html (100%) rename {packages => src}/headless/templates/form_select.html (100%) rename {packages => src}/headless/templates/form_textarea.html (100%) rename {packages => src}/headless/templates/form_url.html (100%) rename {packages => src}/headless/templates/form_username.html (100%) rename {packages => src}/headless/templates/image.html (100%) rename {packages => src}/headless/templates/select_option.html (100%) rename {packages => src}/headless/templates/vcard.html (100%) rename {packages => src}/headless/templates/video.html (100%) rename {packages => src}/headless/utils/core.js (100%) rename {packages => src}/headless/utils/emoji.js (100%) rename {packages => src}/headless/utils/form.js (100%) rename {packages => src}/headless/utils/muc.js (100%) diff --git a/Makefile b/Makefile index 31b67e9af..36364497c 100644 --- a/Makefile +++ b/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 ' where 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 diff --git a/lerna.json b/lerna.json index 8909811f8..810d307bc 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,7 @@ { "packages": [ ".", - "packages/*" + "src/*" ], - "version": "4.0.2" + "version": "4.0.3" } diff --git a/package-lock.json b/package-lock.json index be8c9a045..d672e5dda 100644 --- a/package-lock.json +++ b/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": { diff --git a/package.json b/package.json index b00b4741f..49aa5c5c2 100644 --- a/package.json +++ b/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", diff --git a/packages/headless/3rdparty/lodash.fp.js b/src/headless/3rdparty/lodash.fp.js similarity index 100% rename from packages/headless/3rdparty/lodash.fp.js rename to src/headless/3rdparty/lodash.fp.js diff --git a/packages/headless/backbone.noconflict.js b/src/headless/backbone.noconflict.js similarity index 100% rename from packages/headless/backbone.noconflict.js rename to src/headless/backbone.noconflict.js diff --git a/packages/headless/converse-chatboxes.js b/src/headless/converse-chatboxes.js similarity index 100% rename from packages/headless/converse-chatboxes.js rename to src/headless/converse-chatboxes.js diff --git a/packages/headless/converse-core.js b/src/headless/converse-core.js similarity index 100% rename from packages/headless/converse-core.js rename to src/headless/converse-core.js diff --git a/packages/headless/converse-disco.js b/src/headless/converse-disco.js similarity index 100% rename from packages/headless/converse-disco.js rename to src/headless/converse-disco.js diff --git a/packages/headless/converse-mam.js b/src/headless/converse-mam.js similarity index 100% rename from packages/headless/converse-mam.js rename to src/headless/converse-mam.js diff --git a/packages/headless/converse-muc.js b/src/headless/converse-muc.js similarity index 100% rename from packages/headless/converse-muc.js rename to src/headless/converse-muc.js diff --git a/packages/headless/converse-ping.js b/src/headless/converse-ping.js similarity index 100% rename from packages/headless/converse-ping.js rename to src/headless/converse-ping.js diff --git a/packages/headless/converse-vcard.js b/src/headless/converse-vcard.js similarity index 100% rename from packages/headless/converse-vcard.js rename to src/headless/converse-vcard.js diff --git a/packages/headless/headless.js b/src/headless/headless.js similarity index 100% rename from packages/headless/headless.js rename to src/headless/headless.js diff --git a/packages/headless/i18n.js b/src/headless/i18n.js similarity index 100% rename from packages/headless/i18n.js rename to src/headless/i18n.js diff --git a/packages/headless/lodash.fp.js b/src/headless/lodash.fp.js similarity index 100% rename from packages/headless/lodash.fp.js rename to src/headless/lodash.fp.js diff --git a/packages/headless/lodash.noconflict.js b/src/headless/lodash.noconflict.js similarity index 100% rename from packages/headless/lodash.noconflict.js rename to src/headless/lodash.noconflict.js diff --git a/packages/headless/package.json b/src/headless/package.json similarity index 73% rename from packages/headless/package.json rename to src/headless/package.json index a64342090..2d72f536d 100644 --- a/packages/headless/package.json +++ b/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 ", - "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" } } diff --git a/packages/headless/polyfill.js b/src/headless/polyfill.js similarity index 100% rename from packages/headless/polyfill.js rename to src/headless/polyfill.js diff --git a/packages/headless/templates/audio.html b/src/headless/templates/audio.html similarity index 100% rename from packages/headless/templates/audio.html rename to src/headless/templates/audio.html diff --git a/packages/headless/templates/field.html b/src/headless/templates/field.html similarity index 100% rename from packages/headless/templates/field.html rename to src/headless/templates/field.html diff --git a/packages/headless/templates/file.html b/src/headless/templates/file.html similarity index 100% rename from packages/headless/templates/file.html rename to src/headless/templates/file.html diff --git a/packages/headless/templates/form_captcha.html b/src/headless/templates/form_captcha.html similarity index 100% rename from packages/headless/templates/form_captcha.html rename to src/headless/templates/form_captcha.html diff --git a/packages/headless/templates/form_checkbox.html b/src/headless/templates/form_checkbox.html similarity index 100% rename from packages/headless/templates/form_checkbox.html rename to src/headless/templates/form_checkbox.html diff --git a/packages/headless/templates/form_input.html b/src/headless/templates/form_input.html similarity index 100% rename from packages/headless/templates/form_input.html rename to src/headless/templates/form_input.html diff --git a/packages/headless/templates/form_select.html b/src/headless/templates/form_select.html similarity index 100% rename from packages/headless/templates/form_select.html rename to src/headless/templates/form_select.html diff --git a/packages/headless/templates/form_textarea.html b/src/headless/templates/form_textarea.html similarity index 100% rename from packages/headless/templates/form_textarea.html rename to src/headless/templates/form_textarea.html diff --git a/packages/headless/templates/form_url.html b/src/headless/templates/form_url.html similarity index 100% rename from packages/headless/templates/form_url.html rename to src/headless/templates/form_url.html diff --git a/packages/headless/templates/form_username.html b/src/headless/templates/form_username.html similarity index 100% rename from packages/headless/templates/form_username.html rename to src/headless/templates/form_username.html diff --git a/packages/headless/templates/image.html b/src/headless/templates/image.html similarity index 100% rename from packages/headless/templates/image.html rename to src/headless/templates/image.html diff --git a/packages/headless/templates/select_option.html b/src/headless/templates/select_option.html similarity index 100% rename from packages/headless/templates/select_option.html rename to src/headless/templates/select_option.html diff --git a/packages/headless/templates/vcard.html b/src/headless/templates/vcard.html similarity index 100% rename from packages/headless/templates/vcard.html rename to src/headless/templates/vcard.html diff --git a/packages/headless/templates/video.html b/src/headless/templates/video.html similarity index 100% rename from packages/headless/templates/video.html rename to src/headless/templates/video.html diff --git a/packages/headless/utils/core.js b/src/headless/utils/core.js similarity index 100% rename from packages/headless/utils/core.js rename to src/headless/utils/core.js diff --git a/packages/headless/utils/emoji.js b/src/headless/utils/emoji.js similarity index 100% rename from packages/headless/utils/emoji.js rename to src/headless/utils/emoji.js diff --git a/packages/headless/utils/form.js b/src/headless/utils/form.js similarity index 100% rename from packages/headless/utils/form.js rename to src/headless/utils/form.js diff --git a/packages/headless/utils/muc.js b/src/headless/utils/muc.js similarity index 100% rename from packages/headless/utils/muc.js rename to src/headless/utils/muc.js