Offer unpacked code from package.json

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-- "4"
+- "6"
 - "node"
 sudo: false
 cache:

package.json

@@ -9,7 +9,7 @@
     "type": "git",
     "url": "git+ssh://[email protected]/LLK/scratch-vm.git"
   },
-  "main": "./dist/node/scratch-vm.js",
+  "main": "./src/index.js",
   "scripts": {
     "build": "./node_modules/.bin/webpack --progress --colors --bail",
     "coverage": "./node_modules/.bin/tap ./test/{unit,integration}/*.js --coverage --coverage-report=lcov",
@@ -23,24 +23,29 @@
     "watch": "./node_modules/.bin/webpack --progress --colors --watch",
     "version": "./node_modules/.bin/json -f package.json -I -e \"this.repository.sha = '$(git log -n1 --pretty=format:%H)'\""
   },
-  "devDependencies": {
+  "dependencies": {
     "adm-zip": "0.4.7",
+    "htmlparser2": "3.9.2",
+    "minilog": "3.1.0",
+    "promise": "7.1.1",
+    "scratch-audio": "latest",
+    "scratch-blocks": "latest",
+    "scratch-render": "latest",
+    "scratch-storage": "latest"
+  },
+  "devDependencies": {
+    "babel-core": "^6.24.0",
     "babel-eslint": "^7.1.1",
+    "babel-loader": "^6.4.1",
+    "babel-preset-es2015": "^6.24.0",
     "copy-webpack-plugin": "4.0.1",
     "eslint": "^3.16.0",
     "eslint-config-scratch": "^3.1.0",
     "expose-loader": "0.7.3",
     "gh-pages": "^0.12.0",
     "highlightjs": "^9.8.0",
-    "htmlparser2": "3.9.2",
     "json": "^9.0.4",
     "lodash.defaultsdeep": "4.6.0",
-    "minilog": "3.1.0",
-    "promise": "7.1.1",
-    "scratch-audio": "latest",
-    "scratch-blocks": "latest",
-    "scratch-render": "latest",
-    "scratch-storage": "latest",
     "script-loader": "0.7.0",
     "stats.js": "^0.17.0",
     "tap": "^10.2.0",

webpack.config.js

@@ -1,15 +1,53 @@
 var CopyWebpackPlugin = require('copy-webpack-plugin');
 var defaultsDeep = require('lodash.defaultsdeep');
+var fs = require('fs');
 var path = require('path');
 var webpack = require('webpack');
 
+/**
+ * Resolve a babel plugin or preset to a real path, resolving symlinks the way that Node.js would.
+ * Helps work around the differences between webpack's module lookup and Node's when `npm link` is in use.
+ * @param {string} prefix - 'babel-plugin' for a plugin, 'babel-preset' for a preset, etc.
+ * @param {string|Array} item - either a plugin/preset name or path or an array with such a string at index 0.
+ * @returns {string|Array} - the same type as `item` but the name/path will be replaced with an absolute path.
+ */
+const babelRealPath = function (prefix, item) {
+    if (typeof item === 'string') {
+        if (item.indexOf(prefix) !== 0) {
+            item = [prefix, item].join('-');
+        }
+        return fs.realpathSync(require.resolve(item));
+    }
+    item[0] = babelRealPath(prefix, item[0]);
+    return item;
+};
+
 var base = {
     devServer: {
         contentBase: false,
         host: '0.0.0.0',
         port: process.env.PORT || 8073
     },
-    devtool: 'source-map',
+    devtool: 'cheap-module-source-map',
+    module: {
+        rules: [
+            {
+                include: [
+                    path.resolve(__dirname, 'node_modules', 'scratch-audio', 'src'),
+                    path.resolve(__dirname, 'node_modules', 'scratch-render', 'src'),
+                    path.resolve(__dirname, 'node_modules', 'scratch-storage', 'src'),
+                    path.resolve(__dirname, 'src')
+                ].map(x => fs.realpathSync(x)),
+                test: /\.js$/,
+                loader: 'babel-loader',
+                options: {
+                    presets: [
+                        'es2015'
+                    ].map(x => babelRealPath('babel-preset', x))
+                }
+            }
+        ]
+    },
     plugins: [
         new webpack.optimize.UglifyJsPlugin({
             include: /\.min\.js$/,
@@ -31,25 +69,12 @@ module.exports = [
             filename: '[name].js'
         },
         module: {
-            rules: [
+            rules: base.module.rules.concat([
                 {
                     test: require.resolve('./src/index.js'),
                     loader: 'expose-loader?VirtualMachine'
                 }
-            ]
-        }
-    }),
-    // Node-compatible
-    defaultsDeep({}, base, {
-        target: 'node',
-        entry: {
-            'scratch-vm': './src/index.js'
-        },
-        output: {
-            library: 'VirtualMachine',
-            libraryTarget: 'commonjs2',
-            path: path.resolve(__dirname, 'dist/node'),
-            filename: '[name].js'
+            ])
         }
     }),
     // Playground
@@ -77,7 +102,7 @@ module.exports = [
             filename: '[name].js'
         },
         module: {
-            loaders: [
+            rules: base.module.rules.concat([
                 {
                     test: require.resolve('./src/index.js'),
                     loader: 'expose-loader?VirtualMachine'
@@ -106,7 +131,7 @@ module.exports = [
                     test: require.resolve('scratch-storage'),
                     loader: 'expose-loader?Scratch.Storage'
                 }
-            ]
+            ])
         },
         plugins: base.plugins.concat([
             new CopyWebpackPlugin([{