Merge pull request #1 from webdevnerdstuff/dev

Dev

Author: webdevnerdstuff

dist/ssr.vue-easter-egg-trigger.js

@@ -1,9 +1,9 @@
 {
 	"name": "vue-easter-egg-trigger",
-	"version": "0.1.15",
+	"version": "0.1.22",
 	"description": "This packages makes it nice and easy to add Easter Egg triggers to your Vue site.",
 	"private": false,
-	"main": "dist/index.js",
+	"main": "dist/vue-easter-egg-trigger.js",
 	"types": "types/index.d.ts",
 	"scripts": {
 		"serve": "npm run development",
@@ -13,10 +13,6 @@
 		"build:release": "webpack --config ./build/webpack.release.config.js --progress",
 		"build:ssr": "webpack --config ./build/webpack.ssr.config.js --progress",
 		"build": "npm run build:release && npm run build:ssr",
-		"lint:js": "eslint --ext js --ext jsx --ext vue src",
-		"lint:js:fix": "npm run lint:js -- --fix",
-		"test": "jest",
-		"test:types": "tsc -p types/test",
 		"docs:dev": "vuepress dev docs",
 		"docs:build": "vuepress build docs"
 	},
@@ -70,7 +66,6 @@
 		"@babel/runtime": "^7.13.17",
 		"@vue/eslint-config-prettier": "^6.0.0",
 		"@vue/test-utils": "1.0.0-beta.31",
-		"babel-jest": "^23.6.0",
 		"babel-loader": "^8.2.2",
 		"babel-plugin-module-resolver": "^4.1.0",
 		"browser-sync": "^2.26.14",
@@ -88,8 +83,6 @@
 		"eslint-webpack-plugin": "^2.5.4",
 		"file-loader": "^0.9.0",
 		"html-webpack-plugin": "^5.3.1",
-		"jest": "^23.6.0",
-		"jest-serializer-vue": "^2.0.2",
 		"ts-loader": "^6.2.2",
 		"vue-hot-reload-api": "^2.0.8",
 		"vue-jest": "^3.0.1",

dist/vue-easter-egg-trigger.js

@@ -1,10 +1,10 @@
-import EasterEggTrigger from '@plugins/EasterEggTrigger'
+import EasterEggTrigger from '@plugins/EasterEggTrigger';
 
-export const version = '__VERSION__'
+export const version = '__VERSION__';
 
 // Automatic installation if Vue has been added to the global scope.
 if (typeof window !== 'undefined' && window.Vue) {
 	window.Vue.use(EasterEggTrigger);
 }
 
-export default EasterEggTrigger
+export default EasterEggTrigger;

package-lock.json

@@ -11,16 +11,11 @@ const EasterEggTrigger = {
 
 		// Add an instance methods //
 		Vue.prototype.$easterEgg = function(eggOptions) {
-			const pluginOptions = EasterEggTrigger.options;
-
-			EasterEggTriggerCore.init(Vue, pluginOptions, eggOptions);
+			EasterEggTriggerCore.init(Vue, EasterEggTrigger.options, eggOptions);
 		};
 
 		Vue.prototype.$easterEggTrigger = function(eggOptions) {
-			const pluginOptions = EasterEggTrigger.options;
-			EasterEggTriggerCore.init(Vue, pluginOptions, eggOptions);
-			// plugin.setEggOptions(methodOptions);
-			// plugin.callAddListener();
+			EasterEggTriggerCore.init(Vue, EasterEggTrigger.options, eggOptions);
 		};
 	},
 	options: {

package.json

@@ -1,7 +1,8 @@
-import Vue from 'vue';
+// import Vue from 'vue';
 import _ from '@assets/lodash.custom';
 
-let easterEggs = [];
+let EasterEggTriggerVueObj = null;
+let easterEggsTriggerEggs = [];
 
 const EasterEggTrigger = {
 	timeout: null,
@@ -13,56 +14,44 @@ const EasterEggTrigger = {
 	},
 
 	// Options //
-	defaultOptions: {
-		egg: {
-			callback: null,
-			destroyBus: false,
-			keys: false,
-			name: 'easter-egg',
-			pattern: false,
-			target: 'html',
-			withBus: true,
-		},
-		plugin: {
-			delay: 500,
-			keys: ['ArrowUp', 'ArrowUp', 'ArrowDown', 'ArrowDown', 'ArrowLeft', 'ArrowRight', 'ArrowLeft', 'ArrowRight', 'b', 'a'],
-			mouseEvents: [
-				'click', // Works with multiple single clicks pattern
-				'dblclick', // Only works with single double click pattern set
-				'mouseup', // Works with multiple mouseup clicks pattern
-				'mousedown', // Works with multiple mousedown clicks pattern
-			],
-			pattern: [38, 38, 40, 40, 37, 39, 37, 39, 66, 65],
-			type: 'keydown',
-		},
+	defaultEggOptions: {
+		callback: null,
+		destroyBus: false,
+		keys: false,
+		name: 'easter-egg',
+		pattern: false,
+		target: 'div',
+		withBus: true,
 	},
 	eggOptions: {},
 	pluginOptions: {},
 
 	// Initiate Eggs //
-	init(vue, pluginOptions, eggOptions = {}) {
+	init(Vue, pluginOptions = {}, eggOptions = {}) {
+		EasterEggTriggerVueObj = Vue;
+
 		// Set Options //
-		this.pluginOptions = { ...this.defaultOptions.plugin, ...pluginOptions };
-		this.eggOptions = { ...this.defaultOptions.egg, ...eggOptions };
+		this.pluginOptions = pluginOptions;
+		this.eggOptions = { ...this.defaultEggOptions, ...eggOptions };
 
 		this.layEggs();
 	},
 
 	// Adds Eggs to Easter Eggs //
 	layEggs() {
-		easterEggs.push(this.eggOptions);
+		easterEggsTriggerEggs.push(this.eggOptions);
 
 		this.callAddListener();
 	},
 
 	// Call the add listener //
 	callAddListener() {
-		Object.values(easterEggs).forEach((egg) => {
+		Object.values(easterEggsTriggerEggs).forEach((egg) => {
 			const newEgg = egg;
 
 			if (!newEgg.keys && !newEgg.pattern) {
-				newEgg.keys = this.defaultOptions.plugin.keys;
-				newEgg.pattern = this.defaultOptions.plugin.pattern;
+				newEgg.keys = this.pluginOptions.keys;
+				newEgg.pattern = this.pluginOptions.pattern;
 			}
 		});
 
@@ -93,7 +82,7 @@ const EasterEggTrigger = {
 		}
 
 		// -------------------- Mouse Events //
-		if (_.includes(EasterEggTrigger.defaultOptions.plugin.mouseEvents, e.type)) {
+		if (_.includes(EasterEggTrigger.pluginOptions.mouseEvents, e.type)) {
 			key = e.type;
 
 			EasterEggTrigger.targets.nodes.push(e.target.nodeName.toLowerCase());
@@ -107,7 +96,7 @@ const EasterEggTrigger = {
 
 	// Check the Keys or Click Pattern //
 	checkPattern(e) {
-		Object.values(easterEggs).forEach((egg) => {
+		Object.values(easterEggsTriggerEggs).forEach((egg) => {
 			// Check Keyboard Events //
 			if (_.isEqual(egg?.keys, this.input) || _.isEqual(egg?.pattern, this.input)) {
 				// Check Targets if Mouse Events //
@@ -168,7 +157,7 @@ const EasterEggTrigger = {
 
 	// Emit Bus Event and/or Callback //
 	emit(egg) {
-		if (Object.keys(easterEggs).length === 1) {
+		if (Object.keys(easterEggsTriggerEggs).length === 1) {
 			document.removeEventListener(this.pluginOptions.type, this.capturePattern, false);
 		}
 		else {
@@ -183,30 +172,30 @@ const EasterEggTrigger = {
 			}
 		}
 
-		new Vue().$bus.$emit(`${egg.name}`);
+		new EasterEggTriggerVueObj().$bus.$emit(`${egg.name}`);
 
 		// Auto destroy $bus.$on //
 		if (egg.destroyBus) {
-			new Vue().$bus.$off(`${egg.name}`);
+			new EasterEggTriggerVueObj().$bus.$off(`${egg.name}`);
 		}
 
 		return false;
 	},
 
 	// Rebuild the Easter Eggs //
 	rebuild(usedEgg) {
-		const currentEggs = easterEggs;
-		easterEggs = [];
+		const currentEggs = easterEggsTriggerEggs;
+		easterEggsTriggerEggs = [];
 
-		// Remove usedEgg from easterEggs  //
+		// Remove usedEgg from easterEggsTriggerEggs  //
 		const idx = _.findIndex(currentEggs, (egg) => egg.name === usedEgg.name);
 		currentEggs.splice(idx, 1);
 
 		Object.values(currentEggs).forEach((egg) => {
 			this.layEggs(egg);
 		});
 
-		easterEggs = currentEggs;
+		easterEggsTriggerEggs = currentEggs;
 	},
 };