From d66106cb19af8858a3e82ffea407851a0ce47910 Mon Sep 17 00:00:00 2001 From: robonetphy <1998patelumang@gmail.com> Date: Mon, 28 Nov 2022 18:54:36 +0530 Subject: [PATCH 1/7] codexteam icons added --- package.json | 3 +++ yarn.lock | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/package.json b/package.json index f29acf3..6591403 100644 --- a/package.json +++ b/package.json @@ -29,5 +29,8 @@ "style-loader": "^0.21.0", "webpack": "^4.29.5", "webpack-cli": "^3.2.3" + }, + "dependencies": { + "@codexteam/icons": "^0.0.5" } } diff --git a/yarn.lock b/yarn.lock index d768fa7..b39e892 100644 --- a/yarn.lock +++ b/yarn.lock @@ -526,6 +526,11 @@ lodash "^4.17.11" to-fast-properties "^2.0.0" +"@codexteam/icons@^0.0.5": + version "0.0.5" + resolved "https://registry.yarnpkg.com/@codexteam/icons/-/icons-0.0.5.tgz#d17f39b6a0497c6439f57dd42711817a3dd3679c" + integrity sha512-s6H2KXhLz2rgbMZSkRm8dsMJvyUNZsEjxobBEg9ztdrb1B2H3pEzY6iTwI4XUPJWJ3c3qRKwV4TrO3J5jUdoQA== + "@webassemblyjs/ast@1.8.3": version "1.8.3" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.3.tgz#63a741bd715a6b6783f2ea5c6ab707516aa215eb" From 8fcd2b392120d90aec05d99c809e4fa4d67cd914 Mon Sep 17 00:00:00 2001 From: robonetphy <1998patelumang@gmail.com> Date: Mon, 28 Nov 2022 18:55:12 +0530 Subject: [PATCH 2/7] codexteam icon integrated --- assets/icon.svg | 1 - src/index.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 assets/icon.svg diff --git a/assets/icon.svg b/assets/icon.svg deleted file mode 100644 index cef32fe..0000000 --- a/assets/icon.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/index.js b/src/index.js index 0f6d298..85c121e 100644 --- a/src/index.js +++ b/src/index.js @@ -167,7 +167,7 @@ class Marker { * @return {string} */ get toolboxIcon() { - return require('./../assets/icon.svg').default; + return require('@codexteam/icons').IconMarker; } /** From ef660a0c32e28d58df756a19817ade4ed223e5e1 Mon Sep 17 00:00:00 2001 From: robonetphy <1998patelumang@gmail.com> Date: Mon, 28 Nov 2022 18:56:00 +0530 Subject: [PATCH 3/7] marker version updated --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6591403..e912e3e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@editorjs/marker", - "version": "1.2.2", + "version": "1.3.0", "keywords": [ "codex editor", "marker", From f21419114ec1abc232ec6629577728dbf4eedc62 Mon Sep 17 00:00:00 2001 From: "Umang G. Patel" <23169768+robonetphy@users.noreply.github.com> Date: Mon, 28 Nov 2022 23:06:54 +0530 Subject: [PATCH 4/7] add codex icons as dev dependency --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index e912e3e..8e8f3ee 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "devDependencies": { "@babel/core": "^7.3.4", "@babel/preset-env": "^7.3.4", + "@codexteam/icons": "^0.0.5", "babel-loader": "^8.0.5", "css-loader": "^1.0.0", "raw-loader": "^3.1.0", @@ -30,7 +31,5 @@ "webpack": "^4.29.5", "webpack-cli": "^3.2.3" }, - "dependencies": { - "@codexteam/icons": "^0.0.5" - } + "dependencies": {} } From 62629747a8c7c4bf7f3bd5db9df28b1d289f6acd Mon Sep 17 00:00:00 2001 From: "Umang G. Patel" <23169768+robonetphy@users.noreply.github.com> Date: Mon, 28 Nov 2022 23:08:49 +0530 Subject: [PATCH 5/7] remove dependecies --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 8e8f3ee..749bbbe 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,5 @@ "style-loader": "^0.21.0", "webpack": "^4.29.5", "webpack-cli": "^3.2.3" - }, - "dependencies": {} + } } From c8a69293606fd1ddf000c9d30dc6f2b219973ae4 Mon Sep 17 00:00:00 2001 From: "Umang G. Patel" <23169768+robonetphy@users.noreply.github.com> Date: Wed, 30 Nov 2022 00:47:08 +0530 Subject: [PATCH 6/7] webpack config updated --- package.json | 4 +++- src/index.js | 5 +++-- webpack.config.js | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 749bbbe..e912e3e 100644 --- a/package.json +++ b/package.json @@ -23,12 +23,14 @@ "devDependencies": { "@babel/core": "^7.3.4", "@babel/preset-env": "^7.3.4", - "@codexteam/icons": "^0.0.5", "babel-loader": "^8.0.5", "css-loader": "^1.0.0", "raw-loader": "^3.1.0", "style-loader": "^0.21.0", "webpack": "^4.29.5", "webpack-cli": "^3.2.3" + }, + "dependencies": { + "@codexteam/icons": "^0.0.5" } } diff --git a/src/index.js b/src/index.js index 85c121e..b2241a4 100644 --- a/src/index.js +++ b/src/index.js @@ -1,7 +1,8 @@ /** * Build styles */ -require('./index.css').toString(); +import './index.css'; +import { IconMarker } from '@codexteam/icons' /** * Marker Tool for the Editor.js @@ -167,7 +168,7 @@ class Marker { * @return {string} */ get toolboxIcon() { - return require('@codexteam/icons').IconMarker; + return IconMarker; } /** diff --git a/webpack.config.js b/webpack.config.js index 332451f..d22a5e1 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -36,6 +36,7 @@ module.exports = { publicPath: '/', filename: 'bundle.js', library: 'Marker', - libraryTarget: 'umd' + libraryTarget: 'umd', + libraryExport: 'default' } }; From 7ce5005b9ecb69394ee666274be1020f04021d7b Mon Sep 17 00:00:00 2001 From: "Umang G. Patel" <23169768+robonetphy@users.noreply.github.com> Date: Wed, 30 Nov 2022 01:34:42 +0530 Subject: [PATCH 7/7] remove the default module --- src/index.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index b2241a4..70fd8e5 100644 --- a/src/index.js +++ b/src/index.js @@ -9,7 +9,7 @@ import { IconMarker } from '@codexteam/icons' * * Allows to wrap inline fragment and style it somehow. */ -class Marker { + export default class Marker { /** * Class name for term-tag * @@ -184,4 +184,3 @@ class Marker { } } -module.exports = Marker;