Skip to content

Commit c0ae8a2

Browse files
Replace git sub modules with npm dependencies
1 parent 4feaf1c commit c0ae8a2

File tree

6 files changed

+7
-28
lines changed

6 files changed

+7
-28
lines changed

.gitmodules

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

build.sh

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,26 @@
88
output=dist/jspdf.min.js
99
options="-m -c --wrap --stats"
1010
version="`python -c 'import time;t=time.gmtime(time.time());print("1.%d.%d" % (t[0] - 2014, t[7]))'`"
11-
libs="`find libs/* -maxdepth 2 -type f | grep .js$ | grep -v -E '(\.min|BlobBuilder\.js$|Downloadify|demo|deps|test)'`"
11+
npm_libs="node_modules/cf-blob.js/Blob.js node_modules/filesaver.js/FileSaver.js node_modules/adler32cs/adler32cs.js"
12+
libs="${npm_libs} `find libs/* -maxdepth 2 -type f | grep .js$ | grep -v -E '(\.min|BlobBuilder\.js$|Downloadify|demo|deps|test)'`"
1213
files="jspdf.js plugins/*js"
1314
build=`date +%Y-%m-%dT%H:%M`
1415
commit=`git rev-parse --short=10 HEAD`
1516
whoami=`whoami`
1617

17-
# Update submodules
18-
git submodule init libs/FileSaver.js/
19-
git submodule init libs/adler32cs.js/
20-
git submodule init libs/Blob.js/
21-
22-
git submodule foreach git pull origin master
23-
2418
echo "Building version ${version}"
2519

2620
# Update Bower
2721
sed -i.bak "s/\"version\": \"(.*)\"/\"${version}\"/" bower.json
2822

2923
# Fix conflict with adler32 & FileSaver
30-
adler1="libs/adler32cs.js/adler32cs.js"
24+
adler1="node_modules/adler32cs/adler32cs.js"
3125
adler2="adler32-tmp.js"
3226
cat ${adler1} \
3327
| sed -e 's/this, function/jsPDF, function/' \
3428
| sed -e 's/typeof define/0/' > $adler2
3529
libs="$(echo $libs | sed "s#$adler1#$adler2#")"
36-
saveas1="libs/FileSaver.js/FileSaver.js"
30+
saveas1="node_modules/filesaver.js/FileSaver.js"
3731
saveas2="FileSaver-tmp.js"
3832
cat ${saveas1} \
3933
| sed -e 's/define !== null) && (define.amd != null/0/' > $saveas2

libs/Blob.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

libs/FileSaver.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

libs/adler32cs.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
},
1919
"dependencies": {},
2020
"devDependencies": {
21+
"adler32cs": "github:chick307/adler32cs.js",
22+
"cf-blob.js": "0.0.1",
23+
"filesaver.js": "github:andyinabox/FileSaver.js",
2124
"local-web-server": "^0.5.19",
2225
"uglify-js": "^2.6.2"
2326
},

0 commit comments

Comments
 (0)