From b0225d47329dbd2c2c87ab8a9ff47d678fca93fe Mon Sep 17 00:00:00 2001
From: brisberg <brandon.risberg@gmail.com>
Date: Mon, 30 Mar 2020 17:36:34 -0700
Subject: [PATCH] Updated rollup to 1.32 and plugin deps

---
 package.json                      | 10 +++++-----
 rollup.config.js                  | 10 +++++-----
 rollup.test-integration-config.js | 10 +++++-----
 rollup.test-unit-config.js        | 10 +++++-----
 test/integration/helper.ts        |  4 ++--
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 9f61cab..155d917 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,9 @@
   },
   "homepage": "https://github.com/screepers/screeps-typescript-starter#readme",
   "devDependencies": {
+    "@rollup/plugin-commonjs": "^11.0.2",
+    "@rollup/plugin-multi-entry": "^3.0.0",
+    "@rollup/plugin-node-resolve": "^7.1.1",
     "@types/chai": "^4.1.6",
     "@types/lodash": "^3.10.1",
     "@types/mocha": "^5.2.5",
@@ -39,15 +42,12 @@
     "lodash": "^3.10.1",
     "mocha": "^5.2.0",
     "prettier": "^1.14.0",
-    "rollup": "^0.63.4",
+    "rollup": "^1.32.1",
     "rollup-plugin-buble": "^0.19.4",
     "rollup-plugin-clear": "^2.0.7",
-    "rollup-plugin-commonjs": "^9.1.4",
-    "rollup-plugin-multi-entry": "^2.0.2",
-    "rollup-plugin-node-resolve": "^3.3.0",
     "rollup-plugin-nodent": "^0.2.2",
     "rollup-plugin-screeps": "^0.1.2",
-    "rollup-plugin-typescript2": "^0.16.1",
+    "rollup-plugin-typescript2": "^0.27.0",
     "sinon": "^6.3.5",
     "sinon-chai": "^3.2.0",
     "ts-node": "^7.0.1",
diff --git a/rollup.config.js b/rollup.config.js
index 9d47d4e..b0ea090 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,10 +1,10 @@
 "use strict";
 
-import clear from "rollup-plugin-clear";
-import resolve from "rollup-plugin-node-resolve";
-import commonjs from "rollup-plugin-commonjs";
-import typescript from "rollup-plugin-typescript2";
-import screeps from "rollup-plugin-screeps";
+import clear from 'rollup-plugin-clear';
+import resolve from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import typescript from 'rollup-plugin-typescript2';
+import screeps from 'rollup-plugin-screeps';
 
 let cfg;
 const dest = process.env.DEST;
diff --git a/rollup.test-integration-config.js b/rollup.test-integration-config.js
index 556bdf7..5493f10 100644
--- a/rollup.test-integration-config.js
+++ b/rollup.test-integration-config.js
@@ -1,11 +1,11 @@
 "use strict";
 
-import clear from "rollup-plugin-clear";
-import resolve from "rollup-plugin-node-resolve";
-import commonjs from "rollup-plugin-commonjs";
-import typescript from "rollup-plugin-typescript2";
+import clear from 'rollup-plugin-clear';
+import resolve from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import typescript from 'rollup-plugin-typescript2';
 import buble      from 'rollup-plugin-buble';
-import multiEntry from 'rollup-plugin-multi-entry';
+import multiEntry from '@rollup/plugin-multi-entry';
 import nodent from 'rollup-plugin-nodent';
 
 export default {
diff --git a/rollup.test-unit-config.js b/rollup.test-unit-config.js
index fc8c095..4cea680 100644
--- a/rollup.test-unit-config.js
+++ b/rollup.test-unit-config.js
@@ -1,11 +1,11 @@
 "use strict";
 
-import clear from "rollup-plugin-clear";
-import resolve from "rollup-plugin-node-resolve";
-import commonjs from "rollup-plugin-commonjs";
-import typescript from "rollup-plugin-typescript2";
+import clear from 'rollup-plugin-clear';
+import resolve from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import typescript from 'rollup-plugin-typescript2';
 import buble      from 'rollup-plugin-buble';
-import multiEntry from 'rollup-plugin-multi-entry';
+import multiEntry from '@rollup/plugin-multi-entry';
 
 export default {
   input: 'test/unit/**/*.test.ts',
diff --git a/test/integration/helper.ts b/test/integration/helper.ts
index bb8e162..18bc749 100644
--- a/test/integration/helper.ts
+++ b/test/integration/helper.ts
@@ -9,8 +9,8 @@ const DIST_MAIN_JS = 'dist/main.js';
  * manipulating the terrain and game state.
  */
 class IntegrationTestHelper {
-  private _server;
-  private _player;
+  private _server: any;
+  private _player: any;
 
   get server() {
     return this._server;