Skip to content

Commit 7f805f8

Browse files
ritz078ritz078
committed
chore(merge): fixed conflicts
2 parents 48e95d7 + bc94094 commit 7f805f8

7 files changed

Lines changed: 21 additions & 22 deletions

File tree

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"version": "3.7.3",
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: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -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,13 +63,13 @@
6363
"grunt-postcss": "^0.7.1",
6464
"grunt-retinafy": "^0.1.5",
6565
"grunt-rollup": "^0.6.1",
66-
"grunt-spritesmith": "^6.1.0",
66+
"grunt-spritesmith": "^6.1.1",
6767
"grunt-string-replace": "^1.2.1",
6868
"load-grunt-tasks": "^3.4.0",
6969
"mocha": "^2.3.4",
7070
"phantomjs": "^1.9.19",
7171
"promise": "^7.1.1",
72-
"rollup": "^0.24.1",
72+
"rollup": "^0.25.0",
7373
"rollup-plugin-babel": "^2.3.8",
7474
"rollup-plugin-commonjs": "^2.1.0",
7575
"rollup-plugin-npm": "^1.2.1",

‎src/embed.js‎

Lines changed: 1 addition & 2 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
@@ -57,8 +57,8 @@ export default class Twitter {
5757
}
5858
return [this.output, this.embeds];
5959

60-
} catch (error) {
61-
console.log(error);
60+
} catch (e) {
61+
return [this.output, this.embeds];
6262
}
6363
}
6464
}

0 commit comments

Comments
 (0)