Browse Source

Remove Lerna and bump Node version.

Lerna doesn't seem to be needed anymore, NPM workspaces functionality suffices.
JC Brand 2 năm trước cách đây
mục cha
commit
975a2c2305
6 tập tin đã thay đổi với 362 bổ sung493 xóa
  1. 1 1
      .nvmrc
  2. 1 6
      Makefile
  3. 0 7
      lerna.json
  4. 353 469
      package-lock.json
  5. 1 3
      package.json
  6. 6 7
      src/headless/package.json

+ 1 - 1
.nvmrc

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

+ 1 - 6
Makefile

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

+ 0 - 7
lerna.json

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

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 353 - 469
package-lock.json


+ 1 - 3
package.json

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

+ 6 - 7
src/headless/package.json

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

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác