From 0370ced93fadd8f7930854901fb4dac229abe350 Mon Sep 17 00:00:00 2001 From: cmrd Senya Date: Sun, 7 Oct 2018 17:44:43 +0300 Subject: [PATCH] Init project with lerna --- Makefile | 33 +++++++++++++++++++-------------- lerna.json | 7 +++++++ package.json | 1 + 3 files changed, 27 insertions(+), 14 deletions(-) create mode 100644 lerna.json diff --git a/Makefile b/Makefile index 9b472d925..31b67e9af 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # You can set these variables from the command line. BABEL ?= node_modules/.bin/babel -BOOTSTRAP = ./node_modules/ -BOURBON = ./node_modules/bourbon/app/assets/stylesheets/ +BOOTSTRAP = ./node_modules/ +BOURBON = ./node_modules/bourbon/app/assets/stylesheets/ BUILDDIR = ./docs BUNDLE ?= ./.bundle/bin/bundle CHROMIUM ?= ./node_modules/.bin/run-headless-chromium @@ -11,6 +11,7 @@ HTTPSERVE ?= ./node_modules/.bin/http-server HTTPSERVE_PORT ?= 8000 INKSCAPE ?= inkscape JSDOC ?= ./node_modules/.bin/jsdoc +LERNA ?= ./node_modules/.bin/lerna OXIPNG ?= oxipng PAPER = PO2JSON ?= ./node_modules/.bin/po2json @@ -23,7 +24,7 @@ SPHINXOPTS = UGLIFYJS ?= node_modules/.bin/uglifyjs -# In the case user wishes to use RVM +# In the case user wishes to use RVM USE_RVM ?= false RVM_RUBY_VERSION ?= 2.4.2 ifeq ($(USE_RVM),true) @@ -61,7 +62,7 @@ help: ## Miscellaneous .PHONY: serve -serve: dev +serve: dev $(HTTPSERVE) -p $(HTTPSERVE_PORT) -c-1 .PHONY: serve_bg @@ -108,8 +109,11 @@ release: ######################################################################## ## Install dependencies -stamp-npm: package.json package-lock.json - npm install +$(LERNA): + npm install lerna + +stamp-npm: $(LERNA) package.json package-lock.json packages/headless/package.json + $(LERNA) bootstrap --hoist touch stamp-npm stamp-bundler: Gemfile @@ -186,21 +190,22 @@ BUILDS = dist/converse.js \ dist/converse-no-dependencies.js \ dist/converse-no-dependencies-es2015.js -dist/converse.js: src webpack.config.js stamp-npm +dist/converse.js: src webpack.config.js stamp-npm @converse/headless ./node_modules/.bin/npx webpack --mode=development -dist/converse.min.js: src webpack.config.js stamp-npm +dist/converse.min.js: src webpack.config.js stamp-npm @converse/headless ./node_modules/.bin/npx webpack --mode=production -dist/converse-headless.js: src webpack.config.js stamp-npm +dist/converse-headless.js: src webpack.config.js stamp-npm @converse/headless ./node_modules/.bin/npx webpack --mode=development --type=headless -dist/converse-headless.min.js: src webpack.config.js stamp-npm +dist/converse-headless.min.js: src webpack.config.js stamp-npm @converse/headless ./node_modules/.bin/npx webpack --mode=production --type=headless -dist/converse-no-dependencies.js: src webpack.config.js stamp-npm +dist/converse-no-dependencies.js: src webpack.config.js stamp-npm @converse/headless ./node_modules/.bin/npx webpack --mode=development --type=nodeps -dist/converse-no-dependencies.min.js: src webpack.config.js stamp-npm - ./node_modules/.bin/npx webpack --mode=production --type=nodeps -dist/converse-no-dependencies-es2015.js: src webpack.config.js stamp-npm +dist/converse-no-dependencies.min.js: src webpack.config.js stamp-npm @converse/headless + ./node_modules/.bin/npx webpack --mode=production --type=nodeps +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 .PHONY: dist dist:: build diff --git a/lerna.json b/lerna.json new file mode 100644 index 000000000..8909811f8 --- /dev/null +++ b/lerna.json @@ -0,0 +1,7 @@ +{ + "packages": [ + ".", + "packages/*" + ], + "version": "4.0.2" +} diff --git a/package.json b/package.json index 4ab87ba3f..75e90b1b6 100644 --- a/package.json +++ b/package.json @@ -63,6 +63,7 @@ "jquery": "3.2.1", "jsdoc": "^3.5.5", "jshint": "^2.9.4", + "lerna": "^3.4.3", "lodash": "4.17.10", "lodash-template-loader": "^2.0.0", "lodash-template-webpack-loader": "jcbrand/lodash-template-webpack-loader",