From 4180d4bd28f2e5317e347b6262d58c0ed0c8b47f Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Mon, 14 Dec 2020 14:55:31 +0000 Subject: [PATCH] Tools: Allow publishing all lib packages to @joplin --- gulpfile.js | 10 +++++----- package.json | 2 +- packages/fork-htmlparser2/package-lock.json | 2 +- packages/fork-htmlparser2/package.json | 5 +++-- packages/fork-sax/package-lock.json | 2 +- packages/fork-sax/package.json | 5 +++-- packages/generator-joplin/package.json | 1 + packages/lib/package-lock.json | 2 +- packages/lib/package.json | 15 ++++++++------- packages/renderer/package-lock.json | 2 +- packages/renderer/package.json | 10 +++++----- packages/tools/package-lock.json | 2 +- packages/tools/package.json | 7 ++++--- packages/turndown-plugin-gfm/package-lock.json | 2 +- packages/turndown-plugin-gfm/package.json | 10 +++++++--- packages/turndown/package-lock.json | 2 +- packages/turndown/package.json | 10 +++++++--- 17 files changed, 51 insertions(+), 38 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 60bcced48e..7925460fb1 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -8,11 +8,11 @@ const tasks = { // deleteBuildDirs: require('./packages/tools/gulp/tasks/deleteBuildDirs'), completePublishAll: { fn: async () => { - await utils.execCommandVerbose('git pull'); - await utils.execCommandVerbose('git add -A'); - await utils.execCommandVerbose('git commit -m "Releasing sub-packages"'); - await utils.execCommandVerbose('lerna publish from-package -y'); - await utils.execCommandVerbose('git push'); + // await utils.execCommandVerbose('git pull'); + await utils.execCommandVerbose('git', ['add', '-A']); + await utils.execCommandVerbose('git', ['commit', '-m', 'Releasing sub-packages']); + await utils.execCommandVerbose('lerna', ['publish', 'from-package', '-y']); + await utils.execCommandVerbose('git', ['push']); }, }, }; diff --git a/package.json b/package.json index e9ce335508..dce6f36863 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "linter-precommit": "./node_modules/.bin/eslint --resolve-plugins-relative-to . --fix --ext .js --ext .jsx --ext .ts --ext .tsx", "linter": "./node_modules/.bin/eslint --resolve-plugins-relative-to . --fix --quiet --ext .js --ext .jsx --ext .ts --ext .tsx", "postinstall": "lerna bootstrap --no-ci && npm run tsc", - "publishAll": "git pull && lerna version --no-git-tag-version && gulp completePublishAll", + "publishAll": "git pull && lerna version --yes --no-private --no-git-tag-version && gulp completePublishAll", "releaseAndroid": "node packages/tools/release-android.js", "releaseCli": "node packages/tools/release-cli.js", "releaseClipper": "node packages/tools/release-clipper.js", diff --git a/packages/fork-htmlparser2/package-lock.json b/packages/fork-htmlparser2/package-lock.json index 0635c89914..963acacdfb 100644 --- a/packages/fork-htmlparser2/package-lock.json +++ b/packages/fork-htmlparser2/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/fork-htmlparser2", - "version": "4.1.8", + "version": "4.1.13", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/fork-htmlparser2/package.json b/packages/fork-htmlparser2/package.json index 7fbae12b7e..d70026c423 100644 --- a/packages/fork-htmlparser2/package.json +++ b/packages/fork-htmlparser2/package.json @@ -1,7 +1,7 @@ { "name": "@joplin/fork-htmlparser2", "description": "Fast & forgiving HTML/XML/RSS parser", - "version": "4.1.8", + "version": "4.1.13", "author": "Felix Boehm ", "publishConfig": { "access": "public" @@ -64,5 +64,6 @@ "license": "MIT", "prettier": { "tabWidth": 4 - } + }, + "gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2" } diff --git a/packages/fork-sax/package-lock.json b/packages/fork-sax/package-lock.json index 810f69e2f7..b922323a49 100644 --- a/packages/fork-sax/package-lock.json +++ b/packages/fork-sax/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/fork-sax", - "version": "1.2.12", + "version": "1.2.17", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/fork-sax/package.json b/packages/fork-sax/package.json index ebd054cce3..b3708b031e 100644 --- a/packages/fork-sax/package.json +++ b/packages/fork-sax/package.json @@ -2,7 +2,7 @@ "name": "@joplin/fork-sax", "description": "An evented streaming XML parser in JavaScript", "author": "Isaac Z. Schlueter (http://blog.izs.me/)", - "version": "1.2.12", + "version": "1.2.17", "main": "lib/sax.js", "publishConfig": { "access": "public" @@ -17,5 +17,6 @@ "devDependencies": { "standard": "^8.6.0", "tap": "^10.5.1" - } + }, + "gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2" } diff --git a/packages/generator-joplin/package.json b/packages/generator-joplin/package.json index 2aa6c2b8bc..4fcd4f15c7 100644 --- a/packages/generator-joplin/package.json +++ b/packages/generator-joplin/package.json @@ -3,6 +3,7 @@ "version": "1.5.0", "description": "Scaffolds out a new Joplin plugin", "homepage": "https://joplinapp.org", + "private": true, "author": { "name": "Laurent Cozic", "url": "https://joplinapp.org" diff --git a/packages/lib/package-lock.json b/packages/lib/package-lock.json index 86688487c4..32a5edd640 100644 --- a/packages/lib/package-lock.json +++ b/packages/lib/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/lib", - "version": "1.0.9", + "version": "1.0.14", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/lib/package.json b/packages/lib/package.json index 465eaf9a05..3fc85952d5 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/lib", - "version": "1.0.9", + "version": "1.0.14", "description": "Joplin Core library", "author": "Laurent Cozic", "homepage": "", @@ -22,11 +22,11 @@ "typescript": "^4.0.5" }, "dependencies": { - "@joplin/fork-htmlparser2": "^4.1.8", - "@joplin/fork-sax": "^1.2.12", - "@joplin/renderer": "^1.0.17", - "@joplin/turndown": "^4.0.30", - "@joplin/turndown-plugin-gfm": "^1.0.12", + "@joplin/fork-htmlparser2": "^4.1.13", + "@joplin/fork-sax": "^1.2.17", + "@joplin/renderer": "^1.0.22", + "@joplin/turndown": "^4.0.35", + "@joplin/turndown-plugin-gfm": "^1.0.17", "async-mutex": "^0.1.3", "aws-sdk": "^2.588.0", "base-64": "^0.1.0", @@ -79,5 +79,6 @@ "valid-url": "^1.0.9", "word-wrap": "^1.2.3", "xml2js": "^0.4.19" - } + }, + "gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2" } diff --git a/packages/renderer/package-lock.json b/packages/renderer/package-lock.json index 7250b6878a..46c3f16f2b 100644 --- a/packages/renderer/package-lock.json +++ b/packages/renderer/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/renderer", - "version": "1.0.17", + "version": "1.0.22", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/renderer/package.json b/packages/renderer/package.json index cba4e2ff98..56e291403f 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/renderer", - "version": "1.0.17", + "version": "1.0.22", "description": "The Joplin note renderer, used the mobile and desktop application", "repository": "https://github.com/laurent22/joplin/tree/dev/packages/renderer", "main": "index.js", @@ -10,7 +10,6 @@ }, "scripts": { "buildAssets": "node Tools/buildAssets.js", - "prepublishOnly": "npm run buildAssets", "tsc": "node node_modules/typescript/bin/tsc --project tsconfig.json", "watch": "node node_modules/typescript/bin/tsc --watch --project tsconfig.json", "test": "jest", @@ -19,13 +18,13 @@ "author": "", "license": "MIT", "devDependencies": { - "@types/node": "^14.14.6", "@types/jest": "^26.0.15", + "@types/node": "^14.14.6", "jest": "^26.6.3", "typescript": "^4.0.5" }, "dependencies": { - "@joplin/fork-htmlparser2": "^4.1.8", + "@joplin/fork-htmlparser2": "^4.1.13", "font-awesome-filetypes": "^2.1.0", "fs-extra": "^8.1.0", "highlight.js": "^10.2.1", @@ -48,5 +47,6 @@ "md5": "^2.2.1", "mermaid": "^8.8.4", "uslug": "git+https://github.com/laurent22/uslug.git#emoji-support" - } + }, + "gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2" } diff --git a/packages/tools/package-lock.json b/packages/tools/package-lock.json index 58addfa635..1d6fdff847 100644 --- a/packages/tools/package-lock.json +++ b/packages/tools/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/tools", - "version": "1.0.9", + "version": "1.0.14", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/tools/package.json b/packages/tools/package.json index 170c29cb41..9f73b7314c 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/tools", - "version": "1.0.9", + "version": "1.0.14", "description": "Various tools for Joplin", "main": "index.js", "author": "Laurent Cozic", @@ -16,7 +16,7 @@ }, "license": "MIT", "dependencies": { - "@joplin/lib": "^1.0.9", + "@joplin/lib": "^1.0.14", "execa": "^4.1.0", "fs-extra": "^4.0.3", "gettext-parser": "^1.3.0", @@ -37,5 +37,6 @@ "@types/node": "^14.14.6", "gulp": "^4.0.2", "sqlite3": "^5.0.0" - } + }, + "gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2" } diff --git a/packages/turndown-plugin-gfm/package-lock.json b/packages/turndown-plugin-gfm/package-lock.json index 3b4698c65c..aa2b5cbeb2 100644 --- a/packages/turndown-plugin-gfm/package-lock.json +++ b/packages/turndown-plugin-gfm/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/turndown-plugin-gfm", - "version": "1.0.12", + "version": "1.0.17", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/turndown-plugin-gfm/package.json b/packages/turndown-plugin-gfm/package.json index 9d60151e56..c7c492606e 100644 --- a/packages/turndown-plugin-gfm/package.json +++ b/packages/turndown-plugin-gfm/package.json @@ -1,7 +1,10 @@ { "name": "@joplin/turndown-plugin-gfm", "description": "Turndown plugin to add GitHub Flavored Markdown extensions.", - "version": "1.0.12", + "publishConfig": { + "access": "public" + }, + "version": "1.0.17", "author": "Dom Christie", "main": "lib/turndown-plugin-gfm.cjs.js", "module": "lib/turndown-plugin-gfm.es.js", @@ -38,6 +41,7 @@ "build-es": "rollup -c config/rollup.config.es.js && rollup -c config/rollup.config.browser.es.js", "build-iife": "rollup -c config/rollup.config.iife.js", "build-test": "browserify test/turndown-plugin-gfm-test.js --outfile test/turndown-plugin-gfm-test.browser.js", - "postinstall": "npm run build" - } + "prepare": "npm run build" + }, + "gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2" } diff --git a/packages/turndown/package-lock.json b/packages/turndown/package-lock.json index a68992ae2e..dec9291f63 100644 --- a/packages/turndown/package-lock.json +++ b/packages/turndown/package-lock.json @@ -1,6 +1,6 @@ { "name": "@joplin/turndown", - "version": "4.0.30", + "version": "4.0.35", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/turndown/package.json b/packages/turndown/package.json index 4131c13a9c..c0a8fcc6fa 100644 --- a/packages/turndown/package.json +++ b/packages/turndown/package.json @@ -1,11 +1,14 @@ { "name": "@joplin/turndown", "description": "A library that converts HTML to Markdown", - "version": "4.0.30", + "version": "4.0.35", "author": "Dom Christie", "main": "lib/turndown.cjs.js", "module": "lib/turndown.es.js", "jsnext:main": "lib/turndown.es.js", + "publishConfig": { + "access": "public" + }, "browser": { "jsdom": false }, @@ -45,6 +48,7 @@ "build-umd": "rollup -c config/rollup.config.umd.js && rollup -c config/rollup.config.browser.umd.js", "build-iife": "rollup -c config/rollup.config.iife.js", "build-test": "browserify test/turndown-test.js --outfile test/turndown-test.browser.js", - "postinstall": "npm run build" - } + "prepare": "npm run build" + }, + "gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2" }