Merge pull request ritz078#205 from ritz078/fix-build

Fix build
SnehaMidha · Jan 25, 2017 · c244a48 · c244a48
2 parents 42aed0c + 7b778d5
commit c244a48
Show file tree

Hide file tree

Showing 21 changed files with 16 additions and 8,486 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,8 +3,8 @@ node_modules/
 .tmp/
 npm-debug.log
 .DS_Store
-src/jquery.embed.js
 embed.js.sublime-project
 embed.js.sublime-workspace
 .sass-cache
 bower_components
+dist
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -95,7 +95,7 @@ module.exports = function (grunt) {
 					style: 'expanded'
 				},
 				files  : {
-					'src/embed.css': 'src/css/embed.scss'
+					'dist/embed.css': 'src/css/embed.scss'
 				}
 			}
 		},
@@ -117,7 +117,7 @@ module.exports = function (grunt) {
 			},
 			build  : {
 				files: {
-					'dist/embed.min.js': 'src/embed.js'
+					'dist/embed.min.js': 'dist/embed.js'
 				}
 			}
 		},
@@ -146,7 +146,7 @@ module.exports = function (grunt) {
 		'string-replace': {
 			dist: {
 				files  : {
-					'.tmp/embed.css': 'src/embed.css'
+					'.tmp/embed.css': 'dist/embed.css'
 				},
 				options: {
 					replacements: [{

diff --git a/demo/index.html b/demo/index.html
@@ -63,7 +63,7 @@ <h1>Loading embed.js in a block</h1>
     <script src="//platform.twitter.com/widgets.js"></script>
 	<script src="https://cdn.plyr.io/1.6.18/plyr.js"></script>
     <script src="https://cdn.jsdelivr.net/prism/1.4.1/prism.js"></script>
-    <script src="../src/embed.js"></script>
+    <script src="../dist/embed.js"></script>
     <script>
     EmbedJS.setOptions({
         // element: document.getElementById('block'),

diff --git a/dist/assets/fonts/emoticons.eot b/dist/assets/fonts/emoticons.eot
diff --git a/dist/assets/fonts/emoticons.svg b/dist/assets/fonts/emoticons.svg
diff --git a/dist/assets/fonts/emoticons.ttf b/dist/assets/fonts/emoticons.ttf
diff --git a/dist/assets/fonts/emoticons.woff b/dist/assets/fonts/emoticons.woff
diff --git a/dist/assets/images/emojis.png b/dist/assets/images/emojis.png
diff --git a/dist/assets/images/[email protected] b/dist/assets/images/[email protected]
diff --git a/dist/assets/images/loader.svg b/dist/assets/images/loader.svg
diff --git a/dist/embed.min.css b/dist/embed.min.css
diff --git a/dist/embed.min.js b/dist/embed.min.js
diff --git a/package.json b/package.json
@@ -12,8 +12,13 @@
     "jquery-embed",
     "emoji"
   ],
-  "main": "./src/embed.js",
-  "jsnext:main": "./src/embed.es2015.js",
+  "main": "./dist/embed.js",
+  "jsnext:main": "./dist/embed.es2015.js",
+  "files": [
+    "dist",
+    "src",
+    "demo"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/ritz078/embed.js.git"
@@ -84,7 +89,8 @@
   },
   "scripts": {
     "commit": "git-cz",
-    "test": "ava test/**/*.test.js --require babel-register"
+    "test": "ava test/**/*.test.js --require babel-register",
+    "prepublish": "grunt dist"
   },
   "config": {
     "commitizen": {

diff --git a/rollup.es2015.config.js b/rollup.es2015.config.js
@@ -14,7 +14,7 @@ var banner = "/*\n" +
 
 var config = {
     entry         : 'src/js/main.js',
-    dest          : 'src/embed.es2015.js',
+    dest          : 'dist/embed.es2015.js',
     format        : 'es',
     banner        : banner,
     sourceMap     : true,

diff --git a/rollup.umd.config.js b/rollup.umd.config.js
@@ -15,7 +15,7 @@ var banner = "/*\n" +
 
 var config = {
 	entry        : 'src/js/main.js',
-	dest         : 'src/embed.js',
+	dest         : 'dist/embed.js',
 	format       : 'umd',
 	banner       : banner,
 	sourceMap    : true,