diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index c56ef2363..e251299e6 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -3,35 +3,41 @@ name: Bug Report about: Something not working as expected? Tell us about it! --- - ### Steps to Reproduce + ### Expected Result + ### Actual Result + ### Environment + + - browsers and versions: - operating system: - Excalibur versions: - (anything else that may be relevant) ### Current Workaround + diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 24af7c487..b50177799 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -3,14 +3,14 @@ name: Feature Request about: Suggest a new feature or improvement --- - @@ -19,8 +19,10 @@ https://github.com/excaliburjs/Excalibur/blob/master/.github/CONTRIBUTING.md#sug ### Context + ### Proposal + diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f655ae707..e05a32b29 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,8 +1,8 @@ @@ -11,15 +11,15 @@ A quick summary checklist is included below for convenience: - [ ] :pushpin: issue exists in github for these changes - [ ] :microscope: existing tests still pass -- [ ] :see_no_evil: code conforms to the [style guide](https://github.com/excaliburjs/Excalibur/blob/master/STYLEGUIDE.md) +- [ ] :see_no_evil: code conforms to the [style guide](https://github.com/excaliburjs/Excalibur/blob/main/STYLEGUIDE.md) - [ ] :triangular_ruler: new tests written and passing / old tests updated with new scenario(s) - [ ] :page_facing_up: changelog entry added (or not needed) ================== - + - + diff --git a/.travis.yml b/.travis.yml index 5084a5b5c..5cb6c32f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ script: - npm run travis after_success: - node deploy-docs.js - - if [[ "$TRAVIS_PULL_REQUEST" = "false" && ( "$TRAVIS_BRANCH" = "master" || "$TRAVIS_TAG" != "" ) ]]; then node_modules/.bin/grunt dists; fi + - if [[ "$TRAVIS_PULL_REQUEST" = "false" && ( "$TRAVIS_BRANCH" = "main" || "$TRAVIS_TAG" != "" ) ]]; then node_modules/.bin/grunt dists; fi before_deploy: - npm run build-storybook deploy: @@ -26,9 +26,9 @@ deploy: github_token: $GH_TOKEN local_dir: ./build-storybook repo: excaliburjs/examples - target_branch: master + target_branch: main on: - branch: master + branch: main notifications: slack: secure: aQXFk2/MxX5eR2JM90xWAA9YX03QArY1ejUmnP/NkFHbB4zzKZblACjEeDTDTDCThZpXhrganX2nDWrWFrrXbOG28wKrRhEZSULPAgyiWGpfkMoT44fKmgh+eZ5C/isMF2eeQCrYo3EQCMxfCKxNaBhyLc+jr/Sm232zU2LaXo8= diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d7e49021..dc642122a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -406,7 +406,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Added -- Option bag constructors have been added for commonly-used classes (see [Constructors.md](https://github.com/excaliburjs/Excalibur/blob/master/src/engine/Docs/Constructors.md)) ([#410](https://github.com/excaliburjs/Excalibur/issues/410)) +- Option bag constructors have been added for commonly-used classes (see [Constructors.md](https://github.com/excaliburjs/Excalibur/blob/main/src/engine/Docs/Constructors.md)) ([#410](https://github.com/excaliburjs/Excalibur/issues/410)) @@ -728,7 +728,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - `Actor.addChild()` changed to `Actor.add()` ([#519](https://github.com/excaliburjs/Excalibur/issues/519)) - `Actor.removeChild()` changed to `Actor.remove()` ([#519](https://github.com/excaliburjs/Excalibur/issues/519)) -- Documentation is only deployed on changes to the master git branch ([#483](https://github.com/excaliburjs/Excalibur/issues/483)) +- Documentation is only deployed on changes to the main git branch ([#483](https://github.com/excaliburjs/Excalibur/issues/483)) - A warning message is now displayed if no supported audio format is provided for a browser ([#476](https://github.com/excaliburjs/Excalibur/issues/476)) - Updated TSLint directory scanning ([#442](https://github.com/excaliburjs/Excalibur/issues/442), [#443](https://github.com/excaliburjs/Excalibur/issues/443), [#447](https://github.com/excaliburjs/Excalibur/issues/447)) - Deprecated older methods ([#399](https://github.com/excaliburjs/Excalibur/issues/399)) diff --git a/Excalibur.nuspec b/Excalibur.nuspec index ff8f68685..05d599a26 100644 --- a/Excalibur.nuspec +++ b/Excalibur.nuspec @@ -6,8 +6,8 @@ $version$ Excalibur.js https://github.com/excaliburjs/Excalibur - https://github.com/excaliburjs/Excalibur/master/blob/LICENSE.md - https://raw.github.com/excaliburjs/Excalibur/master/assets/icon.png + https://github.com/excaliburjs/Excalibur/main/blob/LICENSE.md + https://raw.github.com/excaliburjs/Excalibur/main/assets/icon.png false Excalibur.js is a simple JavaScript game engine with TypeScript bindings for making 2D games in HTML5 Canvas. Our mission is to make web game development as simple as possible. diff --git a/GruntFile.js b/GruntFile.js index bab39e7ed..1ebfad196 100644 --- a/GruntFile.js +++ b/GruntFile.js @@ -30,7 +30,7 @@ module.exports = function (grunt) { // continuous integration dists dist: { options: { - branch: 'master', + branch: 'main', remote: 'https://github.com/excaliburjs/excalibur-dist', login: 'kamranayub', token: process.env.GH_DIST_TOKEN, diff --git a/README.md b/README.md index 0d12a608c..7bb0de8ee 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ![Logo](/assets/logo.png?raw=true) -[![Build Status](https://img.shields.io/travis/excaliburjs/Excalibur/master.svg)](https://travis-ci.org/excaliburjs/Excalibur) -[![Appveyor status](https://img.shields.io/appveyor/ci/eonarheim/excalibur/master.svg)](https://ci.appveyor.com/project/eonarheim/excalibur) +[![Build Status](https://img.shields.io/travis/excaliburjs/Excalibur/main.svg)](https://travis-ci.org/excaliburjs/Excalibur) +[![Appveyor status](https://img.shields.io/appveyor/ci/eonarheim/excalibur/main.svg)](https://ci.appveyor.com/project/eonarheim/excalibur) [![Coverage Status](https://coveralls.io/repos/github/excaliburjs/Excalibur/badge.svg)](https://coveralls.io/github/excaliburjs/Excalibur) [![npm version](https://img.shields.io/npm/v/excalibur.svg)](https://www.npmjs.com/package/excalibur) [![npm downloads](https://img.shields.io/npm/dt/excalibur.svg)](https://www.npmjs.com/package/excalibur) @@ -31,7 +31,7 @@ Visit the [API Reference](https://excaliburjs.com/docs/api/edge) section for ful # Questions - :question: Ask us anything in the [Excalibur.js forum](https://groups.google.com/forum/#!forum/excaliburjs) -- :bug: If you find a bug, report it on the [GitHub issues page](https://github.com/excaliburjs/Excalibur/issues) (please review our [guidelines for reporting bugs](https://github.com/excaliburjs/Excalibur/blob/master/.github/CONTRIBUTING.md#reporting-bugs)). +- :bug: If you find a bug, report it on the [GitHub issues page](https://github.com/excaliburjs/Excalibur/issues) (please review our [guidelines for reporting bugs](https://github.com/excaliburjs/Excalibur/blob/main/.github/CONTRIBUTING.md#reporting-bugs)). - :mega: You can also follow us on Twitter [@excaliburjs](http://twitter.com/excaliburjs) or [read the blog](http://blog.excaliburjs.com). # Samples diff --git a/deploy-docs.js b/deploy-docs.js index f07223a71..ed8570e80 100644 --- a/deploy-docs.js +++ b/deploy-docs.js @@ -1,56 +1,58 @@ var Travis = require('travis-ci'); -var repo = "excaliburjs/excaliburjs.github.io"; +var repo = 'excaliburjs/excaliburjs.github.io'; var travis = new Travis({ - version: '2.0.0', - headers: { - 'User-Agent': 'Travis/1.0' - } + version: '2.0.0', + headers: { + 'User-Agent': 'Travis/1.0' + } }); var branch = process.env.TRAVIS_BRANCH; var tag = process.env.TRAVIS_TAG; -var pr = process.env.TRAVIS_PULL_REQUEST; +var pr = process.env.TRAVIS_PULL_REQUEST; -if (pr !== "false") { - console.log("Skipping docs deployment, detected pull request"); - return; +if (pr !== 'false') { + console.log('Skipping docs deployment, detected pull request'); + return; } -// build docs for tags and master only +// build docs for tags and main only if (tag) { - console.log("Current tag is `" + tag + "`"); -} else if (branch == "master") { - console.log("Current branch is `" + branch + "`"); + console.log('Current tag is `' + tag + '`'); +} else if (branch == 'main') { + console.log('Current branch is `' + branch + '`'); } else { - console.log("Current branch is `" + branch + "`, skipping docs deployment..."); - return; + console.log('Current branch is `' + branch + '`, skipping docs deployment...'); + return; } -console.log("Triggering remote build of edge docs..."); +console.log('Triggering remote build of edge docs...'); -travis.authenticate({ - github_token: process.env.GH_TOKEN -}, - function (err, res) { +travis.authenticate( + { + github_token: process.env.GH_TOKEN + }, + function (err, res) { + if (err) { + return console.error(err); + } + + travis.repos(repo.split('/')[0], repo.split('/')[1]).builds.get(function (err, res) { if (err) { - return console.error(err); + return console.error(err); } - travis.repos(repo.split('/')[0], repo.split('/')[1]).builds.get( - function (err, res) { - if (err) { - return console.error(err); - } - - travis.requests.post({ - build_id: res.builds[0].id - }, function (err, res) { - if (err) { - return console.error(err); - } - console.log(res.flash[0].notice); - }); - } + travis.requests.post( + { + build_id: res.builds[0].id + }, + function (err, res) { + if (err) { + return console.error(err); + } + console.log(res.flash[0].notice); + } ); - } -); \ No newline at end of file + }); + } +);