Improve webpack. Use seperated phaser.min.js

ganlvtech · Jan 25, 2019 · fcb5d3e · fcb5d3e
1 parent 1250c05
commit fcb5d3e
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 34 deletions.
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "main": "src/index.js",
   "scripts": {
-    "build": "webpack --config webpack.config.js",
+    "build": "webpack --config webpack.config.js --mode=production",
     "dev": "webpack-dev-server --config webpack.config.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },

diff --git a/public/index.html b/public/index.html
@@ -11,6 +11,10 @@
     </style>
 </head>
 <body>
+    <script src="phaser.min.js"></script>
     <script src="bundle.js"></script>
+    <script>
+        window.game = new CatchTheCatGame(11, 11, 20);
+    </script>
 </body>
 </html>
diff --git a/src/game.ts b/src/game.ts
@@ -11,7 +11,7 @@ export default class CatchTheCatGame extends Phaser.Game {
             type: Phaser.AUTO,
             parent: parent,
             backgroundColor: 0xeeeeee,
-            scene: scene
+            scene: scene,
         };
         super(config);
         this.mainScene = scene;

diff --git a/src/index.ts b/src/index.ts
@@ -1,9 +1,5 @@
 /// <reference path="./phaser.d.ts"/>
 
-import "phaser";
 import CatchTheCatGame from "./game";
 
-window.addEventListener("load", () => {
-    let game = new CatchTheCatGame(11, 11, 20);
-    window["game"] = game;
-});
+window["CatchTheCatGame"] = CatchTheCatGame;
diff --git a/src/scenes/mainScene.ts b/src/scenes/mainScene.ts
@@ -1,4 +1,3 @@
-import * as Phaser from "phaser";
 import data from "../data";
 import Cat from "../sprites/cat";
 import Block from "../sprites/block";

diff --git a/src/solvers/defaultSolver.ts b/src/solvers/defaultSolver.ts
@@ -1,10 +1,16 @@
 import MainScene from "../scenes/mainScene";
 
 export default function defaultSolver(blocksIsWall: boolean[][], i: number, j: number): number {
+    let result = -1;
     let neighbours = MainScene.getNeighbours(i, j);
-    return neighbours.findIndex(neighbour => {
-        return (blocksIsWall[neighbour.i] !== undefined
-            && blocksIsWall[neighbour.i][neighbour.j] !== undefined
-            && !blocksIsWall[neighbour.i][neighbour.j]);
+    neighbours.forEach((neighbour, direction) => {
+        if (direction == -1) {
+            if (blocksIsWall[neighbour.i] !== undefined
+                && blocksIsWall[neighbour.i][neighbour.j] !== undefined
+                && !blocksIsWall[neighbour.i][neighbour.j]) {
+                result = direction;
+            }
+        }
     });
+    return result;
 }
diff --git a/src/sprites/block.ts b/src/sprites/block.ts
@@ -1,4 +1,3 @@
-import * as Phaser from 'phaser';
 import MainScene from "../scenes/mainScene";
 
 export default class Block extends Phaser.GameObjects.Arc {
@@ -17,8 +16,8 @@ export default class Block extends Phaser.GameObjects.Arc {
 
         let shape = new Phaser.Geom.Circle(this.r / 2, this.r / 2, this.r);
         this.setInteractive(shape, Phaser.Geom.Circle.Contains);
-        this.on('pointerdown', () => {
-            this.emit('player_click', this.i, this.j);
+        this.on("pointerdown", () => {
+            this.emit("player_click", this.i, this.j);
         });
     }
 

diff --git a/src/sprites/cat.ts b/src/sprites/cat.ts
@@ -1,4 +1,3 @@
-import * as Phaser from "phaser";
 import MainScene from "../scenes/mainScene";
 import data from "../data";
 import defaultSolver from "../solvers/defaultSolver";

diff --git a/src/sprites/resetButton.ts b/src/sprites/resetButton.ts
@@ -1,4 +1,3 @@
-import * as Phaser from 'phaser';
 import MainScene from "../scenes/mainScene";
 import _ from "../i18n";
 

diff --git a/src/sprites/statusBar.ts b/src/sprites/statusBar.ts
@@ -1,4 +1,3 @@
-import * as Phaser from "phaser";
 import MainScene from "../scenes/mainScene";
 
 export default class StatusBar extends Phaser.GameObjects.Text {

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "ES2017",
+    "target": "ES5",
     "module": "CommonJs"
   }
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,8 +1,5 @@
 const path = require('path');
-const webpack = require('webpack');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
-const pathToPhaser = path.join(__dirname, '/node_modules/phaser/');
-const phaser = path.join(pathToPhaser, 'dist/phaser.js');
 
 module.exports = {
   mode: 'development',
@@ -28,28 +25,20 @@ module.exports = {
             presets: ['@babel/preset-env']
           }
         }
-      },
-      {
-        test: /\.svg$/,
-        loader: 'svg-inline-loader'
-      },
-      {
-        test: /phaser\.js$/,
-        loader: 'expose-loader?Phaser'
       }
     ]
   },
   plugins: [
     new CopyWebpackPlugin([
       {
         from: 'public'
+      },
+      {
+        from: 'node_modules/phaser/dist/phaser.min.js'
       }
     ])
   ],
   resolve: {
-    extensions: ['.ts', '.js'],
-    alias: {
-      phaser: phaser
-    }
+    extensions: ['.ts', '.js']
   }
 };