v3.0.2

Nick Frasser · Nick Frasser · commit 5e41e697f594 · 2021-09-17T12:26:22.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Linkify Changelog
 
+## v3.0.2
+
+* Correctly detect hashtags with underscores
+* Fix plugin import bug
+* Fix `linkify-string` and `linkify-html` type declarations
+
 ## v3.0.1
 
 * Fix React component type declarations
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "linkify",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Intelligent link recognition, made easy",
   "repository": {
     "type": "git",
diff --git a/packages/linkify-html/package.json b/packages/linkify-html/package.json
@@ -1,6 +1,6 @@
 {
   "name": "linkify-html",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "HTML String interface for linkifyjs",
   "main": "index.js",
   "scripts": {
diff --git a/packages/linkify-plugin-hashtag/index.js b/packages/linkify-plugin-hashtag/index.js
@@ -1 +1 @@
-module.exports = require('linkifyjs/lib/plugin/hashtag');
+module.exports = require('linkifyjs/lib/plugins/hashtag');
diff --git a/packages/linkify-plugin-hashtag/package.json b/packages/linkify-plugin-hashtag/package.json
@@ -1,6 +1,6 @@
 {
   "name": "linkify-plugin-hashtag",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Hashtag plugin for linkifyjs",
   "main": "index.js",
   "scripts": {
diff --git a/packages/linkify-plugin-mention/index.js b/packages/linkify-plugin-mention/index.js
@@ -1 +1 @@
-module.exports = require('linkifyjs/lib/plugin/mention');
+module.exports = require('linkifyjs/lib/plugins/mention');
diff --git a/packages/linkify-plugin-mention/package.json b/packages/linkify-plugin-mention/package.json
@@ -1,6 +1,6 @@
 {
   "name": "linkify-plugin-mention",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "@mentions plugin for linkifyjs",
   "main": "index.js",
   "scripts": {
diff --git a/packages/linkify-plugin-ticket/index.js b/packages/linkify-plugin-ticket/index.js
@@ -1 +1 @@
-module.exports = require('linkifyjs/lib/plugin/ticket');
+module.exports = require('linkifyjs/lib/plugins/ticket');
diff --git a/packages/linkify-plugin-ticket/package.json b/packages/linkify-plugin-ticket/package.json
@@ -1,6 +1,6 @@
 {
   "name": "linkify-plugin-ticket",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Numeric ticket plugin for linkifyjs",
   "main": "index.js",
   "scripts": {
diff --git a/packages/linkify-string/package.json b/packages/linkify-string/package.json
@@ -1,6 +1,6 @@
 {
   "name": "linkify-string",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "String interface for linkifyjs",
   "main": "index.js",
   "scripts": {
diff --git a/packages/linkifyjs/src/plugins/hashtag.js b/packages/linkifyjs/src/plugins/hashtag.js
@@ -30,8 +30,13 @@ export const hashtag = ({ scanner, parser, utils }) => {
 	HASH_UNDERSCORE_STATE.tt(TLD, HASHTAG_STATE);
 	HASH_UNDERSCORE_STATE.tt(LOCALHOST, HASHTAG_STATE);
 
-	// Trailing underscore is okay
+	// Continue the transitions
 	HASHTAG_STATE.tt(UNDERSCORE, HASHTAG_STATE);
+	HASHTAG_STATE.tt(DOMAIN, HASHTAG_STATE);
+	HASHTAG_STATE.tt(TLD, HASHTAG_STATE);
+	HASHTAG_STATE.tt(LOCALHOST, HASHTAG_STATE);
+	// Trailing underscore is okay
+
 };
 
 registerPlugin('hashtag', hashtag);
diff --git a/test/spec/plugins/hashtag.test.js b/test/spec/plugins/hashtag.test.js
@@ -40,6 +40,9 @@ describe('plugins/hashtag', () => {
 			}]);
 
 			expect(linkify.test('#wat', 'hashtag')).to.be.ok;
+			expect(linkify.test('#bug_', 'hashtag')).to.be.ok;
+			expect(linkify.test('#bug_test', 'hashtag')).to.be.ok;
+			expect(linkify.test('#bug__test', 'hashtag')).to.be.ok;
 			expect(linkify.test('#987', 'hashtag')).to.not.be.ok;
 		});
 	});

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "linkify",`
`3`		`- "version": "3.0.1",`
	`3`	`+ "version": "3.0.2",`
`4`	`4`	`"description": "Intelligent link recognition, made easy",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "linkify-html",`
`3`		`- "version": "3.0.1",`
	`3`	`+ "version": "3.0.2",`
`4`	`4`	`"description": "HTML String interface for linkifyjs",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-module.exports = require('linkifyjs/lib/plugin/hashtag');`
	`1`	`+module.exports = require('linkifyjs/lib/plugins/hashtag');`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "linkify-plugin-hashtag",`
`3`		`- "version": "3.0.1",`
	`3`	`+ "version": "3.0.2",`
`4`	`4`	`"description": "Hashtag plugin for linkifyjs",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "linkify-plugin-mention",`
`3`		`- "version": "3.0.1",`
	`3`	`+ "version": "3.0.2",`
`4`	`4`	`"description": "@mentions plugin for linkifyjs",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "linkify-plugin-ticket",`
`3`		`- "version": "3.0.1",`
	`3`	`+ "version": "3.0.2",`
`4`	`4`	`"description": "Numeric ticket plugin for linkifyjs",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`