Merge pull request #4 from Skelp/develop

0.2.0

.eslintrc.json

@@ -1,5 +1,5 @@
 {
-  "extends": "skelp/v2/es5",
+  "extends": "skelp/v3/es5",
   "env": {
     "node": true
   },

.npmignore

@@ -1,4 +1,3 @@
-lib/
 test/
 .*
 AUTHORS.md

CHANGES.md

@@ -1,3 +1,9 @@
+## Version 0.2.0, 2016.11.24
+
+* Change source file to use ES6 module instead of CommonJS and add `jsnext:main` entry to `package.json`
+* Publish source file with [npm](http://npmjs.com) package
+* Switch to latest version of [ESLint](http://eslint.org)
+
 ## Version 0.1.1, 2016.09.21
 
 * Change [Bower](https://bower.io) package name to `skelp-oopsy` to avoid conflict with existing package

CONTRIBUTING.md

@@ -20,7 +20,7 @@ If you're using a version of [Node.js](https://nodejs.org) that is older than 0.
 this step. Please consider upgrading to at least 0.12 or your pull request may fail on the CI build.
 
 Likewise, [Node.js](https://nodejs.org) versions older than 0.10 will also not be able to compile the source code using
-[Rollup](http://rollupjs.org) so the test suite will not be executed against any changes you've made to `lib/oopsy.js`.
+[Rollup](http://rollupjs.org) so the test suite will not be executed against any changes you've made to `src/oopsy.js`.
 For this reason, 0.10 is not supported from a development perspective, but our CI builds do run the test suite against
 the pre-compiled code for this version to ensure that it works.
 

Gruntfile.js

@@ -21,7 +21,6 @@
  */
 
 module.exports = function(grunt) {
-  var commonjs
   var semver = require('semver')
   var uglify
 
@@ -40,7 +39,7 @@ module.exports = function(grunt) {
 
     watch: {
       all: {
-        files: [ 'lib/**/*.js', 'test/**/*.js' ],
+        files: [ 'src/**/*.js', 'test/**/*.js' ],
         tasks: [ 'build', 'mochaTest' ]
       }
     }
@@ -51,7 +50,6 @@ module.exports = function(grunt) {
   var testTasks = [ 'compile', 'mochaTest' ]
 
   if (semver.satisfies(process.version, '>=0.12')) {
-    commonjs = require('rollup-plugin-commonjs')
     uglify = require('rollup-plugin-uglify')
 
     compileTasks.push('clean', 'rollup')
@@ -68,15 +66,10 @@ module.exports = function(grunt) {
             moduleId: 'oopsy',
             moduleName: 'Oopsy',
             sourceMap: true,
-            sourceMapRelativePaths: true,
-            plugins: function() {
-              return [
-                commonjs()
-              ]
-            }
+            sourceMapRelativePaths: true
           },
           files: {
-            'dist/oopsy.js': 'lib/oopsy.js'
+            'dist/oopsy.js': 'src/oopsy.js'
           }
         },
         umdProduction: {
@@ -89,7 +82,6 @@ module.exports = function(grunt) {
             banner: '/*! Oopsy v<%= pkg.version %> | (C) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %> | MIT License */',
             plugins: function() {
               return [
-                commonjs(),
                 uglify({
                   output: {
                     comments: function(node, comment) {
@@ -101,7 +93,7 @@ module.exports = function(grunt) {
             }
           },
           files: {
-            'dist/oopsy.min.js': 'lib/oopsy.js'
+            'dist/oopsy.min.js': 'src/oopsy.js'
           }
         }
       }
@@ -118,7 +110,7 @@ module.exports = function(grunt) {
     testTasks.unshift('eslint')
 
     grunt.config.set('eslint', {
-      target: [ 'lib/**/*.js', 'test/**/*.js' ]
+      target: [ 'src/**/*.js', 'test/**/*.js' ]
     })
 
     grunt.loadNpmTasks('grunt-eslint')

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "skelp-oopsy",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Simple OOP for JavaScript",
   "homepage": "https://github.com/Skelp/oopsy",
   "authors": [
@@ -28,7 +28,7 @@
     "node"
   ],
   "ignore": [
-    "lib/",
+    "src/",
     "test/",
     ".*",
     "AUTHORS.md",