Merge src/ folder with top-level directory

dmhacker · Mar 4, 2020 · 4096a09 · 4096a09
1 parent 8d10720
commit 4096a09
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 12 deletions.
diff --git 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
@@ -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 → index.js b/src/index.js → index.js
diff --git a/package-lock.json b/package-lock.json
diff --git 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 → util/formatting.js b/src/util/formatting.js → util/formatting.js
diff --git a/src/util/responses.js → util/responses.js b/src/util/responses.js → util/responses.js