Merge pull request #2 from fsih/build

Fix Build and move changes from dist file to source files

.gitignore

@@ -1,5 +1,3 @@
-/.nvmrc
+.nvmrc
-/node_modules/
+node_modules/
-/dist/*/
+dist/*
-/dist/*.min.js
-/dist/paperjs.zip

.travis.yml

@@ -1,10 +1,7 @@
 language: node_js
 # Follow https://github.com/nodejs/LTS to decide when to remove a version
 node_js:
-- stable
-- '7'
 - '6'
-- '4'
 sudo: false
 env:
   matrix:
@@ -42,3 +39,14 @@ script:
 - gulp test
 - gulp zip
 - '[ "${TRAVIS_BRANCH}" = "develop" ] && [ "${TRAVIS_NODE_VERSION}" = "stable" ] && travis/deploy-prebuilt.sh || true'
+before_deploy:
+- npm --no-git-tag-version version 0.11.$(date +%Y%m%d%H%M%S)
+- git config --global user.email $(git log --pretty=format:"%ae" -n1)
+- git config --global user.name $(git log --pretty=format:"%an" -n1)
+deploy:
+- provider: npm
+  on:
+    branch: develop
+  skip_cleanup: true
+  email: $NPM_EMAIL
+  api_key: $NPM_TOKEN

dist/paper-core.js

@@ -1 +0,0 @@
-../src/load.js

dist/paper-full.js

@@ -1 +0,0 @@
-../src/load.js

gulp/tasks/test.js

@@ -13,9 +13,17 @@
 var gulp = require('gulp'),
     gutil = require('gulp-util'),
     qunits = require('gulp-qunits'),
+    runSequence = require('run-sequence');
     webserver = require('gulp-webserver');
 
-gulp.task('test', ['test:phantom', 'test:node']);
+gulp.task('test', function(callback) {
+    runSequence(
+        'build',
+        'test:postbuild'
+    );
+});
+
+gulp.task('test:postbuild', ['test:phantom', 'test:node']);
 
 gulp.task('test:phantom', ['minify:acorn'], function() {
     return gulp.src('index.html', { cwd: 'test' })

gulp/utils/options.js

@@ -34,9 +34,10 @@ if (argv.branch && argv.branch !== options.branch) {
 var version = options.version,
     branch = options.branch;
 
-// If we're not on the master branch, use the branch name as a suffix:
+// Take this out for now to reduce changes every build
-if (branch !== 'master')
+// // If we're not on the master branch, use the branch name as a suffix:
-    options.version += '-' + branch;
+// if (branch !== 'master')
+//     options.version += '-' + branch;
 
 // Allow the removal of the suffix again, as needed by the publish task.
 options.resetVersion = function() {

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "paper",
+  "name": "@scratch/paper",
   "version": "0.11.5",
   "description": "The Swiss Army Knife of Vector Graphics Scripting",
   "license": "MIT",
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "acorn": "~0.5.0",
-    "canvas": "^1.3.5",
+    "canvas-prebuilt": "^1.6.5-prerelease.1",
     "del": "^2.2.1",
     "gulp": "^3.9.1",
     "gulp-cached": "^1.1.0",

src/init.js

@@ -31,5 +31,5 @@
 // NOTE: We're not modifying the global `self` here. We receive its value passed
 // to the paper.js function scope, and this is the one that is modified here.
 self = self || require('./node/self.js');
-var window = self.window,
+var window = self.window ? self.window : self,
     document = self.document;