diff --git a/scripts/release.sh b/scripts/release.sh index 77fcf77..0d891fb 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -13,6 +13,7 @@ INPUT_UI_DIR=${INPUT_DIR}/ui INPUT_JS_FILE=${INPUT_DIR}/diff2html.js INPUT_JS_UI_FILE=${INPUT_UI_DIR}/js/diff2html-ui.js INPUT_CSS_FILE=${INPUT_UI_DIR}/css/diff2html.css +INPUT_TYPINGS_D_TS_FILE=${INPUT_DIR}/diff2html.d.ts GENERATED_TEMPLATES_FILE=${INTPUT_TEMPLATES_DIR}/diff2html-templates.js @@ -23,6 +24,7 @@ OUTPUT_JS_UI_FILE=${OUTPUT_DIR}/diff2html-ui.js OUTPUT_MIN_JS_UI_FILE=${OUTPUT_DIR}/diff2html-ui.min.js OUTPUT_CSS_FILE=${OUTPUT_DIR}/diff2html.css OUTPUT_MIN_CSS_FILE=${OUTPUT_DIR}/diff2html.min.css +OUTPUT_TYPINGS_D_TS_FILE=${OUTPUT_DIR}/diff2html.d.ts echo "Creating diff2html release ..." @@ -49,4 +51,7 @@ browserify -e ${INPUT_JS_UI_FILE} -o ${OUTPUT_JS_UI_FILE} echo "Minifying ${OUTPUT_JS_UI_FILE} to ${OUTPUT_MIN_JS_UI_FILE}" uglifyjs ${OUTPUT_JS_UI_FILE} -c -o ${OUTPUT_MIN_JS_UI_FILE} +echo "Copying types ${INPUT_TYPINGS_D_TS_FILE} to ${OUTPUT_TYPINGS_D_TS_FILE}" +cp -f ${INPUT_TYPINGS_D_TS_FILE} ${OUTPUT_TYPINGS_D_TS_FILE} + echo "diff2html release created successfully!" diff --git a/typescript/diff2html.d.ts b/src/diff2html.d.ts similarity index 98% rename from typescript/diff2html.d.ts rename to src/diff2html.d.ts index 561a10c..cea93f6 100644 --- a/typescript/diff2html.d.ts +++ b/src/diff2html.d.ts @@ -9,6 +9,7 @@ declare namespace Diff2Html { inputFormat?: 'diff' | 'json'; outputFormat?: 'line-by-line' | 'side-by-side'; showFiles?: boolean; + diffStyle?: 'word' | 'char'; matching?: 'lines' | 'words' | 'none'; matchWordsThreshold?: number; matchingMaxComparisons?: number; diff --git a/typescript/diff2html-tests.ts b/typescript/diff2html-tests.ts deleted file mode 100644 index ad1f81f..0000000 --- a/typescript/diff2html-tests.ts +++ /dev/null @@ -1,26 +0,0 @@ -/// - -import Diff2Html = require('diff2html'); - -let d2h = Diff2Html.Diff2Html; - -class Diff2HtmlOptionsImpl implements Diff2Html.Options { - constructor (public inputFormat: 'diff' | 'json') { - } -} - -let strInput = - 'diff --git a/sample b/sample\n' + - 'index 0000001..0ddf2ba\n' + - '--- a/sample\n' + - '+++ b/sample\n' + - '@@ -1 +1 @@\n' + - '-test\n' + - '+test1r\n'; - -let strConfiguration = new Diff2HtmlOptionsImpl('diff'); -let diffInput = d2h.getJsonFromDiff(strInput, strConfiguration); - -let diffConfiguration = new Diff2HtmlOptionsImpl('json'); -let htmlString = d2h.getPrettyHtml(diffInput, diffConfiguration); -console.log(htmlString);