Remove Lerna and bump Node version.

Lerna doesn't seem to be needed anymore, NPM workspaces functionality suffices.
This commit is contained in:
JC Brand 2023-06-09 11:19:23 +02:00
parent abad4d054b
commit 975a2c2305
6 changed files with 15 additions and 19392 deletions

2
.nvmrc
View File

@ -1 +1 @@
v16.13.1 v18.15.0

View File

@ -8,7 +8,6 @@ HTTPSERVE_PORT ?= 8000
INKSCAPE ?= inkscape INKSCAPE ?= inkscape
INSTALL ?= install INSTALL ?= install
JSDOC ?= ./node_modules/.bin/jsdoc JSDOC ?= ./node_modules/.bin/jsdoc
LERNA ?= ./node_modules/.bin/lerna
OXIPNG ?= oxipng OXIPNG ?= oxipng
PAPER = PAPER =
RJS ?= ./node_modules/.bin/r.js RJS ?= ./node_modules/.bin/r.js
@ -118,9 +117,6 @@ deploy:
######################################################################## ########################################################################
## Install dependencies ## Install dependencies
$(LERNA):
npm install lerna
${NVM_DIR}/nvm.sh: ${NVM_DIR}/nvm.sh:
wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash
source ~/.bashrc source ~/.bashrc
@ -135,8 +131,7 @@ node: .nvmrc
package-lock.json: package.json package-lock.json: package.json
npm install npm install
node_modules: $(LERNA) package.json package-lock.json src/headless/package.json src/headless/package-lock.json node_modules: package.json package-lock.json src/headless/package.json src/headless/package-lock.json
npm run lerna
.PHONY: clean .PHONY: clean
clean: clean:

View File

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

19374
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -35,9 +35,7 @@
"dev": "webpack --config webpack/webpack.build.js --mode=development", "dev": "webpack --config webpack/webpack.build.js --mode=development",
"headless": "webpack --config webpack/webpack.headless.js", "headless": "webpack --config webpack/webpack.headless.js",
"headless-dev": "webpack --config webpack/webpack.headless.js --mode=development", "headless-dev": "webpack --config webpack/webpack.headless.js --mode=development",
"lerna": "lerna bootstrap --hoist --ignore-scripts",
"nodeps": "webpack --config webpack/webpack.nodeps.js", "nodeps": "webpack --config webpack/webpack.nodeps.js",
"prepare": "npm run lerna && npm run build",
"serve": "webpack serve --config webpack/webpack.serve.js", "serve": "webpack serve --config webpack/webpack.serve.js",
"watch": "webpack --watch --config webpack/webpack.build.js --mode=development", "watch": "webpack --watch --config webpack/webpack.build.js --mode=development",
"types": "tsc --declaration --emitDeclarationOnly --allowJs", "types": "tsc --declaration --emitDeclarationOnly --allowJs",
@ -92,7 +90,6 @@
"karma-jasmine": "^5.0.0", "karma-jasmine": "^5.0.0",
"karma-jasmine-html-reporter": "^2.0.0", "karma-jasmine-html-reporter": "^2.0.0",
"karma-webpack": "^5.0.0", "karma-webpack": "^5.0.0",
"lerna": "^6.0.1",
"mini-css-extract-plugin": "^2.6.0", "mini-css-extract-plugin": "^2.6.0",
"minimist": "^1.2.6", "minimist": "^1.2.6",
"po-loader": "0.7.0", "po-loader": "0.7.0",
@ -106,6 +103,7 @@
"tsc": "^2.0.4", "tsc": "^2.0.4",
"typescript": "^4.9.5", "typescript": "^4.9.5",
"typescript-eslint-parser": "^22.0.0", "typescript-eslint-parser": "^22.0.0",
"uglify-js": "^3.17.4",
"webpack": "^5.72.0", "webpack": "^5.72.0",
"webpack-cli": "^5.1.4", "webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.8.1", "webpack-dev-server": "^4.8.1",

View File

@ -2,11 +2,10 @@
"name": "@converse/headless", "name": "@converse/headless",
"version": "10.1.2", "version": "10.1.2",
"description": "Converse.js Headless build", "description": "Converse.js Headless build",
"author": { "author": "JC Brand <jc@opkode.com>",
"name": "JC Brand", "contributors": [
"email": "jc@opkode.com" "cmrd Senya <senya@riseup.net>"
}, ],
"contributors": ["cmrd Senya <senya@riseup.net>"],
"homepage": "https://conversejs.org", "homepage": "https://conversejs.org",
"license": "MPL-2.0", "license": "MPL-2.0",
"main": "dist/converse-headless.js", "main": "dist/converse-headless.js",
@ -31,7 +30,6 @@
"bugs": { "bugs": {
"url": "https://github.com/conversejs/converse.js/issues" "url": "https://github.com/conversejs/converse.js/issues"
}, },
"gitHead": "9641dcdc820e029b05930479c242d2b707bbe8e2",
"dependencies": { "dependencies": {
"@converse/openpromise": "^0.0.1", "@converse/openpromise": "^0.0.1",
"@converse/skeletor": "0.0.8", "@converse/skeletor": "0.0.8",
@ -45,5 +43,6 @@
"sprintf-js": "^1.1.2", "sprintf-js": "^1.1.2",
"strophe.js": "1.6.0", "strophe.js": "1.6.0",
"urijs": "^1.19.10" "urijs": "^1.19.10"
} },
"devDependencies": {}
} }