Merge branch 'master' into unit-test-get-nectar

Author: Josh Lory

.gitignore

@@ -39,7 +39,7 @@ Icon?
 /.cake_task_cache
 
 # Build files
-/lib
+/dist
 /demo/dist
 
 # VScode settings

package.json

@@ -2,14 +2,11 @@
   "name": "@code-dot-org/maze",
   "version": "1.1.0",
   "description": "standalone project for the Maze app type",
-  "files": [
-    "lib/maze.js"
-  ],
-  "main": "lib/maze.js",
+  "main": "dist/main.js",
   "scripts": {
     "build": "webpack -p",
-    "build:dev": "webpack --progress --colors",
-    "build:demo": "webpack --config demo/webpack.config.js",
+    "build:dev": "webpack --progress --colors --mode=development",
+    "build:demo": "webpack --config demo/webpack.config.js -p",
     "lint": "eslint --ext .js src/ test",
     "postversion": "git push && git push --tags && npm publish",
     "preversion": "npm run test",
@@ -29,7 +26,7 @@
     "babel-core": "^6.26.0",
     "babel-eslint": "^8.0.3",
     "babel-jest": "^22.1.0",
-    "babel-loader": "^7.1.2",
+    "babel-loader": "^7.1.4",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-transform-class-properties": "^6.23.0",
     "babel-plugin-transform-es2015-classes": "^6.9.0",
@@ -38,12 +35,11 @@
     "codecov": "^3.0.0",
     "eslint": "^3.19.0",
     "eslint-plugin-babel": "^4.1.2",
-    "file-loader": "^1.1.6",
-    "html-webpack-plugin": "^2.30.1",
+    "file-loader": "^1.1.11",
+    "html-webpack-plugin": "^3.2.0",
     "jest": "^22.1.3",
-    "prop-types": "^15.6.0",
-    "webpack": "^3.8.1",
-    "webpack-dev-server": "^2.9.5"
+    "webpack": "^4.8.1",
+    "webpack-cli": "^2.1.3"
   },
   "jest": {
     "coverageDirectory": "./coverage/",

src/bee.js

@@ -395,7 +395,7 @@ module.exports = class Bee extends Gatherer {
   /**
    * @override
    */
-  getEmptyTile(x, y, adjacentToPath, wallMap) {
+  getEmptyTile(x, y, adjacentToPath) {
     // begin with three trees
     var tileChoices = ['null3', 'null4', 'null0'];
     var noTree = 'null1';

src/subtype.js

@@ -30,6 +30,9 @@ const TILE_SHAPES = {
   'null4': [1, 3],
 };
 
+// Chance of showing a random wall tile other than the default.
+const RANDOM_TILE_RATE = 0.2;
+
 module.exports = class Subtype extends EventEmitter {
   constructor(maze, {skin, level} = {}) {
     super();
@@ -136,10 +139,10 @@ module.exports = class Subtype extends EventEmitter {
     );
   }
 
-  getEmptyTile(x, y, adjacentToPath) {
+  getEmptyTile(x, y, adjacentToPath, innerCorner) {
     let tile;
     // Empty square.  Use null0 for large areas, with null1-4 for borders.
-    if (!adjacentToPath && Math.random() > 0.3) {
+    if (innerCorner || (!adjacentToPath && Math.random() > RANDOM_TILE_RATE)) {
       this.wallMap[y][x] = 0;
       tile = 'null0';
     } else {
@@ -166,12 +169,14 @@ module.exports = class Subtype extends EventEmitter {
         this.isOnPathStr_(col, row + 1) + // South.
         this.isOnPathStr_(col - 1, row); // East.
 
-      const adjacentToPath = (tile !== '00000');
-
       // Draw the tile.
       if (!TILE_SHAPES[tile]) {
+        const adjacentToPath = tile !== '00000';
+        // Any block with 2, 3 or 4 orthogonal paths.
+        const innerCorner = adjacentToPath && tile.split('1').length > 2;
+
         // We have an empty square. Handle it differently based on skin.
-        tile = this.getEmptyTile(col, row, adjacentToPath);
+        tile = this.getEmptyTile(col, row, adjacentToPath, innerCorner);
       }
 
       this.drawTile(svg, TILE_SHAPES[tile], row, col, tileId);

webpack.config.js

@@ -1,28 +1,11 @@
-const path = require("path");
-const name = "maze";
-
 module.exports = {
-  entry: './src/index.js',
   output: {
-    path: path.resolve(__dirname, "lib"),
-    filename: name + ".js",
-    library: name,
     libraryTarget: 'umd',
-    umdNamedDefine: true
   },
-  target: 'node',
   module: {
     rules: [{
       test: /\.js$/,
       loader: "babel-loader",
     }]
   },
-  resolve: {
-    extensions: [".js"],
-  },
-  stats: {
-    colors: true
-  },
-  devtool: 'source-map',
-  devServer: { inline: true }
 };