Skip to content

Commit be0b4dc

Browse files
tiagoschenkeltiagoschenkel
authored
Merge pull request #32 from RobotlegsJS/upgrade-dependencies
Update dependencies to latest version 🚀
2 parents 3947309 + 7479dfe commit be0b4dc

File tree

13 files changed

+1457
-1371
lines changed

13 files changed

+1457
-1371
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ indent_size = 4
1515
indent_style = space
1616
indent_size = 2
1717

18-
[{.codeclimate.yml,.eslintignore,.eslintrc,.istanbul.yml,.publishrc,.travis.yml}]
18+
[{.auditignore,.codeclimate.yml,.eslintignore,.eslintrc,.istanbul.yml,.prettierrc,.publishrc,.travis.yml}]
1919
indent_style = space
2020
indent_size = 2

‎.prettierrc‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,19 @@
55
"semi": true,
66
"singleQuote": false,
77
"trailingComma": "none",
8-
"bracketSpacing": true
8+
"bracketSpacing": true,
9+
"overrides": [
10+
{
11+
"files": "*.json",
12+
"options": {
13+
"tabWidth": 2
14+
}
15+
},
16+
{
17+
"files": ".prettierrc",
18+
"options": {
19+
"tabWidth": 2
20+
}
21+
}
22+
]
923
}

‎.vscode/settings.json‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
// Place your settings in this file to overwrite default and user settings.
22
{
33
"typescript.tsdk": "node_modules/typescript/lib",
4-
"tslint.configFile": "tslint.test.json"
4+
"tslint.configFile": "tslint.test.json",
5+
6+
// Set the default
7+
"editor.formatOnSave": false,
8+
9+
// Enable per-language
10+
"[html]": {
11+
"editor.formatOnSave": true
12+
},
13+
14+
"[json]": {
15+
"editor.formatOnSave": true
16+
},
17+
18+
"[javascript]": {
19+
"editor.formatOnSave": true
20+
},
21+
22+
"[typescript]": {
23+
"editor.formatOnSave": true
24+
}
525
}

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,16 @@ Types of changes:
4545
- in case of vulnerabilities.
4646
-->
4747

48+
#### Changed
49+
50+
- Deploy example project (see #24).
51+
52+
- Improve `prettier` rules and `autoformat` script (see #32).
53+
54+
- Enable `"editor.formatOnSave"` rule for `VS Code` (see #32).
55+
56+
- Update dev dependencies to latest version.
57+
4858
## Robotlegs-CreateJS 1.0.0
4959

5060
### [v1.0.0](https://github.com/RobotlegsJS/RobotlegsJS-CreateJS/releases/tag/1.0.0) - 2018-11-26

‎example/Game.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,25 @@ import { MyConfig } from "./config/MyConfig";
1414
import { RobotlegsView } from "./view/RobotlegsView";
1515

1616
export class Game {
17-
1817
private _canvas: HTMLCanvasElement;
1918
private _stage: createjs.Stage;
2019

2120
private _context: Context;
2221

23-
constructor () {
22+
constructor() {
2423
this.init();
2524
}
2625

2726
private init(): void {
28-
this._canvas = <HTMLCanvasElement>(document.getElementById("canvas"));
27+
this._canvas = <HTMLCanvasElement>document.getElementById("canvas");
2928
this._stage = new createjs.Stage(this._canvas);
3029

3130
this._context = new Context();
32-
this._context.install(MVCSBundle, CreateJSBundle).
33-
configure(new ContextView(this._stage)).
34-
configure(MyConfig).
35-
initialize();
31+
this._context
32+
.install(MVCSBundle, CreateJSBundle)
33+
.configure(new ContextView(this._stage))
34+
.configure(MyConfig)
35+
.initialize();
3636

3737
// enable touch interactions if supported on the current device:
3838
createjs.Touch.enable(this._stage);

‎package.json‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"start": "webpack-dev-server --config ./webpack.example.config.js",
99
"test": "node --max-old-space-size=2048 node_modules/.bin/karma start --single-run",
1010
"mocha": "mocha test/**/*.test.ts --require ts-node/register",
11-
"autoformat": "prettier --config .prettierrc --write {src,test,example}/**/*.ts",
11+
"autoformat": "prettier --config .prettierrc --write --list-different \"{src,static,test,example,definitions}{/**/,/}*.{html,css,js,json,ts}\"",
1212
"tslint-check:src": "tslint-config-prettier-check ./tslint.json",
1313
"tslint-check:test": "tslint-config-prettier-check ./tslint.test.json",
1414
"tslint-check:example": "tslint-config-prettier-check ./tslint.example.json",
@@ -65,17 +65,17 @@
6565
"reflect-metadata": "^0.1.12"
6666
},
6767
"devDependencies": {
68-
"@types/bluebird": "^3.5.25",
68+
"@types/bluebird": "^3.5.26",
6969
"@types/chai": "^4.1.7",
7070
"@types/easeljs": "^1.0.0",
71-
"@types/mocha": "^5.2.5",
72-
"@types/sinon": "^7.0.2",
73-
"@types/webpack-env": "^1.13.6",
71+
"@types/mocha": "^5.2.6",
72+
"@types/sinon": "^7.0.10",
73+
"@types/webpack-env": "^1.13.9",
7474
"bluebird": "^3.5.3",
7575
"browserify-versionify": "^1.0.6",
7676
"chai": "^4.2.0",
77-
"clean-webpack-plugin": "^1.0.0",
78-
"copy-webpack-plugin": "^4.6.0",
77+
"clean-webpack-plugin": "^2.0.1",
78+
"copy-webpack-plugin": "^5.0.1",
7979
"easeljs": "^1.0.2",
8080
"es6-map": "^0.1.5",
8181
"es6-symbol": "^3.1.1",
@@ -84,9 +84,9 @@
8484
"imports-loader": "^0.8.0",
8585
"istanbul": "^0.4.5",
8686
"istanbul-instrumenter-loader": "^3.0.1",
87-
"karma": "^3.1.4",
87+
"karma": "^4.0.1",
8888
"karma-chrome-launcher": "^2.2.0",
89-
"karma-coverage-istanbul-reporter": "^2.0.4",
89+
"karma-coverage-istanbul-reporter": "^2.0.5",
9090
"karma-es6-shim": "^1.0.0",
9191
"karma-mocha": "^1.3.0",
9292
"karma-mocha-reporter": "^2.2.5",
@@ -95,26 +95,26 @@
9595
"karma-sourcemap-loader": "^0.3.7",
9696
"karma-sourcemap-writer": "^0.1.2",
9797
"karma-webpack": "^3.0.5",
98-
"mocha": "^5.2.0",
98+
"mocha": "^6.0.2",
9999
"open-browser-webpack-plugin": "^0.0.5",
100-
"prettier": "^1.15.3",
100+
"prettier": "^1.16.4",
101101
"publish-please": "^5.4.3",
102-
"puppeteer": "^1.11.0",
103-
"reflect-metadata": "^0.1.12",
104-
"remap-istanbul": "^0.12.0",
105-
"rimraf": "^2.6.2",
106-
"sinon": "^7.2.2",
102+
"puppeteer": "^1.13.0",
103+
"reflect-metadata": "^0.1.13",
104+
"remap-istanbul": "^0.13.0",
105+
"rimraf": "^2.6.3",
106+
"sinon": "^7.3.0",
107107
"sinon-chai": "^3.3.0",
108-
"ts-loader": "^5.3.2",
109-
"ts-node": "^7.0.1",
110-
"tslint": "^5.12.0",
111-
"tslint-config-prettier": "^1.17.0",
112-
"typescript": "^3.2.2",
113-
"uglifyjs-webpack-plugin": "^2.1.0",
114-
"webpack": "^4.28.2",
115-
"webpack-cli": "^3.1.2",
108+
"ts-loader": "^5.3.3",
109+
"ts-node": "^8.0.3",
110+
"tslint": "^5.14.0",
111+
"tslint-config-prettier": "^1.18.0",
112+
"typescript": "^3.3.4000",
113+
"uglifyjs-webpack-plugin": "^2.1.2",
114+
"webpack": "^4.29.6",
115+
"webpack-cli": "^3.3.0",
116116
"webpack-concat-plugin": "^3.0.0",
117-
"webpack-dev-server": "^3.1.13",
117+
"webpack-dev-server": "^3.2.1",
118118
"webpack-simple-progress-plugin": "^0.0.4"
119119
}
120120
}

‎static/index.html‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,42 @@
11
<!DOCTYPE html>
22
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8" />
5+
<title>RobotlegsJS CreateJS Boilerplate</title>
6+
<link rel="stylesheet" href="styles/main.css" />
7+
<link rel="stylesheet" href="styles/example.css" />
8+
<link rel="manifest" href="manifest.json" />
39

4-
<head>
5-
<meta charset="UTF-8">
6-
<title>RobotlegsJS CreateJS Boilerplate</title>
7-
<link rel="stylesheet" href="styles/main.css">
8-
<link rel="stylesheet" href="styles/example.css">
9-
<link rel="manifest" href="manifest.json">
10+
<script>
11+
if (navigator.serviceWorker) {
12+
navigator.serviceWorker
13+
.register("service-worker.js")
14+
.then(function() {
15+
console.log("service worker installed");
16+
})
17+
.catch(function(err) {
18+
console.log("Error", err);
19+
});
20+
}
21+
</script>
1022

11-
<script>
12-
if (navigator.serviceWorker) {
13-
navigator.serviceWorker.register('service-worker.js')
14-
.then(function () {
15-
console.log('service worker installed');
16-
})
17-
.catch(function (err) {
18-
console.log('Error', err);
19-
});
20-
}
21-
</script>
23+
<script src="<%= htmlWebpackPlugin.files.webpackConcat.createjs %>"></script>
24+
<script src="<%= htmlWebpackPlugin.files.chunks.main.entry %>"></script>
25+
</head>
2226

23-
<script src="<%= htmlWebpackPlugin.files.webpackConcat.createjs %>"></script>
24-
<script src="<%= htmlWebpackPlugin.files.chunks.main.entry %>"></script>
25-
</head>
27+
<body>
28+
<header class="CreateJS">
29+
<h1>integration with <a target="_blank" href="https://createjs.com/">CreateJS</a></h1>
30+
<p>
31+
This example shows how to integrate <code>RobotlegsJS</code> framework with <code>EaselJS</code>. Click on the logo to see
32+
some action!
33+
</p>
34+
</header>
2635

27-
<body>
28-
<header class="CreateJS">
29-
<h1>integration with <a target="_blank" href="https://createjs.com/">CreateJS</a></h1>
30-
<p>This example shows how to integrate <code>RobotlegsJS</code> framework with <code>EaselJS</code>. Click on the logo to see some action!</p>
31-
</header>
32-
33-
<canvas id="canvas" width="960" height="400"></canvas>
34-
35-
<script type="text/javascript">
36-
window.onload = initGame;
37-
</script>
38-
</body>
36+
<canvas id="canvas" width="960" height="400"></canvas>
3937

38+
<script type="text/javascript">
39+
window.onload = initGame;
40+
</script>
41+
</body>
4042
</html>

‎static/manifest.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"display": "standalone",
66
"orientation": "landscape",
77
"icons": [
8-
{
9-
"src": "icon.png",
10-
"sizes": "512x512",
11-
"type": "image/png"
12-
},
8+
{
9+
"src": "icon.png",
10+
"sizes": "512x512",
11+
"type": "image/png"
12+
},
1313
{
1414
"src": "launcher-icon-2x.png",
1515
"sizes": "96x96",
@@ -26,4 +26,4 @@
2626
"type": "image/png"
2727
}
2828
]
29-
}
29+
}

0 commit comments

Comments
 (0)