Skip to content

Commit 2bac4e7

Browse files
committed
Introduce paper-jsdom and paper-jsdom-canvas submodules.
Relates to paperjs#1252
1 parent 7dea96c commit 2bac4e7

File tree

8 files changed

+39
-13
lines changed

8 files changed

+39
-13
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/node_modules/
22
/dist/*/
3+
/.nvmrc

.gitmodules

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
[submodule "jsdoc"]
22
path = gulp/jsdoc
33
url = https://github.com/paperjs/jsdoc.git
4+
[submodule "paper-jsdom"]
5+
path = packages/paper-jsdom
6+
url = https://github.com/paperjs/paper-jsdom.git
7+
[submodule "paper-jsdom-canvas"]
8+
path = packages/paper-jsdom-canvas
9+
url = https://github.com/paperjs/paper-jsdom-canvas.git

bower.json

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"gulpfile.js",
1919
"gulp",
2020
"node_modules",
21+
"packages",
2122
"projects",
2223
"src",
2324
"test",

gulp/tasks/publish.js

+22-3
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,23 @@
1111
*/
1212

1313
var gulp = require('gulp'),
14-
bump = require('gulp-bump'),
14+
jsonEditor = require('gulp-json-editor'),
1515
git = require('gulp-git-streamed'),
1616
run = require('run-sequence'),
1717
shell = require('gulp-shell'),
1818
options = require('../utils/options.js');
1919

20+
var jsonOptions = {
21+
end_with_newline: true
22+
};
23+
2024
gulp.task('publish', function() {
2125
if (options.branch !== 'develop') {
2226
throw new Error('Publishing is only allowed on the develop branch.');
2327
}
2428
return run(
2529
'publish:version',
30+
'publish:packages',
2631
'publish:dist',
2732
'publish:commit',
2833
'publish:release',
@@ -34,11 +39,25 @@ gulp.task('publish:version', function() {
3439
// Reset the version value since we're executing this on the develop branch,
3540
// but we don't wan the published version suffixed with '-develop'.
3641
options.resetVersion();
37-
return gulp.src([ 'package.json' ])
38-
.pipe(bump({ version: options.version }))
42+
return gulp.src(['package.json'])
43+
.pipe(jsonEditor({
44+
version: options.version
45+
}, jsonOptions))
3946
.pipe(gulp.dest('.'));
4047
});
4148

49+
gulp.task('publish:packages', function() {
50+
options.resetVersion(); // See 'publish:version'
51+
return gulp.src(['packages/**/*.json'])
52+
.pipe(jsonEditor({
53+
version: options.version,
54+
dependencies: {
55+
paper: options.version
56+
}
57+
}, jsonOptions))
58+
.pipe(gulp.dest('packages'));
59+
});
60+
4261
gulp.task('publish:dist', ['dist']);
4362

4463
gulp.task('publish:commit', function() {

package.json

+4-10
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,15 @@
3636
"engines": {
3737
"node": ">=4.0.0 <8.0.0"
3838
},
39-
"optionalDependencies": {
40-
"canvas": "^1.3.5",
41-
"jsdom": "^9.4.0",
42-
"source-map-support": "^0.4.0"
43-
},
4439
"devDependencies": {
4540
"acorn": "~0.5.0",
41+
"canvas": "^1.3.5",
4642
"del": "^2.2.1",
4743
"gulp": "^3.9.1",
48-
"gulp-bump": "^2.2.0",
4944
"gulp-cached": "^1.1.0",
5045
"gulp-git-streamed": "^1.8.0",
5146
"gulp-jshint": "^2.0.0",
47+
"gulp-json-editor": "^2.2.1",
5248
"gulp-prepro": "^2.4.0",
5349
"gulp-qunits": "^2.1.1",
5450
"gulp-rename": "^1.2.2",
@@ -61,6 +57,7 @@
6157
"gulp-whitespace": "^0.1.0",
6258
"gulp-zip": "^3.2.0",
6359
"husky": "^0.11.4",
60+
"jsdom": "^9.4.0",
6461
"jshint": "^2.9.2",
6562
"jshint-summary": "^0.4.0",
6663
"merge-stream": "^1.0.0",
@@ -70,14 +67,11 @@
7067
"require-dir": "^0.3.0",
7168
"resemblejs": "^2.2.1",
7269
"run-sequence": "^1.2.2",
70+
"source-map-support": "^0.4.0",
7371
"stats.js": "0.16.0",
7472
"straps": "^2.1.0"
7573
},
7674
"browser": {
77-
"canvas": false,
78-
"jsdom": false,
79-
"jsdom/lib/jsdom/living/generated/utils": false,
80-
"source-map-support": false,
8175
"./dist/node/self.js": false,
8276
"./dist/node/extend.js": false
8377
},

packages/paper-jsdom

Submodule paper-jsdom added at 2bed95b

packages/paper-jsdom-canvas

Submodule paper-jsdom-canvas added at 807961a

projects/paperjs.sublime-project

+3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
"path": "../gulp",
1515
"folder_exclude_patterns": ["jsdoc"]
1616
},
17+
{
18+
"path": "../packages",
19+
},
1720
{
1821
"path": "../travis",
1922
},

0 commit comments

Comments
 (0)