Merge pull request #86 from ahmedcharles/update

Update some dependencies.
This commit is contained in:
Resi Respati
2018-04-20 16:55:39 +07:00
committed by GitHub
3 changed files with 17 additions and 17 deletions

View File

@@ -6,13 +6,13 @@
"//": "If you add or change the names of destinations in screeps.json, make sure you update these scripts to reflect the changes", "//": "If you add or change the names of destinations in screeps.json, make sure you update these scripts to reflect the changes",
"scripts": { "scripts": {
"lint": "tslint \"src/**/*.ts\"", "lint": "tslint \"src/**/*.ts\"",
"push-main": "rollup -c --dest main", "push-main": "rollup -c --environment DEST:main",
"push-pserver": "rollup -c --dest pserver", "push-pserver": "rollup -c --environment DEST:pserver",
"push-sim": "rollup -c --dest sim", "push-sim": "rollup -c --environment DEST:sim",
"test": "echo \"Error: no test specified\" && exit 1", "test": "echo \"Error: no test specified\" && exit 1",
"watch-main": "rollup -cw --dest main", "watch-main": "rollup -cw --environment DEST:main",
"watch-pserver": "rollup -cw --dest pserver", "watch-pserver": "rollup -cw --environment DEST:pserver",
"watch-sim": "rollup -cw --dest sim" "watch-sim": "rollup -cw --environment DEST:sim"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@@ -26,15 +26,15 @@
"homepage": "https://github.com/screepers/screeps-typescript-starter#readme", "homepage": "https://github.com/screepers/screeps-typescript-starter#readme",
"devDependencies": { "devDependencies": {
"@types/lodash": "^3.10.1", "@types/lodash": "^3.10.1",
"@types/screeps": "^2.1.0", "@types/screeps": "^2.2.1",
"rollup": "^0.55.3", "rollup": "^0.57.1",
"rollup-plugin-clean": "^1.0.0", "rollup-plugin-clean": "^1.0.0",
"rollup-plugin-commonjs": "^8.2.6", "rollup-plugin-commonjs": "^9.1.0",
"rollup-plugin-node-resolve": "^3.0.0", "rollup-plugin-node-resolve": "^3.3.0",
"rollup-plugin-screeps": "^0.1.2", "rollup-plugin-screeps": "^0.1.2",
"rollup-plugin-typescript2": "^0.11.0", "rollup-plugin-typescript2": "^0.12.0",
"tslint": "^5.8.0", "tslint": "^5.9.1",
"typescript": "^2.7.1" "typescript": "^2.8.1"
}, },
"dependencies": { "dependencies": {
"source-map": "~0.6.1" "source-map": "~0.6.1"

View File

@@ -7,10 +7,10 @@ import typescript from "rollup-plugin-typescript2";
import screeps from "rollup-plugin-screeps"; import screeps from "rollup-plugin-screeps";
let cfg; let cfg;
const i = process.argv.indexOf("--dest") + 1; const dest = process.env.DEST;
if (i == 0) { if (!dest) {
console.log("No destination specified - code will be compiled but not uploaded"); console.log("No destination specified - code will be compiled but not uploaded");
} else if (i >= process.argv.length || (cfg = require("./screeps")[process.argv[i]]) == null) { } else if ((cfg = require("./screeps")[dest]) == null) {
throw new Error("Invalid upload destination"); throw new Error("Invalid upload destination");
} }

View File

@@ -1,6 +1,6 @@
{ {
"compilerOptions": { "compilerOptions": {
"module": "commonjs", "module": "es2015",
"target": "es5", "target": "es5",
"outDir": "dist", "outDir": "dist",
"baseUrl": "src/", "baseUrl": "src/",