Skip to content

Commit b9f932c

Browse files
authored
Project restructuring (#2366)
* alot of minor changes * alot of linting and other minor changes which make it work in nodeJS * minor changes in type definitions for html * upgrade to node 10
1 parent cf389e8 commit b9f932c

File tree

283 files changed

+22561
-15765
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

283 files changed

+22561
-15765
lines changed

.eslintrc

Lines changed: 0 additions & 213 deletions
This file was deleted.

.eslintrc.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
module.exports = {
2+
"env": {
3+
"browser": true,
4+
"commonjs": true,
5+
"es6": true,
6+
"node": true
7+
},
8+
"extends": "eslint:recommended",
9+
"globals": {
10+
"Atomics": "readonly",
11+
"SharedArrayBuffer": "readonly"
12+
},
13+
"parserOptions": {
14+
"ecmaVersion": 2018
15+
},
16+
"rules": {
17+
}
18+
};

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: node_js
22
node_js:
3-
- "8.9.4"
3+
- "10"
44
install:
55
- npm -g install yarn
66
- yarn

build.js

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* eslint-disable no-empty */
2+
/* eslint-disable no-console */
13
'use strict'
24

35
var fs = require('fs')
@@ -7,35 +9,35 @@ var uglify = require('uglify-js');
79
var execSync = require('child_process').execSync;
810

911
const args = process.argv
10-
.slice(2)
11-
.map(arg => arg.split('='))
12-
.reduce((args, [value, key]) => {
13-
args[value] = key;
14-
return args;
15-
}, {});
12+
.slice(2)
13+
.map(arg => arg.split('='))
14+
.reduce((args, [value, key]) => {
15+
args[value] = key;
16+
return args;
17+
}, {});
1618

1719
switch (args.type) {
18-
case 'node':
19-
bundle({
20-
distFolder : 'dist',
21-
config: './build.node.conf.js',
22-
context: 'global',
23-
minify: true,
24-
format: 'cjs',
25-
filename: 'jspdf.node'
26-
})
27-
break;
28-
case 'browser':
29-
default:
30-
bundle({
31-
distFolder : 'dist',
32-
config: './build.browser.conf.js',
33-
minify: true,
34-
format: 'umd',
35-
context: 'window',
36-
filename: 'jspdf'
37-
});
38-
break;
20+
case 'node':
21+
bundle({
22+
distFolder: 'dist',
23+
config: './build.node.conf.js',
24+
context: 'global',
25+
minify: args.minify || true,
26+
format: 'cjs',
27+
filename: 'jspdf.node'
28+
})
29+
break;
30+
case 'browser':
31+
default:
32+
bundle({
33+
distFolder: 'dist',
34+
config: './build.browser.conf.js',
35+
minify: args.minify || true,
36+
format: 'umd',
37+
context: 'window',
38+
filename: 'jspdf'
39+
});
40+
break;
3941
}
4042

4143
function bundle(options) {
@@ -47,7 +49,7 @@ function bundle(options) {
4749
}).then((bundle) => {
4850
return bundle.generate({
4951
format: options.format,
50-
name: 'jsPDF'
52+
name: 'jsPDF'
5153
})
5254
}).then(output => {
5355
let code = output['output'][0].code;
@@ -67,14 +69,14 @@ function bundle(options) {
6769

6870
console.log('Finish Bundling ' + options.distFolder + '/' + options.filename + '.debug.js');
6971
if (options.minify === true) {
70-
71-
console.log('Minifiying ' + options.distFolder + '/' + options.filename + '.debug.js to ' + options.filename + '.min.js');
72-
var minified = uglify.minify(code, {
73-
output: {
74-
comments: /@preserve|@license|copyright/i
75-
}
76-
})
77-
fs.writeFileSync(options.distFolder + '/' + options.filename + '.min.js', minified.code)
72+
73+
console.log('Minifiying ' + options.distFolder + '/' + options.filename + '.debug.js to ' + options.filename + '.min.js');
74+
var minified = uglify.minify(code, {
75+
output: {
76+
comments: /@preserve|@license|copyright/i
77+
}
78+
})
79+
fs.writeFileSync(options.distFolder + '/' + options.filename + '.min.js', minified.code)
7880
}
7981
}).catch((err) => {
8082
console.error(err)
@@ -89,7 +91,7 @@ function renew(code) {
8991
try {
9092
commit = execSync('git rev-parse --short=10 HEAD').toString().trim();
9193
whoami = execSync('whoami').toString().trim();
92-
} catch (e) {}
94+
} catch (e) { }
9395
code = code.replace(/jsPDF.version = '0.0.0'/g, "jsPDF.version = '" + version + "'");
9496
code = code.replace(/\$\{builtOn\}/g, date);
9597
code = code.replace(/\$\{versionID\}/g, version);

build.node.conf.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import './src/license.js';
2+
import './src/node.js';
23
import './src/jspdf.js';
34

45
import './src/modules/acroform';

0 commit comments

Comments
 (0)