From 4096a09528ea989abee3b84d9a9875d41ecc3c26 Mon Sep 17 00:00:00 2001
From: David Hacker <dmhacker@protonmail.com>
Date: Wed, 4 Mar 2020 10:02:33 -0800
Subject: [PATCH] Merge src/ folder with top-level directory

---
 .gitignore                       | 7 +------
 Makefile                         | 7 +++----
 src/index.js => index.js         | 0
 package-lock.json                | 2 +-
 package.json                     | 2 +-
 {src/util => util}/formatting.js | 0
 {src/util => util}/responses.js  | 0
 7 files changed, 6 insertions(+), 12 deletions(-)
 rename src/index.js => index.js (100%)
 rename {src/util => util}/formatting.js (100%)
 rename {src/util => util}/responses.js (100%)

diff --git a/.gitignore b/.gitignore
index 65936d8..45b8900 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 # NodeJS files & folders
-src/node_modules
 build
+node_modules
 
 # Logs
 logs
@@ -27,9 +27,6 @@ coverage
 # node-waf configuration
 .lock-wscript
 
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
 # Dependency directories
 jspm_packages
 
@@ -38,5 +35,3 @@ jspm_packages
 
 # Optional REPL history
 .node_repl_history
-#node modules should be seperated from scr folder so that webpacking and build process can be easy
-node_modules
diff --git a/Makefile b/Makefile
index 1f06f9f..d24832a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,8 @@
 .PHONY: default clean
 default:
 	mkdir -p build
-	npm install --prefix src
-	cd src && zip -r9 alexa-youtube-skill.zip node_modules util *.js *.json 
-	mv src/alexa-youtube-skill.zip build
+	npm install
+	zip -r9 alexa-youtube-skill.zip node_modules util *.js *.json 
+	mv alexa-youtube-skill.zip build
 clean:
-	rm -rf src/node_modules
 	rm -rf build
diff --git a/src/index.js b/index.js
similarity index 100%
rename from src/index.js
rename to index.js
diff --git a/package-lock.json b/package-lock.json
index cc190da..19de1c6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "alexa-youtube-skill",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e826c0a..c30fc3e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alexa-youtube-skill",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "description": "Use Alexa to search YouTube for your favorite videos",
   "engines": {
     "node": ">=10.16.3"
diff --git a/src/util/formatting.js b/util/formatting.js
similarity index 100%
rename from src/util/formatting.js
rename to util/formatting.js
diff --git a/src/util/responses.js b/util/responses.js
similarity index 100%
rename from src/util/responses.js
rename to util/responses.js