From 57461637c00e870237b8d50a5b6bfcd435c7e495 Mon Sep 17 00:00:00 2001 From: Michael Soprano <miccighel@gmail.com> Date: Mon, 2 Aug 2021 15:38:47 +0200 Subject: [PATCH 1/3] Fixed path to Library module, ts-node changed to devDependency Once added using Yarn to a node-based project, the compilation step were crashing due to an error in path. --- lib/index.d.ts | 2 +- lib/index.js | 2 +- package.json | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/index.d.ts b/lib/index.d.ts index 20df104..e070649 100644 --- a/lib/index.d.ts +++ b/lib/index.d.ts @@ -1,4 +1,4 @@ -import { doHighlight, deserializeHighlights, serializeHighlights, removeHighlights, createWrapper, highlightRange } from "../src/Library"; +import { doHighlight, deserializeHighlights, serializeHighlights, removeHighlights, createWrapper, highlightRange } from "./Library"; import { TextHighlighter } from "./TextHighlighter"; import { optionsImpl } from "./types"; export { doHighlight, deserializeHighlights, serializeHighlights, removeHighlights, optionsImpl, createWrapper, highlightRange, TextHighlighter }; diff --git a/lib/index.js b/lib/index.js index 42d3469..0db0aeb 100644 --- a/lib/index.js +++ b/lib/index.js @@ -1,7 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.TextHighlighter = exports.highlightRange = exports.createWrapper = exports.optionsImpl = exports.removeHighlights = exports.serializeHighlights = exports.deserializeHighlights = exports.doHighlight = void 0; -var Library_1 = require("../src/Library"); +var Library_1 = require("./Library"); Object.defineProperty(exports, "doHighlight", { enumerable: true, get: function () { return Library_1.doHighlight; } }); Object.defineProperty(exports, "deserializeHighlights", { enumerable: true, get: function () { return Library_1.deserializeHighlights; } }); Object.defineProperty(exports, "serializeHighlights", { enumerable: true, get: function () { return Library_1.serializeHighlights; } }); diff --git a/package.json b/package.json index d255b42..5b3fac1 100644 --- a/package.json +++ b/package.json @@ -57,9 +57,7 @@ "ts-jest": "^26.1.1", "ts-loader": "^8.0.9", "tsify": "^5.0.2", - "typescript": "^4.0.5" - }, - "dependencies": { + "typescript": "^4.0.5", "ts-node": "^10.1.0" }, "directories": { From 81d109e8f7f9bffe44121486828757d5a991f1fc Mon Sep 17 00:00:00 2001 From: lastlink <theefunk@gmail.com> Date: Mon, 2 Aug 2021 16:47:20 -0400 Subject: [PATCH 2/3] replace path in build --- .gitignore | 1 + CHANGELOG.md | 8 ++- build/replace.js | 23 +++++++ dist/TextHighlighter.js | 4 +- lib/index.d.ts | 2 +- lib/index.js | 2 +- package-lock.json | 147 +++++++++++++++++++++++++++++++++++++++- package.json | 7 +- 8 files changed, 185 insertions(+), 9 deletions(-) create mode 100644 build/replace.js diff --git a/.gitignore b/.gitignore index f5730e3..9e9b122 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ coverage junit.xml yarn.lock +.DS_Store diff --git a/CHANGELOG.md b/CHANGELOG.md index 59a19ba..6a6237a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. -## 2.1.1 (2021-07-01) +## 2.1.1 (2021-08-02) + +### Bug Fixes + +* fix relative paths + +## 2.1.1 (2021-07-30) ### Bug Fixes diff --git a/build/replace.js b/build/replace.js new file mode 100644 index 0000000..e083474 --- /dev/null +++ b/build/replace.js @@ -0,0 +1,23 @@ +/* + +dist/TextHighlighter.js +lib/index.d.ts + +replace ../src/Library - ./Library +*/ + +const replace = require('replace-in-file'); +const options = { + files: ['./dist/TextHighlighter.js', + './lib/*'], + from: /\.\.\/src\/Library/g, + to: './Library', +}; + +try { + const results = replace.sync(options); + console.log('Replacement results:', results); +} +catch (error) { + console.error('Error occurred:', error); +} \ No newline at end of file diff --git a/dist/TextHighlighter.js b/dist/TextHighlighter.js index 9ce7ed0..e7b6ef4 100644 --- a/dist/TextHighlighter.js +++ b/dist/TextHighlighter.js @@ -1079,7 +1079,7 @@ exports.sortByDepth = sortByDepth; "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.TextHighlighter = exports.highlightRange = exports.createWrapper = exports.optionsImpl = exports.removeHighlights = exports.serializeHighlights = exports.deserializeHighlights = exports.doHighlight = void 0; -var Library_1 = require("../src/Library"); +var Library_1 = require("./Library"); Object.defineProperty(exports, "doHighlight", { enumerable: true, get: function () { return Library_1.doHighlight; } }); Object.defineProperty(exports, "deserializeHighlights", { enumerable: true, get: function () { return Library_1.deserializeHighlights; } }); Object.defineProperty(exports, "serializeHighlights", { enumerable: true, get: function () { return Library_1.serializeHighlights; } }); @@ -1091,7 +1091,7 @@ Object.defineProperty(exports, "TextHighlighter", { enumerable: true, get: funct var types_1 = require("./types"); Object.defineProperty(exports, "optionsImpl", { enumerable: true, get: function () { return types_1.optionsImpl; } }); -},{"../src/Library":2,"./TextHighlighter":3,"./types":6}],6:[function(require,module,exports){ +},{"./Library":2,"./TextHighlighter":3,"./types":6}],6:[function(require,module,exports){ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.paramsImp = exports.optionsImpl = exports.highlightI = void 0; diff --git a/lib/index.d.ts b/lib/index.d.ts index 20df104..e070649 100644 --- a/lib/index.d.ts +++ b/lib/index.d.ts @@ -1,4 +1,4 @@ -import { doHighlight, deserializeHighlights, serializeHighlights, removeHighlights, createWrapper, highlightRange } from "../src/Library"; +import { doHighlight, deserializeHighlights, serializeHighlights, removeHighlights, createWrapper, highlightRange } from "./Library"; import { TextHighlighter } from "./TextHighlighter"; import { optionsImpl } from "./types"; export { doHighlight, deserializeHighlights, serializeHighlights, removeHighlights, optionsImpl, createWrapper, highlightRange, TextHighlighter }; diff --git a/lib/index.js b/lib/index.js index 42d3469..0db0aeb 100644 --- a/lib/index.js +++ b/lib/index.js @@ -1,7 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.TextHighlighter = exports.highlightRange = exports.createWrapper = exports.optionsImpl = exports.removeHighlights = exports.serializeHighlights = exports.deserializeHighlights = exports.doHighlight = void 0; -var Library_1 = require("../src/Library"); +var Library_1 = require("./Library"); Object.defineProperty(exports, "doHighlight", { enumerable: true, get: function () { return Library_1.doHighlight; } }); Object.defineProperty(exports, "deserializeHighlights", { enumerable: true, get: function () { return Library_1.deserializeHighlights; } }); Object.defineProperty(exports, "serializeHighlights", { enumerable: true, get: function () { return Library_1.serializeHighlights; } }); diff --git a/package-lock.json b/package-lock.json index 1ec3dff..015f810 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2282,6 +2282,16 @@ "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", "dev": true }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "dev": true, + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, "bn.js": { "version": "5.1.3", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz", @@ -3502,6 +3512,12 @@ "is-symbol": "^1.0.2" } }, + "escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true + }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -4118,6 +4134,13 @@ "flat-cache": "^2.0.1" } }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "dev": true, + "optional": true + }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -7667,7 +7690,11 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "dev": true, - "optional": true + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + } }, "html-encoding-sniffer": { "version": "1.0.2", @@ -9385,6 +9412,13 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, + "nan": { + "version": "2.14.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", + "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==", + "dev": true, + "optional": true + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -10198,6 +10232,117 @@ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "dev": true }, + "replace-in-file": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/replace-in-file/-/replace-in-file-6.2.0.tgz", + "integrity": "sha512-Im2AF9G/qgkYneOc9QwWwUS/efyyonTUBvzXS2VXuxPawE5yQIjT/e6x4CTijO0Quq48lfAujuo+S89RR2TP2Q==", + "dev": true, + "requires": { + "chalk": "^4.1.0", + "glob": "^7.1.6", + "yargs": "^16.2.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true + }, + "yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "requires": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + } + }, + "yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true + } + } + }, "request": { "version": "2.88.2", "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", diff --git a/package.json b/package.json index d255b42..e9b679e 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,14 @@ { "name": "@funktechno/texthighlighter", - "version": "2.1.1", + "version": "2.1.2", "description": "a no dependency typescript supported tool for highlighting user selected content", "main": "index.js", "files": [ "lib/**/*" ], "scripts": { - "build": "tsc", - "build:client": "browserify client/index.ts -p [ tsify --noImplicitAny ] > dist/TextHighlighter.js", + "build": "tsc && node build/replace", + "build:client": "browserify client/index.ts -p [ tsify --noImplicitAny ] > dist/TextHighlighter.js && node build/replace", "prepare": "npm run build", "prepublishOnly": "npm test && npm run lint", "preversion": "npm run lint", @@ -54,6 +54,7 @@ "jest": "^26.1.0", "jest-junit": "^12.0.0", "jest-serial-runner": "^1.1.0", + "replace-in-file": "^6.2.0", "ts-jest": "^26.1.1", "ts-loader": "^8.0.9", "tsify": "^5.0.2", From cf2da9bf97332523e54cd395dca93e06fd6d11ed Mon Sep 17 00:00:00 2001 From: lastlink <theefunk@gmail.com> Date: Mon, 2 Aug 2021 16:52:22 -0400 Subject: [PATCH 3/3] fix v --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a6237a..e05ec22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. -## 2.1.1 (2021-08-02) +## 2.1.2 (2021-08-02) ### Bug Fixes