Sfoglia il codice sorgente

Fix JS minification in build.js

- uglify-js2 is now uglify-js
- shader code is now included for minification
- sourcemaps still does not work
Joshua Koo 10 anni fa
parent
commit
d32de17344
2 ha cambiato i file con 7 aggiunte e 6 eliminazioni
  1. 5 4
      utils/build/build.js
  2. 2 2
      utils/build/package.json

+ 5 - 4
utils/build/build.js

@@ -1,7 +1,7 @@
 var fs = require("fs");
 var fs = require("fs");
 var path = require("path");
 var path = require("path");
 var argparse =  require( "argparse" );
 var argparse =  require( "argparse" );
-var uglify = require("uglify-js2");
+var uglify = require("uglify-js");
 var spawn = require('child_process').spawn;
 var spawn = require('child_process').spawn;
 
 
 function main() {
 function main() {
@@ -34,7 +34,8 @@ function main() {
 
 
 	var buffer = [];
 	var buffer = [];
 	var sources = [];
 	var sources = [];
-			
+	// TODO - sources are not being used. should remove and make sourcemaps work with uglify
+
 	if ( args.amd ){
 	if ( args.amd ){
 		buffer.push('function ( root, factory ) {\n\n\tif ( typeof define === \'function\' && define.amd ) {\n\n\t\tdefine( [ \'exports\' ], factory );\n\n\t} else if ( typeof exports === \'object\' ) {\n\n\t\tfactory( exports );\n\n\t} else {\n\n\t\tfactory( root );\n\n\t}\n\n}( this, function ( exports ) {\n\n');
 		buffer.push('function ( root, factory ) {\n\n\tif ( typeof define === \'function\' && define.amd ) {\n\n\t\tdefine( [ \'exports\' ], factory );\n\n\t} else if ( typeof exports === \'object\' ) {\n\n\t\tfactory( exports );\n\n\t} else {\n\n\t\tfactory( root );\n\n\t}\n\n}( this, function ( exports ) {\n\n');
 	};
 	};
@@ -79,11 +80,11 @@ function main() {
 	
 	
 	if ( !args.minify ){
 	if ( !args.minify ){
 
 
-		fs.writeFileSync( output,temp, 'utf8' );
+		fs.writeFileSync( output, temp, 'utf8' );
 
 
 	} else {
 	} else {
 
 
-		var result = uglify.minify( sources, { outSourceMap: sourcemap } );
+		var result = uglify.minify( temp, { outSourceMap: sourcemap, fromString: true } );
 		
 		
 		fs.writeFileSync( output, '// threejs.org/license\n' + result.code + sourcemapping, 'utf8' );
 		fs.writeFileSync( output, '// threejs.org/license\n' + result.code + sourcemapping, 'utf8' );
 
 

+ 2 - 2
utils/build/package.json

@@ -9,8 +9,8 @@
     },
     },
 
 
     "devDependencies": {
     "devDependencies": {
-    	"uglify-js2": "*",
-    	"argparse" : "*"
+        "uglify-js": "^2.4.17",
+        "argparse" : "*"
     },
     },
     
     
     "repository" : {
     "repository" : {