From 4c157cfa24216f47c0069c9fc0053e9a117bacb3 Mon Sep 17 00:00:00 2001 From: Chris McCormick Date: Mon, 27 Nov 2017 16:11:16 +0800 Subject: [PATCH 1/2] Fixed browser building. Was getting the following error message: $ make browser node_modules/.bin/cjsify --export Bencode src/index.coffee --no-node > bencode.js bencode-js/node_modules/commonjs-everywhere/lib/command.js:56 throw new Error('wrong number of entry points given; expected 1'); --- Makefile | 10 ++++++---- package.json | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3c1183b..8735840 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,8 @@ BIN=./node_modules/.bin MOCHA=$(BIN)/mocha COFFEE=$(BIN)/coffee --js CJSIFY=$(BIN)/cjsify --export Bencode src/index.coffee +BROWSERIFY=$(BIN)/browserify +UGLIFY=$(BIN)/uglifyjs SRCS = $(shell find src -name "*.coffee" -type f | sort) LIBS = $(SRCS:src/%.coffee=lib/%.js) @@ -14,10 +16,10 @@ lib/%.js: src/%.coffee $(COFFEE) <"$<" >"$@" browser: bencode.js bencode-min.js -bencode.js: $(SRCS) - $(CJSIFY) --no-node > bencode.js -bencode-min.js: $(SRCS) - $(CJSIFY) --no-node --minify > bencode-min.js +bencode.js: $(LIBS) + $(BROWSERIFY) lib/index.js --standalone Bencode > $@ +bencode-min.js: bencode.js + $(UGLIFY) $< > $@ .PHONY: test diff --git a/package.json b/package.json index 59735f1..f4d19c1 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,8 @@ , "mocha" : ">=1.8.2" , "coffee-script-redux" : "2.0.0-beta8" , "commonjs-everywhere" : "~0.6.1" + , "browserify" : "^14.5.0" + , "uglify-js" : "^3.2.0" } , "repository": From 71cc5ad1cc8d6ac5ba8ba14763450cb26b3f58c4 Mon Sep 17 00:00:00 2001 From: Chris McCormick Date: Mon, 27 Nov 2017 16:13:08 +0800 Subject: [PATCH 2/2] New build. --- bencode-min.js | 2 +- bencode.js | 292 ++++++++++++++++++++++--------------------------- 2 files changed, 133 insertions(+), 161 deletions(-) diff --git a/bencode-min.js b/bencode-min.js index 69d6380..b22562e 100644 --- a/bencode-min.js +++ b/bencode-min.js @@ -1 +1 @@ -(function(b){function a(b,d){if({}.hasOwnProperty.call(a.cache,b))return a.cache[b];var e=a.resolve(b);if(!e)throw new Error('Failed to resolve module '+b);var c={id:b,require:a,filename:b,exports:{},loaded:!1,parent:d,children:[]};d&&d.children.push(c);var f=b.slice(0,b.lastIndexOf('/')+1);return a.cache[b]=c.exports,e.call(c.exports,c,c.exports,f,b),c.loaded=!0,a.cache[b]=c.exports}a.modules={},a.cache={},a.resolve=function(b){return{}.hasOwnProperty.call(a.modules,b)?a.modules[b]:void 0},a.define=function(b,c){a.modules[b]=c},a.define('/src/index.coffee',function(b,c,d,e){b.exports={encode:a('/src/encode.coffee',b),decode:a('/src/decode.coffee',b)}}),a.define('/src/decode.coffee',function(b,c,d,e){var a;a=function(c){var l,d,e,f,b,k,g,h,i,j,n,m;switch(c[0]){case'i':d=c.match(/^i-?\d+e/)[0];return[d.length,+d.slice(1,-1)];case'0':case'1':case'2':case'3':case'4':case'5':case'6':case'7':case'8':case'9':j=c.match(/^\d+/)[0];i=j.length+1;d=c.slice(0,i+ +j);return[d.length,d.slice(i)];case'l':b=1;l=function(e){var d,f,g;while(c[b]!=='e')d=a(c.slice(b)),g=d[0],f=d[1],b+=g,e.push(f);return e}.call(this,[]);return[b+1,l];case'd':b=1;h={};while(c[b]!=='e')e=a(c.slice(b)),g=e[0],k=e[1],f=a(c.slice(b+g)),m=f[0],n=f[1],b+=g+m,h[k]=n;return[b+1,h]}},b.exports=function(b){return a(b)[1]}}),a.define('/src/encode.coffee',function(f,j,i,h){function g(a,b){return{}.hasOwnProperty.call(a,b)}var a,e,d,c,b;b=function(a){return''+a.length+':'+a},d=function(a){return'i'+a+'e'},c=function(b){var c;return c=function(d){var e;for(var c=0,f=b.length;c