mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-30 10:36:35 +02:00
cb8dca747b
Refactor note editor using React Hooks and TypeScript and moved editor-specific code to separate files. Moved business logic into more maintainable custom hooks. Squashed commit of the following: commit f243d9bf89bdcfa1849ee26df5c0dd3e33405010 Author: Laurent Cozic <laurent@cozic.net> Date: Sat May 2 16:04:14 2020 +0100 Fixed saving issue commit 055f68d2e8b6cf6f130336c38ac2ab480887583d Author: Laurent Cozic <laurent@cozic.net> Date: Sat May 2 15:43:38 2020 +0100 Fixed HTML notes commit 99a3cf71f58d2fedcdf3001bf4110b6e8e3993da Merge: 9be85c45f2b16ebbbf7a
Author: Laurent Cozic <laurent@cozic.net> Date: Sat May 2 12:54:42 2020 +0100 Merge branch 'master' into refactor_note_text commit 9be85c45f23e5cb1ecd612b0ee631947871ada6f Author: Laurent Cozic <laurent@cozic.net> Date: Sat May 2 12:21:01 2020 +0100 Ident to space commit 848dde1869c010fe5851f493ef7287ada5f2991e Author: Laurent Cozic <laurent@cozic.net> Date: Sat May 2 11:28:50 2020 +0100 Refactor prop types commit 13c3bbe2b4f9a522ea3f8a25e7e5e7bb026dfd4f Author: Laurent Cozic <laurent@cozic.net> Date: Sat May 2 11:15:45 2020 +0100 Fixed resource loading issue commit 50cb38e3f00ef40ea8b6a468eadd66728a3ec332 Author: Laurent Cozic <laurent@cozic.net> Date: Fri May 1 23:46:58 2020 +0100 Fixed resource loading logic commit bc42ed03735f50c8394d597bb9e67312e55752fe Author: Laurent Cozic <laurent@cozic.net> Date: Fri May 1 23:08:41 2020 +0100 Various fixes commit 03c038e6d6cbde03bd474798b96c4eb120fd1647 Author: Laurent Cozic <laurent@cozic.net> Date: Wed Apr 29 23:22:49 2020 +0100 Fixed resource handling commit dc6c15302fac094c4e7dec5a20c9fcc4edb3d132 Author: Laurent Cozic <laurent@cozic.net> Date: Wed Apr 29 22:55:13 2020 +0100 Moved more code to files commit 398d5121e53df34de89b4148ef2cfd3a7bbe4feb Author: Laurent Cozic <laurent@cozic.net> Date: Wed Apr 29 00:22:43 2020 +0000 More fixes commit 3ebbb80147d7d502fd955776c7fedb743400597f Author: Laurent Cozic <laurent@cozic.net> Date: Wed Apr 29 00:12:44 2020 +0000 Various improvements and bug fixes commit 52a65ed3875e0709117ca93ba723e20624577d05 Author: Laurent Cozic <laurent@cozic.net> Date: Tue Apr 28 23:51:07 2020 +0000 Move more code to sub-files commit 33ccf530fb442d7ddae0852cbab2c335efdbbf33 Author: Laurent Cozic <laurent@cozic.net> Date: Tue Apr 28 23:25:12 2020 +0100 Moved code to sub-files commit ba3ad2cf9fcc1d7809df4afe93cd9737585a9960 Merge: 445acdab73150ee14de6
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Apr 28 22:28:56 2020 +0100 Merge branch 'master' into refactor_note_text commit 445acdab7368345369d7f69b9becd1e77c8383dc Author: Laurent Cozic <laurent@cozic.net> Date: Tue Apr 28 19:01:41 2020 +0100 Imported more code commit 772481d3a3ac7f0b0b00e86394c0f4fd2f3a9fa7 Author: Laurent Cozic <laurent@cozic.net> Date: Mon Apr 27 23:43:17 2020 +0000 Handle save/load state commit b3b92192ae3a1a30e3018810346cebfad47ac5e3 Author: Laurent Cozic <laurent@cozic.net> Date: Mon Apr 27 23:11:11 2020 +0000 Clean up and added back scroll commit 7a19ecfd0cb7fef1d58ece2e024099c7e40986da Author: Laurent Cozic <laurent@cozic.net> Date: Mon Apr 27 22:29:39 2020 +0100 More refactoring commit ac388afd381eaecfa4582b3566d032c9d953c4dc Author: Laurent Cozic <laurent@cozic.net> Date: Sun Apr 26 17:07:01 2020 +0100 Restored print commit 1d2c0ed389a5398dacc584d24922c5ea0dda861a Author: Laurent Cozic <laurent@cozic.net> Date: Sun Apr 26 12:03:15 2020 +0100 Put back search commit c618cb59d43fa3bb507dbd0b757b302ecfe907b3 Author: Laurent Cozic <laurent@cozic.net> Date: Sat Apr 25 18:21:11 2020 +0100 Restore scrolling behaviour commit 324e6ea79ebafab1d2bca246ef030751147a47eb Author: Laurent Cozic <laurent@cozic.net> Date: Sat Apr 25 10:22:31 2020 +0100 Simplified saving notes commit ef089aaf2289193bf275d94c1f2785f6d88657e4 Author: Laurent Cozic <laurent@cozic.net> Date: Sat Apr 25 10:12:16 2020 +0100 More refactoring commit 61b102307d5a98d2c1502d7bf073592da21af720 Author: Laurent Cozic <laurent@cozic.net> Date: Fri Apr 24 18:04:44 2020 +0100 Added back note revisions commit 7d5e3694d0df044b8493d9114e89e2d81c9b69ad Author: Laurent Cozic <laurent@cozic.net> Date: Thu Apr 23 22:51:52 2020 +0000 More note toolbar refactoring commit a56d58e7c80d91f29afadaffaaa004f3254482f7 Author: Laurent Cozic <laurent@cozic.net> Date: Thu Apr 23 20:54:37 2020 +0100 Finished toolbar refactoring commit 6c8ef9f44f880a9569eed5c54c9c47dca2251e5e Author: Laurent Cozic <laurent@cozic.net> Date: Thu Apr 23 19:17:44 2020 +0100 More refactoring commit 7de8057158a9256e2e0dcf948081e10a6a642216 Author: Laurent Cozic <laurent@cozic.net> Date: Wed Apr 22 23:48:42 2020 +0100 Started refactoring commands commit 177263c85e7d17d8ddc01b583738c2ab14b3acd7 Merge: f58f1a06e07ceb68d835
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Apr 22 20:26:19 2020 +0100 Merge branch 'master' into refactor_note_text commit f58f1a06e08b3cf80e2ac7a794b15f4b5caf8932 Author: Laurent Cozic <laurent@cozic.net> Date: Wed Apr 22 20:25:43 2020 +0100 Moving Ace Editor to separate component commit a83d3a220515137985c0f334f5848c91b8539138 Author: Laurent Cozic <laurent@cozic.net> Date: Mon Apr 20 20:33:21 2020 +0000 Cleaned up directory structure for note editor commit c6f2e609c9443bac21de5033bbedf86ac6f12cc0 Author: Laurent Cozic <laurent@cozic.net> Date: Mon Apr 20 19:23:06 2020 +0100 Added "note" menu to move note-related items to it commit 1219465318ae5a7a2c777ae2ec15d3357e1499df Author: Laurent Cozic <laurent@cozic.net> Date: Mon Apr 20 19:05:04 2020 +0100 Moved note related toolbar to separate component
197 lines
4.4 KiB
JavaScript
197 lines
4.4 KiB
JavaScript
const { CheckerPlugin } = require('awesome-typescript-loader');
|
|
const LiveReloadPlugin = require('webpack-livereload-plugin');
|
|
const path = require('path');
|
|
const swag = require('@ephox/swag');
|
|
|
|
module.exports = function(grunt) {
|
|
const packageData = grunt.file.readJSON('package.json');
|
|
const BUILD_VERSION = `${packageData.version}-${process.env.BUILD_NUMBER ? process.env.BUILD_NUMBER : '0'}`;
|
|
const libPluginPath = 'lib/Main.js';
|
|
const scratchPluginPath = 'scratch/compiled/joplinLists.js';
|
|
const scratchPluginMinPath = 'scratch/compiled/joplinLists.min.js';
|
|
const tsDemoSourceFile = path.resolve('src/demo/ts/Demo.ts');
|
|
const jsDemoDestFile = path.resolve('scratch/compiled/demo.js');
|
|
|
|
grunt.initConfig({
|
|
pkg: packageData,
|
|
|
|
clean: {
|
|
dirs: ['dist', 'scratch'],
|
|
},
|
|
|
|
// tslint: {
|
|
// options: {
|
|
// configuration: 'tslint.json'
|
|
// },
|
|
// plugin: ['src/**/*.ts']
|
|
// },
|
|
|
|
shell: {
|
|
command: 'tsc',
|
|
},
|
|
|
|
rollup: {
|
|
options: {
|
|
treeshake: true,
|
|
external: [
|
|
'tinymce/core/api/PluginManager',
|
|
'tinymce/core/api/util/Tools',
|
|
'tinymce/core/api/dom/BookmarkManager',
|
|
'tinymce/core/api/Editor',
|
|
'tinymce/core/api/dom/DOMUtils',
|
|
'tinymce/core/api/dom/RangeUtils',
|
|
'tinymce/core/api/dom/TreeWalker',
|
|
'tinymce/core/api/util/VK',
|
|
'tinymce/core/api/dom/DomQuery',
|
|
],
|
|
globals: {
|
|
'tinymce/core/api/PluginManager': 'tinymce.PluginManager',
|
|
'tinymce/core/api/util/Tools': 'tinymce.util.Tools',
|
|
'tinymce/core/api/dom/BookmarkManager': 'tinymce.dom.BookmarkManager',
|
|
'tinymce/core/api/Editor': 'tinymce.Editor',
|
|
'tinymce/core/api/dom/DOMUtils': 'tinymce.dom.DOMUtils',
|
|
'tinymce/core/api/dom/RangeUtils': 'tinymce.dom.RangeUtils',
|
|
'tinymce/core/api/dom/TreeWalker': 'tinymce.dom.TreeWalker',
|
|
'tinymce/core/api/util/VK': 'tinymce.util.VK',
|
|
'tinymce/core/api/dom/DomQuery': 'tinymce.dom.DomQuery',
|
|
},
|
|
format: 'iife',
|
|
onwarn: swag.onwarn,
|
|
plugins: [
|
|
swag.nodeResolve({
|
|
basedir: __dirname,
|
|
prefixes: {},
|
|
}),
|
|
swag.remapImports(),
|
|
],
|
|
},
|
|
plugin: {
|
|
files: [
|
|
{
|
|
src: libPluginPath,
|
|
dest: scratchPluginPath,
|
|
},
|
|
],
|
|
},
|
|
},
|
|
|
|
uglify: {
|
|
plugin: {
|
|
files: [
|
|
{
|
|
src: scratchPluginPath,
|
|
dest: scratchPluginMinPath,
|
|
},
|
|
],
|
|
},
|
|
},
|
|
|
|
concat: {
|
|
license: {
|
|
options: {
|
|
process: function(src) {
|
|
const buildSuffix = process.env.BUILD_NUMBER
|
|
? `-${process.env.BUILD_NUMBER}`
|
|
: '';
|
|
return src.replace(
|
|
/@BUILD_NUMBER@/g,
|
|
packageData.version + buildSuffix
|
|
);
|
|
},
|
|
},
|
|
// scratchPluginMinPath is used twice on purpose, all outputs will be minified for premium plugins
|
|
files: {
|
|
'dist/joplinLists.js': [
|
|
'src/text/license-header.js',
|
|
scratchPluginPath,
|
|
],
|
|
'dist/joplinLists.min.js': [
|
|
'src/text/license-header.js',
|
|
scratchPluginMinPath,
|
|
],
|
|
},
|
|
},
|
|
},
|
|
|
|
copy: {
|
|
css: {
|
|
files: [
|
|
// {
|
|
// cwd: 'src/text',
|
|
// src: ['license.txt'],
|
|
// dest: 'dist',
|
|
// expand: true,
|
|
// },
|
|
// { src: ['changelog.txt'], dest: 'dist', expand: true },
|
|
{
|
|
src: ['dist/joplinLists.js'],
|
|
dest: '../../../ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/plugins/lists.js',
|
|
},
|
|
],
|
|
},
|
|
},
|
|
|
|
webpack: {
|
|
options: {
|
|
mode: 'development',
|
|
watch: true,
|
|
},
|
|
dev: {
|
|
entry: tsDemoSourceFile,
|
|
devtool: 'source-map',
|
|
|
|
resolve: {
|
|
extensions: ['.ts', '.js'],
|
|
},
|
|
|
|
module: {
|
|
rules: [
|
|
{
|
|
test: /\.js$/,
|
|
use: ['source-map-loader'],
|
|
enforce: 'pre',
|
|
},
|
|
{
|
|
test: /\.ts$/,
|
|
use: [
|
|
{
|
|
loader: 'ts-loader',
|
|
options: {
|
|
transpileOnly: true,
|
|
experimentalWatchApi: true,
|
|
},
|
|
},
|
|
],
|
|
},
|
|
],
|
|
},
|
|
|
|
plugins: [new LiveReloadPlugin(), new CheckerPlugin()],
|
|
|
|
output: {
|
|
filename: path.basename(jsDemoDestFile),
|
|
path: path.dirname(jsDemoDestFile),
|
|
},
|
|
},
|
|
},
|
|
});
|
|
|
|
require('load-grunt-tasks')(grunt);
|
|
grunt.loadNpmTasks('@ephox/swag');
|
|
|
|
// grunt.registerTask('version', 'Creates a version file', function() {
|
|
// grunt.file.write('dist/version.txt', BUILD_VERSION);
|
|
// });
|
|
|
|
grunt.registerTask('default', [
|
|
'clean',
|
|
// 'tslint',
|
|
'shell',
|
|
'rollup',
|
|
'uglify',
|
|
'concat',
|
|
'copy',
|
|
// 'version',
|
|
]);
|
|
};
|