Merge remote-tracking branch 'refs/remotes/origin/4.1.x'

NPM compatiblity
melonjs · Jul 4, 2017 · 532bb95 · 532bb95
2 parents 1626622 + 36d3ca0
commit 532bb95
Show file tree

Hide file tree

Showing 26 changed files with 37 additions and 42 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -19,3 +19,4 @@ indent_size = 2
 [Gruntfile.js]
 indent_style = space
 indent_size = 2
+
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 # Eclipse files
 .project
 .settings
+.idea
 
 # Grunt files
 .grunt

diff --git a/.project b/.project
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -16,7 +16,7 @@ module.exports = function (grunt) {
     pkg : grunt.file.readJSON("package.json"),
     path : {
       main : "build/<%= pkg.name %>.js",
-      min : "build/<%= pkg.name %>-min.js"
+      min : "build/<%= pkg.name %>.min.js"
     },
 
     concat : {
@@ -222,7 +222,8 @@ module.exports = function (grunt) {
         expand : true,
         src : [
           "index.html",
-          "build/melonJS.js",
+          "build/melonjs.js",
+          "build/melonjs.min.js",
           "docs/**",
           "examples/**",
           "media/logo.png",

diff --git a/MIT-LICENSE → LICENSE b/MIT-LICENSE → LICENSE
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
-  "name": "melonJS",
-  "main": "build/melonJS-min.js",
+  "name": "melonjs",
+  "main": "build/melonjs-min.js",
   "repository": {
     "type": "git",
     "url": "git://github.com/melonjs/melonJS.git"

diff --git a/examples/UI/index.html b/examples/UI/index.html
@@ -12,7 +12,7 @@
   <div id="screen"></div>
 
   <!-- melonJS Library -->
-  <script type="text/javascript" src="../../build/melonJS.js"></script>
+  <script type="text/javascript" src="../../build/melonjs.js"></script>
   <script type="text/javascript" src="../../plugins/debug/debugPanel.js"></script>
 
   <!-- Game Scripts -->

diff --git a/examples/collision_test/index.html b/examples/collision_test/index.html
@@ -11,7 +11,7 @@
 </head>
 <body>
   <div id="screen"></div>
-  <script type="text/javascript" src="../../build/melonJS.js"></script>
+  <script type="text/javascript" src="../../build/melonjs.js"></script>
   <script type="text/javascript" src="../../plugins/debug/debugPanel.js"></script>
   <script type="text/javascript" src="main.js"></script>
 </body>

diff --git a/examples/devicetest/index.html b/examples/devicetest/index.html
@@ -12,7 +12,7 @@
   <div id="screen"></div>
 
   <!-- melonJS Library -->
-  <script type="text/javascript" src="../../build/melonJS.js"></script>
+  <script type="text/javascript" src="../../build/melonjs.js"></script>
 
   <!-- Plugin(s) -->
   <script type="text/javascript" src="../../plugins/debug/debugPanel.js"></script>

diff --git a/examples/drag-and-drop/index.html b/examples/drag-and-drop/index.html
@@ -12,7 +12,7 @@
   <div id="screen"></div>
 
   <!-- melonJS Library -->
-  <script type="text/javascript" src="../../build/melonJS.js"></script>
+  <script type="text/javascript" src="../../build/melonjs.js"></script>
   <script type="text/javascript" src="../../plugins/debug/debugPanel.js"></script>
 
   <!-- Game Scripts -->

diff --git a/examples/entitypool/index.html b/examples/entitypool/index.html
@@ -12,7 +12,7 @@
   <div id="screen"></div>
 
   <!-- melonJS Library -->
-  <script type="text/javascript" src="../../build/melonJS.js"></script>
+  <script type="text/javascript" src="../../build/melonjs.js"></script>
 
   <!-- Plugin(s) -->
   <script type="text/javascript" src="../../plugins/debug/debugPanel.js"></script>

diff --git a/examples/font_test/index.html b/examples/font_test/index.html
@@ -9,7 +9,7 @@
   <div id="screen"></div>
 
   <!-- melonJS Library -->
-  <script type="text/javascript" src="../../build/melonJS.js"></script>
+  <script type="text/javascript" src="../../build/melonjs.js"></script>
 
   <!-- Plugin(s) -->
   <script type="text/javascript" src="../../plugins/debug/debugPanel.js"></script>

diff --git a/examples/frame_prediction/index.html b/examples/frame_prediction/index.html
@@ -12,7 +12,7 @@
   <div id="screen"></div>
 
   <!-- melonJS Library -->
-  <script type="text/javascript" src="../../build/melonJS.js"></script>
+  <script type="text/javascript" src="../../build/melonjs.js"></script>
 
   <!-- Plugin(s) -->
   <script type="text/javascript" src="../../plugins/debug/debugPanel.js"></script>

diff --git a/examples/hexagonal/index.html b/examples/hexagonal/index.html
@@ -12,7 +12,7 @@
   <div id="screen"></div>
 
   <!-- melonJS Library -->
-  <script type="text/javascript" src="../../build/melonJS.js"></script>
+  <script type="text/javascript" src="../../build/melonjs.js"></script>
 
   <!-- Plugin(s) -->
   <script type="text/javascript" src="../../plugins/debug/debugPanel.js"></script>

diff --git a/examples/isometric_rpg/index.html b/examples/isometric_rpg/index.html
@@ -12,7 +12,7 @@
   <div id="screen"></div>
 
   <!-- melonJS Library -->
-  <script type="text/javascript" src="../../build/melonJS.js"></script>
+  <script type="text/javascript" src="../../build/melonjs.js"></script>
 
   <!-- Plugin(s) -->
   <script type="text/javascript" src="../../plugins/debug/debugPanel.js"></script>

diff --git a/examples/multitouch/index.html b/examples/multitouch/index.html
@@ -12,7 +12,7 @@
   <div id="screen"></div>
 
   <!-- melonJS Library -->
-  <script type="text/javascript" src="../../build/melonJS.js"></script>
+  <script type="text/javascript" src="../../build/melonjs.js"></script>
   <script type="text/javascript" src="../../plugins/debug/debugPanel.js"></script>
 
   <!-- Game Scripts -->

diff --git a/examples/particles/index.html b/examples/particles/index.html
@@ -49,7 +49,7 @@
   </div>
 
   <!-- melonJS Library -->
-  <script type="text/javascript" src="../../build/melonJS.js"></script>
+  <script type="text/javascript" src="../../build/melonjs.js"></script>
 
   <!-- Plugin(s) -->
   <script type="text/javascript" src="../../plugins/debug/debugPanel.js"></script>

diff --git a/examples/platformer/index.html b/examples/platformer/index.html
@@ -12,7 +12,7 @@
   <div id="screen"></div>
 
   <!-- melonJS Library -->
-  <script type="text/javascript" src="../../build/melonJS.js"></script>
+  <script type="text/javascript" src="../../build/melonjs.js"></script>
 
   <!-- Plugin(s) -->
   <script type="text/javascript" src="../../plugins/debug/debugPanel.js"></script>

diff --git a/examples/shapes/index.html b/examples/shapes/index.html
@@ -12,7 +12,7 @@
   <div id="screen"></div>
 
   <!-- melonJS Library -->
-  <script type="text/javascript" src="../../build/melonJS.js"></script>
+  <script type="text/javascript" src="../../build/melonjs.js"></script>
   <script type="text/javascript" src="../../plugins/debug/debugPanel.js"></script>
 
   <!-- Game Scripts -->

diff --git a/examples/shoebox/index.html b/examples/shoebox/index.html
@@ -12,7 +12,7 @@
   <div id="screen"></div>
 
   <!-- melonJS Library -->
-  <script type="text/javascript" src="../../build/melonJS.js"></script>
+  <script type="text/javascript" src="../../build/melonjs.js"></script>
 
   <!-- Plugin(s) -->
   <script type="text/javascript" src="../../plugins/debug/debugPanel.js"></script>

diff --git a/examples/texturepacker/index.html b/examples/texturepacker/index.html
@@ -18,7 +18,7 @@
         <div id="screen"></div>
 
         <!-- melonJS Library -->
-        <script type="text/javascript" src="../../build/melonJS.js"></script>
+        <script type="text/javascript" src="../../build/melonjs.js"></script>
 
         <!-- Plugin(s) -->
         <script type="text/javascript" src="../../plugins/debug/debugPanel.js"></script>

diff --git a/examples/tiled_example_loader/index.html b/examples/tiled_example_loader/index.html
@@ -23,7 +23,7 @@ <h2>A lightweight HTML5 game engine</h2>
         <h1>Tiled Map Loader</h1>
         <p> you can scroll the selected map using the arrow keys</p>
         <div id="jsapp">
-          <script type="text/javascript" src="./../../build/melonJS.js"></script>
+          <script type="text/javascript" src="./../../build/melonjs.js"></script>
           <script type="text/javascript" src="js/ressources.js"></script>
           <script type="text/javascript" src="js/main.js"></script>
           <script type="text/javascript" src="js/play.js"></script>

diff --git a/examples/whack-a-mole/index.html b/examples/whack-a-mole/index.html
@@ -12,7 +12,7 @@
   <div id="screen"></div>
 
   <!-- melonJS Library -->
-  <script type="text/javascript" src="../../build/melonJS.js"></script>
+  <script type="text/javascript" src="../../build/melonjs.js"></script>
 
   <!-- Plugin(s) -->
   <script type="text/javascript" src="../../plugins/debug/debugPanel.js"></script>

diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "melonJS",
+  "name": "melonjs",
   "version": "5.0.0",
   "description": "MelonJS Game Engine",
   "homepage": "http://www.melonjs.org/",
@@ -18,7 +18,16 @@
   "engines": {
     "node": ">= 6"
   },
-  "main": "build/melonJS.js",
+  "main": "build/melonjs.js",
+  "files": [
+    "build/melonjs.js",
+    "build/melonjs.min.js",
+    "plugins/",
+    "package.json",
+    "README.md",
+    "LICENSE",
+    "CHANGELOG"
+  ],
   "dependencies": {},
   "devDependencies": {
     "dot": "git+https://github.com/parasyte/doT.git#bug/replace-ext",

diff --git a/scripts/travis-upload.sh b/scripts/travis-upload.sh
@@ -7,5 +7,5 @@ if [ "${TRAVIS_NODE_VERSION}" = "6" ] ; then
         --s3-region us-east-1 \
         --permissions public-read \
         --target-paths artifacts/${TRAVIS_BRANCH}/${TRAVIS_BUILD_NUMBER} \
-        build/melonJS.js
+        build/melonjs.js
 fi
diff --git a/tests/index.html b/tests/index.html
@@ -10,7 +10,7 @@
         <script type="text/javascript" src="node_modules/jasmine-core/lib/jasmine-core/boot.js"></script>
 
         <!-- include source files here... -->
-        <script type="text/javascript" src="build/melonJS.js"></script>
+        <script type="text/javascript" src="build/melonjs.js"></script>
         <script type="text/javascript" src="plugins/debug/debugPanel.js"></script>
     </head>