Skip to content

Commit

Permalink
Merge pull request #67 from GGAlanSmithee/dev
Browse files Browse the repository at this point in the history
merge dev into master, 2.1.0
  • Loading branch information
GGAlanSmithee authored May 31, 2018
2 parents bf3e057 + ce99627 commit 8a563c2
Show file tree
Hide file tree
Showing 48 changed files with 8,993 additions and 3,618 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"env":
{
"node": true,
"mocha": true,
"jest": true,
"es6": true
},
"rules":
Expand Down
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
.gitignore
.eslintrc
.babelrc
yarn.lock
build
coverage
examples
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Changelog

## v2.1.0 (2018-05-31)

`EntityManager.registerSystem` now properly registers a system using only the `components` array passed in

## v2.0.4 (2017-04-05)

Updated examples to be usable online
Expand Down
10 changes: 4 additions & 6 deletions build/bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,15 @@ rollup.rollup({
format: 'umd',
moduleId: 'GGEntities',
moduleName: 'GGEntities'
})).then((c) => {
})).then(() => {
const entitiesPath = path.join(__dirname, '../dist/gg-entities.js')

const polyfill = fs.readFileSync(path.join(__dirname, '../node_modules/babel-polyfill/dist/polyfill.js'), 'utf8')
const entities = fs.readFileSync(entitiesPath, 'utf8')

fs.writeFile(entitiesPath, `${polyfill}\n\n${entities}`, error => {
if (error) {
console.error(error)
}
console.error(error) // eslint-disable-line no-console
}
})
}).catch(error => {
console.error(error)
})
}).catch(console.error) // eslint-disable-line no-console
Loading

0 comments on commit 8a563c2

Please sign in to comment.