From 2d0b9c7ab65b49a2adee0f868cc197bdc1e6292c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Tue, 13 Jun 2017 19:53:40 +0200 Subject: [PATCH] Switched to yarn (instead of npm+bower) --- .bowerrc | 3 - .travis.yml | 3 +- .vscode/tasks.json | 2 +- README.md | 10 +- bower.json | 17 - out/ai.html | 20 +- out/index.html | 4 +- out/loot.html | 2 +- out/tests.html | 10 +- package.json | 19 +- npm => spacetac | 7 +- spec/support/karma.conf.js | 2 +- yarn.lock | 3326 ++++++++++++++++++++++++++++++++++++ 13 files changed, 3370 insertions(+), 55 deletions(-) delete mode 100644 .bowerrc delete mode 100644 bower.json rename npm => spacetac (63%) create mode 100644 yarn.lock diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index cbc1879..0000000 --- a/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "directory": "out/vendor/" -} \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 3537996..b55455b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: node_js sudo: false +cache: yarn node_js: - "6" after_success: - - npm run codecov + - yarn run codecov diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 69b06ae..bcb3624 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,6 +1,6 @@ { "version": "0.1.0", - "command": "./npm", + "command": "./spacetac", "isShellCommand": true, "args": [ "run", diff --git a/README.md b/README.md index bebf34f..e2cd8d3 100644 --- a/README.md +++ b/README.md @@ -11,15 +11,17 @@ ## How to develop +The only hard dependency of the toolchain is Python3. + If you want to build on your computer, clone the repository, then run: - npm install # Install dependencies - npm test # Run unit tests - rpm start # Start development server, and open game in web browser + ./spacetac install # Install dependencies + ./spacetac test # Run unit tests + ./spacetac start # Start development server, and open game in web browser After making changes to sources, you need to recompile: - npm run build + ./spacetac run build ## Credits diff --git a/bower.json b/bower.json deleted file mode 100644 index 8cf4e30..0000000 --- a/bower.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "spacetac", - "description": "A tactical RPG set in space", - "main": "out/build.js", - "authors": [ - "Michael Lemaire" - ], - "license": "MIT", - "homepage": "https://thunderk.net/spacetac/", - "private": true, - "dependencies": { - "phaser": "2.6.2", - "parse": "1.9.2", - "jasmine-core": "jasmine#^2.5.2", - "phaser-plugin-scene-graph": "samme/phaser-plugin-scene-graph#1.0.4" - } -} diff --git a/out/ai.html b/out/ai.html index 9879135..b95708e 100644 --- a/out/ai.html +++ b/out/ai.html @@ -9,17 +9,17 @@ * { margin: 0; } - + body { background-color: #111; color: #eee; } - + h1 { margin-bottom: 38px; font-size: 30px; } - + #duel { width: 50vw; margin-top: 30vh; @@ -27,7 +27,7 @@ margin-right: auto; text-align: center; } - + button, select { font-size: 26px; @@ -36,22 +36,22 @@ background-color: #ddd; cursor: pointer; } - + td { padding: 12px; width: 16vw; text-align: center; font-size: 26px; } - + td:nth-child(1) { background-color: #611; } - + td:nth-child(3) { background-color: #148; } - + td[colspan] { background-color: inherit; } @@ -59,7 +59,7 @@ - +
@@ -94,4 +94,4 @@ - + \ No newline at end of file diff --git a/out/index.html b/out/index.html index 294a6be..9f1e79c 100644 --- a/out/index.html +++ b/out/index.html @@ -27,8 +27,8 @@
- - + + +
diff --git a/out/tests.html b/out/tests.html index ce694f7..e3e9d88 100644 --- a/out/tests.html +++ b/out/tests.html @@ -5,7 +5,7 @@ SpaceTac - Unit tests - +