Skip to content

Commit

Permalink
Merge branch 'release/1.26.0'
Browse files Browse the repository at this point in the history
* release/1.26.0:
  release 1.26.0
  Use data-title if present. Fixes #143
  fix webpack dev setup
  delete artifacts
  fix travis deployment
  use "git flow"
  remove release.sh
  remove Gruntfile.js
  fix travis by removing Chrome testing
  test shariff by calling "npm run test"
  use webpack in favor of grunt
  update [email protected]
  format changelog
  TBD => Unreleased
  ignore build/
  • Loading branch information
pmb0 committed Jul 28, 2017
2 parents eb09f76 + 36364e8 commit ee71b8f
Show file tree
Hide file tree
Showing 40 changed files with 5,997 additions and 3,043 deletions.
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["es2015"]
}
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = {
'space-before-function-paren': 0
},
env: {
jasmine: true,
mocha: true,
browser: true,
node: true,
es6: true
Expand Down
57 changes: 38 additions & 19 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,42 +1,61 @@
tmp/*
demo/*.js
demo/*.css
demo/build
demo/css
demo/fonts
*.map
#build/*
dist

bower_components

# Created by http://www.gitignore.io

### Node ###
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directory
# Commenting this out is preferred by some people, see
# https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
node_modules
# Dependency directories
node_modules/
jspm_packages/

# Typescript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env

# Users Environment Variables
.lock-wscript
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ env:
- TGZ_FILENAME=shariff-$VERSION.tar.gz

script:
- grunt test
- npm run test

before_deploy:
- echo "$TRAVIS_TAG / $VERSION / $VVERSION"
- echo "$ZIP_FILENAME / $TAR_FILENAME / $TGZ_FILENAME"
- bash -c 'if [ ! -f $ZIP_FILENAME ]; then 7z a -tzip ${ZIP_FILENAME} ./build/*; fi;'
- bash -c 'if [ ! -f $TAR_FILENAME ]; then 7z a -ttar ${TAR_FILENAME} ./build/*; fi;'
- npm run build
- bash -c 'if [ ! -f $ZIP_FILENAME ]; then 7z a -tzip ${ZIP_FILENAME} ./dist/*; fi;'
- bash -c 'if [ ! -f $TAR_FILENAME ]; then 7z a -ttar ${TAR_FILENAME} ./dist/*; fi;'
- bash -c 'if [ ! -f $TGZ_FILENAME ]; then 7z a ${TGZ_FILENAME} ${TAR_FILENAME}; fi;'

deploy:
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# Changelog

## TBD
## v1.26.0, 2017-07-28

* Added `npm run dev` command.
* Added tests for the DOM library. (glaszig)
* Added list of supported sharing services to READMEs.
* Added `{url}` placeholder to `data-mail-body` option. (stephankellermayr)
* Fixed Shariff to use `data-title` in favor of `meta[name=DC.title]` if present. ([#143](https://github.com/heiseonline/shariff/issues/143))
* Fixed Twitter popup opening twice when a tweet is embedded on a page. (Nebel54)
* Improved service initialization code. ([#188](https://github.com/heiseonline/shariff/issues/188))
* Made DOM element creation consistent. ([#234](https://github.com/heiseonline/shariff/pull/234))
Expand Down
231 changes: 0 additions & 231 deletions Gruntfile.js

This file was deleted.

6 changes: 4 additions & 2 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

To prepare a release you have to do the following tasks:

1. Update [CHANGELOG.md](CHANGELOG.md)
2. Run `./release.sh 1.2.3`
1. Run `git flow release start [version]`.
2. Bump versions in `package.json` and `bower.json`.
3. Update [CHANGELOG.md](CHANGELOG.md).
2. Run `git flow release finish`.

After pushing the release tag to GitHub, Travis CI will create release downloads and push the release to [npmjs.com](https://www.npmjs.com).

Expand Down
6 changes: 0 additions & 6 deletions build/shariff.complete.css

This file was deleted.

Loading

0 comments on commit ee71b8f

Please sign in to comment.