Skip to content

Commit 9ba310f

Browse files
ritz078ritz078
committed
chore(merge): merged with master
2 parents b819f04 + 8f04ce7 commit 9ba310f

9 files changed

Lines changed: 57 additions & 36 deletions

File tree

‎.npmignore‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
*.es6
2-
test
3-
demo
4-
Gruntfile.js
5-
bower.json
6-
build.json
7-
rollup.config.js
8-
sprite.handlebars
2+
test/
3+
demo/
4+
bower_components/
5+
.git*
6+
7+
node_modules/
8+
.DS_Store
9+
.npmignore
10+
11+

‎CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
<a name="3.7.4"></a>
2+
## [3.7.4](https://github.com/ritz078/embed.js/compare/v3.7.3...v3.7.4) (2016-01-19)
3+
4+
5+
### Bug Fixes
6+
7+
* **npm:** Fixed npm dist issue and updated packages ([0e0d232](https://github.com/ritz078/embed.js/commit/0e0d232)), closes [#114](https://github.com/ritz078/embed.js/issues/114)
8+
* **npmignore:** updated .npmignore ([6ce6f46](https://github.com/ritz078/embed.js/commit/6ce6f46))
9+
* **package:** corrected main file path ([f49326b](https://github.com/ritz078/embed.js/commit/f49326b))
10+
11+
12+
13+
<a name="3.7.3"></a>
14+
## [3.7.3](https://github.com/ritz078/embed.js/compare/v3.7.2...v3.7.3) (2016-01-19)
15+
16+
17+
18+
119
<a name="3.7.2"></a>
220
## [3.7.2](https://github.com/ritz078/embed.js/compare/v3.7.1...v3.7.2) (2016-01-10)
321

‎Gruntfile.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,12 @@ module.exports = function (grunt) {
240240
run:true
241241
}
242242
}
243+
},
244+
245+
shell:{
246+
publish : {
247+
command : 'npm publish'
248+
}
243249
}
244250
});
245251

@@ -251,13 +257,7 @@ module.exports = function (grunt) {
251257
grunt.registerTask("dist", ["clean", "eslint", "rollup", "sass", "uglify", "string-replace", "postcss", "copy"]);
252258

253259
grunt.registerTask("release", function (option) {
254-
grunt.task.run(["bump-only:" + option, "dist","conventionalChangelog", "bump-commit"]);
255-
exec('npm publish', function (err, stdout, stderr) {
256-
if (err) {
257-
grunt.fatal('Can not publish to NPM:\n ' + stderr);
258-
}
259-
grunt.log.ok('Published to NPM ');
260-
});
260+
grunt.task.run(["bump-only:" + option, "dist","conventionalChangelog", "bump-commit","shell"]);
261261
});
262262

263263
grunt.registerTask("test",["mocha"]);

‎bower.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "embed-js",
3-
"version": "3.7.2",
3+
"version": "3.7.4",
44
"description": "A JavaScript plugin that analyses the string and embeds emojis, media, tweets, code and services.",
55
"main": [
6-
"./dist/embed.min.css",
7-
"./dist/embed.min.js"
6+
"./src/embed.css",
7+
"./src/embed.js"
88
],
99
"authors": [
1010
"Ritesh Kumar <rkritesh078@gmail.com>"

‎dist/embed.min.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "embed-js",
3-
"version": "3.7.2",
3+
"version": "3.7.4",
44
"description": "A JavaScript plugin that analyses the string and embeds emojis, media, tweets, code and services.",
55
"keywords": [
66
"JavaScript-plugin",
@@ -11,7 +11,7 @@
1111
"emoticon",
1212
"jquery-embed"
1313
],
14-
"main": "./dist/embed.min.js",
14+
"main": "./src/embed.js",
1515
"repository": {
1616
"type": "git",
1717
"url": "https://github.com/ritz078/embed.js.git"
@@ -38,11 +38,11 @@
3838
"babel": "^6.3.26",
3939
"babel-core": "^6.4.0",
4040
"babel-eslint": "^4.1.6",
41-
"babel-plugin-transform-regenerator": "^6.3.26",
42-
"babel-preset-es2015-rollup": "^1.0.0",
41+
"babel-plugin-transform-regenerator": "^6.4.4",
42+
"babel-preset-es2015-rollup": "^1.1.1",
4343
"babel-preset-stage-2": "^6.3.13",
4444
"chai": "^3.2.0",
45-
"commitizen": "^2.4.6",
45+
"commitizen": "^2.5.0",
4646
"cssnano": "^3.4.0",
4747
"cz-conventional-changelog": "^1.1.5",
4848
"es6-promise": "^3.0.2",
@@ -63,16 +63,17 @@
6363
"grunt-postcss": "^0.7.1",
6464
"grunt-retinafy": "^0.1.5",
6565
"grunt-rollup": "^0.6.1",
66+
"grunt-shell": "^1.1.2",
6667
"grunt-spritesmith": "^6.1.1",
6768
"grunt-string-replace": "^1.2.1",
6869
"load-grunt-tasks": "^3.4.0",
6970
"mocha": "^2.3.4",
7071
"phantomjs": "^1.9.19",
7172
"promise": "^7.1.1",
72-
"rollup": "^0.24.1",
73-
"rollup-plugin-babel": "^2.3.8",
74-
"rollup-plugin-commonjs": "^2.1.0",
75-
"rollup-plugin-npm": "^1.2.1",
73+
"rollup": "^0.25.0",
74+
"rollup-plugin-babel": "^2.3.9",
75+
"rollup-plugin-commonjs": "^2.2.0",
76+
"rollup-plugin-npm": "^1.3.0",
7677
"rollup-plugin-replace": "^1.1.0"
7778
},
7879
"scripts": {

‎src/embed.js‎

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/embed.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/js/modules/twitter/twitter.es6‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ export default class Twitter {
6161
}
6262
return [this.output, this.embeds];
6363

64-
} catch (error) {
65-
console.log(error);
64+
} catch (e) {
65+
return [this.output, this.embeds];
6666
}
6767
}
6868
}

0 commit comments

Comments
 (0)