Change Typescript settings

gulpfile.ts

@@ -1,26 +1,17 @@
-// import * as fs from 'fs';
+/* tslint:disable:no-implicit-dependencies no-var-requires */
 import * as gulp from 'gulp';
 import * as ts from 'gulp-typescript';
 import * as uglify from 'gulp-uglify';
 import * as typescript from 'typescript';
-// import SimpleMDE from './src2/simplemde2';
-// import * as browserify from 'gulp'
-// import * as cleanCSS from 'gulp-clean-css';
-// import * as header from 'gulp-header';
-// import * as rename from 'gulp-rename';
-// import * as browserify from 'browserify';
-
-// var gulp = require('gulp'),
 const cleanCSS = require('gulp-clean-css');
-// uglify = require('gulp-uglify'),
+const concat = require('gulp-concat');
-const concat = require('gulp-concat'),
+const header = require('gulp-header');
-    header = require('gulp-header'),
+const buffer = require('vinyl-buffer');
-    buffer = require('vinyl-buffer'),
+const pkg = require('./package.json');
-    pkg = require('./package.json'),
+const eslint = require('gulp-eslint');
-    eslint = require('gulp-eslint'),
+const browserify = require('browserify');
-    browserify = require('browserify'),
+const source = require('vinyl-source-stream');
-    source = require('vinyl-source-stream'),
+const rename = require('gulp-rename');
-    rename = require('gulp-rename');
 
 const banner = ['/**',
     ' * <%= pkg.name %> v<%= pkg.version %>',
@@ -39,17 +30,6 @@ function lintJavascript() {
 
 gulp.task('lint', lintJavascript);
 
-function buildJavascript() {
-    return browserify({entries: './src/js/easymde.js', standalone: 'EasyMDE'}).bundle()
-        .pipe(source('easymde.min.js'))
-        .pipe(buffer())
-        .pipe(uglify())
-        .pipe(header(banner, {pkg}))
-        .pipe(gulp.dest('dist'));
-}
-
-gulp.task('scripts', gulp.series(lintJavascript, buildJavascript));
-
 function buildStyles() {
     const cssFiles = [
         './node_modules/codemirror/lib/codemirror.css',
@@ -66,10 +46,6 @@ function buildStyles() {
         .pipe(gulp.dest('dist'));
 }
 
-gulp.task('styles', buildStyles);
-
-gulp.task('default', gulp.parallel(buildStyles, buildJavascript));
-
 function compileTypescript() {
     let failed = false;
     const tsProject = ts.createProject('tsconfig.json', {typescript});
@@ -86,11 +62,8 @@ function compileTypescript() {
         .pipe(gulp.dest('build'));
 }
 
-function buildTypescript() {
+function buildBrowserModule() {
-    return browserify(['build/newmde.js'], {standalone: 'NewMDE'})
+    return browserify(['build/newmde.js'], {standalone: 'NewMDE', extensions: 'common-shakeify'})
-    // return browserify(['build/index.js'], {standalone: 'Test'})
-    // return browserify(['build/test.js'], {standalone: 'Test'})
-    // .plugin('tsify', {project: 'tsconfig.json'})
         .bundle()
         .pipe(source('newmde.min.js'))
         .pipe(buffer())
@@ -99,10 +72,9 @@ function buildTypescript() {
         .pipe(gulp.dest('dist'));
 }
 
-gulp.task('build', gulp.series(compileTypescript, buildTypescript));
+const buildScripts = gulp.series(compileTypescript, buildBrowserModule);
-// return browserify({entries: './src/js/easymde.js', standalone: 'EasyMDE'}).bundle()
+
-//     .pipe(source('easymde.min.js'))
+gulp.task('lint', lintJavascript);
-//     .pipe(buffer())
+gulp.task('styles', buildStyles);
-//     .pipe(uglify())
+gulp.task('scripts', buildScripts);
-//     .pipe(header(banner, {pkg}))
+gulp.task('default', gulp.parallel(buildStyles, buildScripts));
-//     .pipe(gulp.dest('./dist/'));

package.json

@@ -16,34 +16,37 @@
         "url": "https://github.com/ionaru/easy-markdown-editor/issues"
     },
     "dependencies": {
-        "codemirror": "^5.39.0",
+        "codemirror": "^5.43.0",
         "codemirror-spell-checker": "1.1.2",
-        "highlight.js": "^9.12.0",
+        "highlight.js": "^9.14.2",
-        "marked": "^0.4.0"
+        "marked": "^0.6.1"
     },
     "devDependencies": {
-        "@types/browserify": "^12.0.33",
+        "@types/browserify": "^12.0.36",
-        "@types/codemirror": "0.0.58",
+        "@types/codemirror": "0.0.72",
         "@types/gulp": "^4.0.5",
         "@types/gulp-concat": "0.0.32",
         "@types/gulp-rename": "0.0.33",
-        "@types/gulp-uglify": "^3.0.4",
+        "@types/gulp-uglify": "^3.0.6",
         "@types/highlight.js": "^9.12.2",
-        "@types/marked": "^0.4.0",
+        "@types/marked": "^0.6.1",
+        "@types/node": "^11.9.4",
         "@types/vinyl-buffer": "^1.0.0",
         "@types/vinyl-source-stream": "0.0.30",
-        "browserify": "^16.2.2",
+        "browserify": "^16.2.3",
+        "common-shakeify": "^0.5.3",
         "gulp": "^4.0.0",
-        "gulp-clean-css": "^3.9.4",
+        "gulp-clean-css": "^4.0.0",
         "gulp-concat": "^2.6.1",
         "gulp-eslint": "^5.0.0",
-        "gulp-header": "^2.0.5",
+        "gulp-header": "^2.0.7",
-        "gulp-rename": "^1.3.0",
+        "gulp-rename": "^1.4.0",
-        "gulp-typescript": "^5.0.0-alpha.3",
+        "gulp-terser": "^1.1.7",
-        "gulp-uglify": "^3.0.0",
+        "gulp-typescript": "^5.0.0",
-        "ts-node": "^7.0.0",
+        "gulp-uglify": "^3.0.1",
-        "tslint": "^5.10.0",
+        "ts-node": "^8.0.2",
-        "typescript": "^2.9.2",
+        "tslint": "^5.12.1",
+        "typescript": "^3.3.3",
         "vinyl-buffer": "^1.0.0",
         "vinyl-source-stream": "^2.0.0"
     },

src/js/codemirror/tablist.js

@@ -1,44 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-var CodeMirror = require('codemirror');
-
-CodeMirror.commands.tabAndIndentMarkdownList = function (cm) {
-    var ranges = cm.listSelections();
-    var pos = ranges[0].head;
-    var eolState = cm.getStateAfter(pos.line);
-    var inList = eolState.list !== false;
-
-    if (inList) {
-        cm.execCommand('indentMore');
-        return;
-    }
-
-    if (cm.options.indentWithTabs) {
-        cm.execCommand('insertTab');
-    }
-    else {
-        var spaces = Array(cm.options.tabSize + 1).join(' ');
-        cm.replaceSelection(spaces);
-    }
-};
-
-CodeMirror.commands.shiftTabAndUnindentMarkdownList = function (cm) {
-    var ranges = cm.listSelections();
-    var pos = ranges[0].head;
-    var eolState = cm.getStateAfter(pos.line);
-    var inList = eolState.list !== false;
-
-    if (inList) {
-        cm.execCommand('indentLess');
-        return;
-    }
-
-    if (cm.options.indentWithTabs) {
-        cm.execCommand('insertTab');
-    }
-    else {
-        var spaces = Array(cm.options.tabSize + 1).join(' ');
-        cm.replaceSelection(spaces);
-    }
-};

src/ts/newmde.ts

@@ -311,7 +311,7 @@ module.exports = class NewMDE {
     //     cm.refresh();
     // }
 
-    private static toggleBold(_editor: NewMDE) {
+    public static toggleBold(_editor: NewMDE) {
         console.log('Bold!');
         // _toggleBlock(editor, 'bold', editor.options.blockStyles.bold);
     }
@@ -348,6 +348,8 @@ module.exports = class NewMDE {
         editor.codemirror.execCommand('redo');
     }
 
+    // IconsSet ?
+
     private createToolBar(): HTMLDivElement {
         const defaultToolBarLayout: IToolBarButtonOptions[][] = [
             [{

tsconfig.json

@@ -7,27 +7,32 @@
         "strict": true,
         "noUnusedLocals": true,
         "noUnusedParameters": true,
-        "noImplicitAny": true,
         "noImplicitReturns": true,
-        "noImplicitThis": true,
         "noFallthroughCasesInSwitch": true,
+        "removeComments": true,
+        "resolveJsonModule": true,
         "lib": [
-            "es5",
+            "esnext",
-            "es6",
+            "es2018",
+            "es2017",
+            "es2016",
+            "es2015",
             "dom"
         ],
+        "module": "commonjs",
         "moduleResolution": "node",
         "outDir": "./dist",
+        "sourceMap": true,
         "target": "es5",
         "typeRoots": [
             "./node_modules/@types"
         ]
     },
     "exclude": [
-        "node_modules",
+        "./node_modules",
-        "src/**/*.spec.ts"
+        "./src/**/*.spec.ts"
     ],
     "include": [
-        "src/**/*.ts"
+        "./src/**/*.ts"
     ]
 }

tslint.json

@@ -8,6 +8,8 @@
             true,
             140
         ],
+        "no-console": false,
+        "no-null-keyword": true,
         "no-unused-expression": [
             true,
             "allow-new"
@@ -28,10 +30,6 @@
             "ban-keywords",
             "check-format",
             "allow-leading-underscore"
-        ],
-        "no-submodule-imports": [
-            true,
-            "codemirror/addon"
         ]
     }
 }