All: Use Lerna to manage monorepo

release_clipper
Laurent Cozic 2020-11-05 16:58:23 +00:00
parent 122f20905c
commit cc07016b07
2840 changed files with 54220 additions and 16114 deletions

File diff suppressed because it is too large Load Diff

1564
.gitignore vendored

File diff suppressed because it is too large Load Diff

1490
.ignore

File diff suppressed because it is too large Load Diff

View File

@ -61,21 +61,18 @@ script:
- | - |
# Install tools # Install tools
npm install npm install
cd Tools
npm install
cd ..
# Run test units. # Run test units.
# Only do it for pull requests because Travis randomly fails to run them # Only do it for pull requests because Travis randomly fails to run them
# and that would break the desktop release. # and that would break the desktop release.
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
cd CliClient cd packages/app-cli
npm run test-ci npm run test-ci
testResult=$? testResult=$?
if [ $testResult -ne 0 ]; then if [ $testResult -ne 0 ]; then
exit $testResult exit $testResult
fi fi
cd .. cd ../..
fi fi
# Run linter for pull requests only - this is so that # Run linter for pull requests only - this is so that
@ -93,7 +90,7 @@ script:
# tool like poedit. Doing it for Linux only is sufficient. # tool like poedit. Doing it for Linux only is sufficient.
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
if [ "$TRAVIS_OS_NAME" != "osx" ]; then if [ "$TRAVIS_OS_NAME" != "osx" ]; then
node Tools/validate-translation.js node packages/tools/validate-translation.js
testResult=$? testResult=$?
if [ $testResult -ne 0 ]; then if [ $testResult -ne 0 ]; then
exit $testResult exit $testResult
@ -102,7 +99,7 @@ script:
fi fi
# Find out if we should run the build or not. Electron-builder gets stuck when # Find out if we should run the build or not. Electron-builder gets stuck when
# builing PRs so we disable it in this case. The Linux build should provide # building PRs so we disable it in this case. The Linux build should provide
# enough info if the app builds or not. # enough info if the app builds or not.
# https://github.com/electron-userland/electron-builder/issues/4263 # https://github.com/electron-userland/electron-builder/issues/4263
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
@ -112,5 +109,5 @@ script:
fi fi
# Prepare the Electron app and build it # Prepare the Electron app and build it
cd ElectronClient cd packages/app-desktop
USE_HARD_LINKS=false npm run dist USE_HARD_LINKS=false npm run dist

View File

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

View File

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View File

Before

Width:  |  Height:  |  Size: 480 B

After

Width:  |  Height:  |  Size: 480 B

View File

Before

Width:  |  Height:  |  Size: 855 B

After

Width:  |  Height:  |  Size: 855 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 300 KiB

After

Width:  |  Height:  |  Size: 48 KiB

View File

Before

Width:  |  Height:  |  Size: 97 KiB

After

Width:  |  Height:  |  Size: 97 KiB

View File

@ -13,7 +13,7 @@ gulp.task('icon-packager', function() {
}); });
gulp.task('deploy', function() { gulp.task('deploy', function() {
fs.copyFileSync(`${__dirname}/dist/icons/Joplin/icons.js`, `${__dirname}/../../../ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/icons.js`); fs.copyFileSync(`${__dirname}/dist/icons/Joplin/icons.js`, `${__dirname}/../../../packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/icons.js`);
return Promise.resolve(); return Promise.resolve();
}); });

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@ -27,7 +27,7 @@ module.exports = function(grunt) {
// }, // },
shell: { shell: {
command: 'tsc', command: 'tsc --project tsconfig.json',
}, },
rollup: { rollup: {
@ -125,7 +125,7 @@ module.exports = function(grunt) {
// { src: ['changelog.txt'], dest: 'dist', expand: true }, // { src: ['changelog.txt'], dest: 'dist', expand: true },
{ {
src: ['dist/joplinLists.js'], src: ['dist/joplinLists.js'],
dest: '../../../ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/plugins/lists.js', dest: '../../../packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/plugins/lists.js',
}, },
], ],
}, },

View File

@ -1,11 +1,13 @@
# TinyMCE Joplin Lists Plugin # TinyMCE Joplin Lists Plugin
**As of 2020-11-02 this module no longer builds (a ton of TypeScript errors). No idea why since nothing was changed but should be investigated if modifying this plugin is ever needed.**
This is based on https://github.com/tinymce/tinymce/tree/59748a11303fb7cf00fdb8c9392dcb082ee9d965/modules/tinymce/src/plugins/lists This is based on https://github.com/tinymce/tinymce/tree/59748a11303fb7cf00fdb8c9392dcb082ee9d965/modules/tinymce/src/plugins/lists
But with support for Joplin checkboxes. But with support for Joplin checkboxes.
## Building ## Building
Use `npm i && npm run build` to build the plugin, which will also copy the compiled version to the right ElectronClient sub-directory. Use `npm i && npm run build` to build the plugin, which will also copy the compiled version to the right packages/app-desktop sub-directory.
To test the plugin, use `npm run buildAndStart`, which will build the plugin and start the desktop application. To test the plugin, use `npm run buildAndStart`, which will build the plugin and start the desktop application.

View File

@ -9,7 +9,7 @@
"test": "bedrock-auto -b phantomjs -d src/test/ts/", "test": "bedrock-auto -b phantomjs -d src/test/ts/",
"test-manual": "bedrock -d src/test/ts/", "test-manual": "bedrock -d src/test/ts/",
"start": "grunt webpack", "start": "grunt webpack",
"buildAndStart": "yarn build && cd .. && cd .. && cd .. && cd ElectronClient && npm start" "buildAndStart": "yarn build && cd .. && cd .. && cd .. && cd packages/app-desktop && npm start"
}, },
"keywords": [], "keywords": [],
"author": "Tiny Technologies Inc.", "author": "Tiny Technologies Inc.",

View File

@ -48,7 +48,7 @@ const listState = function (editor: Editor, listName, options:any = {}) {
// dependent on how the checkbox is styled, so if the style is changed, this might need // dependent on how the checkbox is styled, so if the style is changed, this might need
// to be updated too. // to be updated too.
// For the styling, see: // For the styling, see:
// ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.ts // packages/app-mobile/lib/joplin-renderer/MdToHtml/rules/checkbox.ts
// //
// The previous solution was to use "pointer-event: none", which mostly work, however // The previous solution was to use "pointer-event: none", which mostly work, however
// it means that links are no longer clickable when they are within the checkbox label. // it means that links are no longer clickable when they are within the checkbox label.

Some files were not shown because too many files have changed in this diff Show More