diff --git a/package.json b/package.json index 7776e9e0ac..282d93ecc3 100644 --- a/package.json +++ b/package.json @@ -7,24 +7,25 @@ }, "license": "MIT", "scripts": { - "linter": "./node_modules/.bin/eslint --resolve-plugins-relative-to . --fix --quiet --ext .js --ext .jsx --ext .ts --ext .tsx", - "linter-precommit": "./node_modules/.bin/eslint --resolve-plugins-relative-to . --fix --ext .js --ext .jsx --ext .ts --ext .tsx", - "linter-ci": "./node_modules/.bin/eslint --resolve-plugins-relative-to . --quiet --ext .js --ext .jsx --ext .ts --ext .tsx", - "postinstall": "lerna bootstrap --no-ci && npm run tsc", - "tsc": "lerna run tsc --stream --parallel", - "watch": "lerna run watch --stream --parallel", - "updateIgnored": "gulp updateIgnoredTypeScriptBuild", - "buildPluginDoc": "typedoc --name 'Joplin Plugin API Documentation' --mode file -theme './Assets/PluginDocTheme/' --readme './Assets/PluginDocTheme/index.md' --excludeNotExported --excludeExternals --excludePrivate --excludeProtected --out docs/api/references/plugin_api packages/lib/services/plugins/api/", "buildApiDoc": "npm start --prefix=packages/app-cli -- apidoc ../../readme/api/references/rest_api.md", + "buildPluginDoc": "typedoc --name 'Joplin Plugin API Documentation' --mode file -theme './Assets/PluginDocTheme/' --readme './Assets/PluginDocTheme/index.md' --excludeNotExported --excludeExternals --excludePrivate --excludeProtected --out docs/api/references/plugin_api packages/lib/services/plugins/api/", "buildWebsite": "npm run buildApiDoc && node ./packages/tools/build-website.js && npm run buildPluginDoc", - "generatePluginTypes": "rm -rf ./plugin_types && node node_modules/typescript/bin/tsc --declaration --declarationDir ./plugin_types --project tsconfig.json", - "setupNewRelease": "node ./packages/tools/setupNewRelease", "clean": "lerna clean -y && lerna run clean", + "generatePluginTypes": "rm -rf ./plugin_types && node node_modules/typescript/bin/tsc --declaration --declarationDir ./plugin_types --project tsconfig.json", "linkChecker": "linkchecker https://joplinapp.org", - "releaseDesktop": "node packages/tools/release-electron.js", + "linter-ci": "./node_modules/.bin/eslint --resolve-plugins-relative-to . --quiet --ext .js --ext .jsx --ext .ts --ext .tsx", + "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", "releaseAndroid": "node packages/tools/release-android.js", "releaseCli": "node packages/tools/release-cli.js", - "publishAll": "git pull && lerna version --no-git-tag-version && gulp completePublishAll" + "releaseClipper": "node packages/tools/release-clipper.js", + "releaseDesktop": "node packages/tools/release-electron.js", + "setupNewRelease": "node ./packages/tools/setupNewRelease", + "tsc": "lerna run tsc --stream --parallel", + "updateIgnored": "gulp updateIgnoredTypeScriptBuild", + "watch": "lerna run watch --stream --parallel" }, "husky": { "hooks": { diff --git a/packages/app-clipper/manifest.json b/packages/app-clipper/manifest.json index 9f12af450a..7a0239056f 100644 --- a/packages/app-clipper/manifest.json +++ b/packages/app-clipper/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Joplin Web Clipper [DEV]", - "version": "1.4.0", + "version": "1.4.2", "description": "Capture and save web pages and screenshots from your browser to Joplin.", "homepage_url": "https://joplinapp.org", "content_security_policy": "script-src 'self'; object-src 'self'", diff --git a/packages/app-clipper/package.json b/packages/app-clipper/package.json index 6f224239b6..6e8048bcc6 100644 --- a/packages/app-clipper/package.json +++ b/packages/app-clipper/package.json @@ -1,6 +1,9 @@ { "name": "@joplinapp/app-clipper", "private": true, + "scripts": { + "postinstall": "cd popup && npm install" + }, "version": "1.0.8", "description": "Joplin Web Clipper", "main": "main.js", diff --git a/packages/tools/release-clipper.js b/packages/tools/release-clipper.js index b4d0ce380c..f414ba12a4 100644 --- a/packages/tools/release-clipper.js +++ b/packages/tools/release-clipper.js @@ -1,9 +1,9 @@ const fs = require('fs-extra'); -const { execCommand } = require('./tool-utils.js'); +const { execCommand, rootDir } = require('./tool-utils.js'); const md5File = require('md5-file/promise'); const glob = require('glob'); -const clipperDir = `${__dirname}/../packages/app-clipper`; +const clipperDir = `${rootDir}/packages/app-clipper`; const tmpSourceDirName = 'Clipper-source'; async function copyDir(baseSourceDir, sourcePath, baseDestDir) {