feat: #8734, move tinycon to package.json

NodeBB · Oct 9, 2020 · 9c157de · 9c157de
1 parent 45e8a4d
commit 9c157de
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 288 deletions.
diff --git a/install/package.json b/install/package.json
@@ -126,6 +126,7 @@
         "spider-detector": "2.0.0",
         "textcomplete": "^0.17.1",
         "textcomplete.contenteditable": "^0.1.1",
+        "tinycon": "0.6.8",
         "toobusy-js": "^0.5.1",
         "uglify-es": "^3.3.9",
         "validator": "13.1.17",

diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js
@@ -1,7 +1,13 @@
 'use strict';
 
 
-define('notifications', ['translator', 'components', 'navigator', 'benchpress'], function (translator, components, navigator, Benchpress) {
+define('notifications', [
+	'translator',
+	'components',
+	'navigator',
+	'benchpress',
+	'tinycon',
+], function (translator, components, navigator, Benchpress, Tinycon) {
 	var Notifications = {};
 
 	var unreadNotifs = {};

diff --git a/public/vendor/tinycon/tinycon.js b/public/vendor/tinycon/tinycon.js
diff --git a/src/meta/js.js b/src/meta/js.js
@@ -37,7 +37,6 @@ JS.scripts = {
 		'public/src/require-config.js',
 		'public/vendor/bootbox/bootbox.js',
 		'public/vendor/bootbox/wrapper.js',
-		'public/vendor/tinycon/tinycon.js',
 		'public/vendor/xregexp/xregexp.js',
 		'public/vendor/xregexp/unicode/unicode-base.js',
 		'node_modules/benchpressjs/build/benchpress.js',
@@ -106,6 +105,7 @@ JS.scripts = {
 		ace: 'node_modules/ace-builds/src-min',
 		'clipboard.js': 'node_modules/clipboard/dist/clipboard.min.js',
 		'nprogress.js': 'node_modules/nprogress/nprogress.js',
+		'tinycon.js': 'node_modules/tinycon/tinycon.js',
 	},
 };