Merge pull request #26 from saqsun/master

bug fixings

Author: Ashot Avagyan

.eslintrc.js

@@ -3,7 +3,7 @@ const settings = {
     browser: true,
   },
   parser: 'babel-eslint',
-  extends: 'standard-trailing-commas',
+  extends: 'standard',
   plugins: ['import'],
   settings: {
     'import/parser': 'babel-eslint',
@@ -17,7 +17,18 @@ const settings = {
     NODE_ENV: true,
   },
   rules: {
-    'space-before-function-paren': 0,
+    'comma-dangle': [
+      'error',
+      {
+        arrays: 'always-multiline',
+        objects: 'always-multiline',
+        imports: 'always-multiline',
+        exports: 'always-multiline',
+        functions: 'always-multiline',
+      },
+    ],
+    'no-fallthrough': ['error', { commentPattern: 'break[\\s\\w]*omitted' }],
+    'standard/computed-property-even-spacing': 0,
   },
 }
 

README.md

@@ -1,54 +1,73 @@
+# Phaser Particle Editor Plugin
 
-Phaser Particle Editor Plugin
-================
- [![Build Status](https://travis-ci.org/koreezgames/phaser-particle-editor-plugin.svg?branch=master)](https://travis-ci.org/koreezgames/phaser-particle-editor-plugin) [![David](https://david-dm.org/koreezgames/phaser-particle-editor-plugin.svg)]() [![Project status](https://img.shields.io/badge/status-active-brightgreen.svg)](#status)
+[![Build Status](https://travis-ci.org/koreezgames/phaser-particle-editor-plugin.svg?branch=master)](https://travis-ci.org/koreezgames/phaser-particle-editor-plugin) [![David](https://david-dm.org/koreezgames/phaser-particle-editor-plugin.svg)]() [![Project status](https://img.shields.io/badge/status-active-brightgreen.svg)](#status)
 
 This plugin creates particle effects based on JSON data generated by **[Phaser Particle Editor](https://phaser-particle-editor.firebaseapp.com/)**
- 
-Getting Started
----------------
+
+## Getting Started
+
 ### Installation
-#### ***Using script tag:***
+
+#### **_Using script tag:_**
+
 [![](https://data.jsdelivr.com/v1/package/npm/@koreez/phaser-particle-editor-plugin/badge?style=rounded)](https://www.jsdelivr.com/package/npm/@koreez/phaser-particle-editor-plugin/dist/plugin.min.js)
+
 ```html
 <script src="//cdn.jsdelivr.net/npm/@koreez/phaser-particle-editor-plugin/dist/plugin.min.js"></script>
 ```
-#### ***Using npm:***
+
+#### **_Using npm:_**
+
 [![npm](https://img.shields.io/npm/dt/@koreez/phaser-particle-editor-plugin.svg)](https://www.npmjs.com/package/@koreez/phaser-particle-editor-plugin)
+
 ```shell
 $ npm i -g npm
 $ npm i --save  @koreez/phaser-particle-editor-plugin
 ```
-Usage
------
+
+## Usage
+
 ### Import the plugin
-##### ***CommonJS***
+
+##### **_CommonJS_**
+
 ```javascript
-var ParticleEditorPlugin = require('@koreez/phaser-particle-editor-plugin')
+var ParticleEditorPlugin = require("@koreez/phaser-particle-editor-plugin");
 ```
-##### ***ES2015***
+
+##### **_ES2015_**
+
 ```javascript
-import { ParticleEditorPlugin } from '@koreez/phaser-particle-editor-plugin'
+import ParticleEditorPlugin from "@koreez/phaser-particle-editor-plugin";
 ```
+
 ### Load the plugin
+
 You need to load the plugin in your game. This is done just like any other plugin in Phaser.
 So, to load the plugin, include it one of the Phaser States.
+
 ```javascript
 game.plugins.add(ParticleEditorPlugin);
 ```
-The plugin will patch your Phaser game with additional *add / make* methods so this plugin fits up in Phaser like any normal object.
+
+The plugin will patch your Phaser game with additional _add / make_ methods so this plugin fits up in Phaser like any normal object.
+
 ### Create particles
+
 ```javascript
 // x - any
 // y - any
 // data - should be already loaded JSON key or existing object based on Particle Editor data
 // group - parent container
-game.add.particleEffect(x, y, data, group)
+game.add.particleEffect(x, y, data, group);
 // or
-game.make.particleEffect(x, y, data)
+game.make.particleEffect(x, y, data);
 ```
 
 ## News & Community
+
 We have a [forum](http://www.html5gamedevs.com/topic/33387-phaser-particle-editor/) so you can always be up to date with latest news!
+
 ## Contributing
-Coming soon!
+
+Coming soon!

config/.eslintrc.js

@@ -1,9 +1,21 @@
 const settings = {
   env: {
     browser: false,
-    node: true
+    node: true,
+  },
+  extends: 'standard',
+  rules: {
+    'comma-dangle': [
+      'error',
+      {
+        arrays: 'always-multiline',
+        objects: 'always-multiline',
+        imports: 'always-multiline',
+        exports: 'always-multiline',
+        functions: 'always-multiline',
+      },
+    ],
   },
-  extends: 'standard-trailing-commas'
 }
 
 module.exports = settings

config/webpack.config.js

@@ -30,10 +30,11 @@ const libConfig = merge([
     },
     output: {
       path: paths.dist,
+      libraryExport: 'default',
     },
     resolve: {
       alias: {
-        'phaser': paths.phaser,
+        phaser: paths.phaser,
       },
       modules: [path.resolve('./node_modules'), path.resolve('./src')],
       extensions: ['.json', '.js'],
@@ -78,7 +79,7 @@ const varConfig = merge([
       umdNamedDefine: false,
     },
     externals: {
-      'phaser': 'Phaser',
+      phaser: 'Phaser',
     },
   },
 ])
@@ -93,20 +94,16 @@ const umdConfig = merge([
     },
     externals: {
       phaser: {
-        commonjs: 'phaser',
-        commonjs2: 'phaser',
-        amd: 'phaser',
+        commonjs: 'Phaser',
+        commonjs2: 'Phaser',
+        amd: 'Phaser',
         root: 'Phaser',
       },
     },
   },
 ])
 
 module.exports = env => {
-  const config = merge(
-    libConfig,
-    env === 'var' ? varConfig : umdConfig
-  )
-
+  const config = merge(libConfig, env === 'var' ? varConfig : umdConfig)
   return config
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@koreez/phaser-particle-editor-plugin",
-  "version": "1.0.0-alpha.18",
+  "version": "1.0.0-alpha.19",
   "description": "Phaser Particle Editor Plugin",
   "main": "dist/library.js",
   "scripts": {
@@ -16,15 +16,13 @@
     "babel-cli": "^6.26.0",
     "babel-eslint": "^7.2.3",
     "babel-loader": "^7.0.0",
-    "babel-plugin-add-module-exports": "^0.2.1",
     "babel-preset-env": "^1.6.1",
     "babel-preset-stage-2": "^6.24.1",
     "case-sensitive-paths-webpack-plugin": "^2.1.1",
     "clean-webpack-plugin": "^0.1.17",
     "concurrently": "^3.5.1",
     "eslint": "^3.19.0",
     "eslint-config-standard": "^10.2.1",
-    "eslint-config-standard-trailing-commas": "^6.1.0",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-node": "^4.2.2",
     "eslint-plugin-promise": "^3.6.0",

package.json

@@ -2,14 +2,14 @@ import Phaser from 'phaser'
 import ExtendedParticle from './ExtendedParticle'
 
 export default class ExtendedEmitter extends Phaser.Particles.Arcade.Emitter {
-  constructor(game, name, properties) {
+  constructor (game, name, properties) {
     super(game, properties.emitX, properties.emitY, properties.maxParticles)
     this.name = name
     this.particleClass = ExtendedParticle
     this.applyProperties(properties)
   }
 
-  applyProperties(properties) {
+  applyProperties (properties) {
     this.properties = properties
     this.gravity.x = properties.gravityX
     this.gravity.y = properties.gravityY
@@ -60,7 +60,7 @@ export default class ExtendedEmitter extends Phaser.Particles.Arcade.Emitter {
     ]
   }
 
-  resetParticle(particle, x, y) {
+  resetParticle (particle, x, y) {
     super.resetParticle(particle, x, y)
     if (this.particleArgumentsColor) {
       particle.tint = Phaser.Color.getColor32(

src/com/koreez/particleeditorplugin/ExtendedEmitter.js

@@ -1,12 +1,12 @@
 import Phaser from 'phaser'
 
 export default class ExtendedParticle extends Phaser.Particle {
-  constructor(game, x, y, key, frame, particleArguments) {
+  constructor (game, x, y, key, frame, particleArguments) {
     super(game, x, y, key, frame)
     this.particleArgumentsColor = particleArguments['color'] || null
   }
 
-  onEmit() {
+  onEmit () {
     if (this.particleArgumentsColor) {
       const startColor = Phaser.Color.createColor(
         this.particleArgumentsColor.start.r,
@@ -32,7 +32,7 @@ export default class ExtendedParticle extends Phaser.Particle {
     super.onEmit()
   }
 
-  updateColor(tween) {
+  updateColor (tween) {
     Phaser.Color.updateColor(tween.target)
     this.tint = Phaser.Color.getColor32(
       this.alpha,
@@ -42,7 +42,7 @@ export default class ExtendedParticle extends Phaser.Particle {
     )
   }
 
-  onTweenComplete(tween) {
+  onTweenComplete (tween) {
     this.game.tweens.remove(tween)
   }
 }

src/com/koreez/particleeditorplugin/ExtendedParticle.js

@@ -2,12 +2,12 @@ import ParticleEffect from './ParticleEffect'
 import Phaser from 'phaser'
 
 export default class ParticleEditorPlugin extends Phaser.Plugin {
-  constructor(game, parent) {
+  constructor (game, parent) {
     super(game, parent)
     this.addParticleFactory()
   }
 
-  addParticleFactory() {
+  addParticleFactory () {
     Phaser.GameObjectFactory.prototype.particleEffect = (x, y, key, group) => {
       const particle = new ParticleEffect(this.game, this.getData(key), x, y)
       return (group || this.game.world).add(particle)
@@ -17,7 +17,7 @@ export default class ParticleEditorPlugin extends Phaser.Plugin {
     }
   }
 
-  getData(key) {
+  getData (key) {
     if (typeof key === 'string') {
       return this.game.cache.getJSON(key)
     }