Skip to content

Commit

Permalink
Undo 3e74a42 to preserve merge flow of non-breaking-change-branch -> …
Browse files Browse the repository at this point in the history
…master -> canary
  • Loading branch information
zenflow committed Jan 25, 2018
1 parent dcf8a72 commit 8d982b2
Show file tree
Hide file tree
Showing 14 changed files with 6,924 additions and 22 deletions.
6 changes: 6 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,9 @@ For bug reports, please include:
JSFiddle template: https://jsfiddle.net/ad3quksn/340/

JSFiddle template for IE11 and other old browsers: https://jsfiddle.net/ad3quksn/341/

---

For pull requests:

**Please make sure that `dist/*` files aren't committed.**
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
node_modules
bower_components
package-lock.json
dist
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ If you would like to contribute enhancements or fixes, please do the following:
- in browser: http://localhost:8080/test/qunit/
- via CLI: `npm test`

6. Make sure that `dist/*` files aren't committed and create a pull request.


Related projects
-------------------------
Expand Down
23 changes: 8 additions & 15 deletions config/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ const banner = require('./banner.js')
const fs = require('fs')
const uglify = require('uglify-js')
const css = require('rollup-plugin-css-only')
const pify = require('pify')
const mkdirp = require('mkdirp')

const mkdirpAsync = pify(mkdirp)

const toUpper = (_, c) => {
return c ? c.toUpperCase() : ''
Expand All @@ -30,18 +26,15 @@ const write = (dest, code) => {

const packageRollup = (options) => {
const moduleId = classify(pack.name)
return mkdirpAsync('./dist')
.then(() => {
return rollup({
input: options.entry || 'src/sweetalert2.js',
plugins: [
css({ output: false }),
babel({
exclude: 'node_modules/**'
})
]
return rollup({
input: options.entry || 'src/sweetalert2.js',
plugins: [
css({ output: false }),
babel({
exclude: 'node_modules/**'
})
})
]
})
.then((bundle) => {
return bundle.generate({
format: options.format,
Expand Down
1,886 changes: 1,886 additions & 0 deletions dist/sweetalert2.all.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/sweetalert2.all.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 8d982b2

Please sign in to comment.