Skip to content

Commit 496cc41

Browse files
committed
Relates to #959, update uglify to 2.8.29
1 parent 9e7ab60 commit 496cc41

File tree

13 files changed

+2572
-1174
lines changed

13 files changed

+2572
-1174
lines changed

build/jslib/uglifyjs.js

Lines changed: 2518 additions & 1155 deletions
Large diffs are not rendered by default.

build/jslib/uglifyjs/README.md

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Sets up uglifyjs for use in the optimizer.
22

3-
Current embedded version: 2.7.5, source-map 0.5.6
3+
Current embedded version: 2.8.29, source-map 0.5.6
44

55
Steps:
66

@@ -19,4 +19,35 @@ THINGS TO CHECK:
1919
* readReservedFile
2020
* exports.readReservedFile,
2121
* exports.readDefaultReservedFile,
22-
* exports.simple_glob
22+
* exports.simple_glob
23+
24+
REMOVE this section:
25+
26+
```javascript
27+
var path = require("path");
28+
var fs = require("fs");
29+
30+
var UglifyJS = exports;
31+
var FILES = exports.FILES = [
32+
"../lib/utils.js",
33+
"../lib/ast.js",
34+
"../lib/parse.js",
35+
"../lib/transform.js",
36+
"../lib/scope.js",
37+
"../lib/output.js",
38+
"../lib/compress.js",
39+
"../lib/sourcemap.js",
40+
"../lib/mozilla-ast.js",
41+
"../lib/propmangle.js",
42+
"./exports.js",
43+
].map(function(file){
44+
return require.resolve(file);
45+
});
46+
47+
new Function("MOZ_SourceMap", "exports", FILES.map(function(file){
48+
return rjsFile.readFile(file, "utf8");
49+
}).join("\n\n"))(
50+
require("source-map"),
51+
UglifyJS
52+
);
53+
```

build/jslib/uglifyjs/combine.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*jslint node: true, nomen: true */
2-
var exportContents,
2+
var exportContents, exportIndex,
33
fs = require('fs'),
44
path = require('path'),
55
pkgDir = path.join(__dirname, 'temp', 'node_modules', 'uglify-js'),
@@ -14,19 +14,21 @@ var exportContents,
1414
"compress.js",
1515
"sourcemap.js",
1616
"mozilla-ast.js",
17-
"propmangle.js"
17+
"propmangle.js",
18+
"../tools/exports.js"
1819
].map(function (filePath) {
1920
return fs.readFileSync(path.join(pkgDir, 'lib', filePath), 'utf8');
2021
}).join('\n'),
2122
post = fs.readFileSync(__dirname + '/post.txt', 'utf8'),
2223

23-
toolContents = fs.readFileSync(path.join(pkgDir, 'tools', 'node.js'), 'utf8'),
24-
exportIndex = toolContents.indexOf('exports.minify =');
24+
toolContents = fs.readFileSync(path.join(pkgDir, 'tools', 'node.js'), 'utf8');
25+
26+
exportContents = toolContents.replace(/UglifyJS\./g, 'exports.');
2527

2628
// Modify some things for the embedding:
27-
exportContents = toolContents.substring(exportIndex).replace(/fs\.readFileSync/g, 'rjsFile.readFile');
29+
exportContents = exportContents.replace(/fs\.readFileSync/g, 'rjsFile.readFile');
30+
exportContents = exportContents.replace(/fs\.writeFileSync/g, 'rjsFile.writeFile');
2831

29-
exportContents = exportContents.replace(/UglifyJS\./g, '');
3032

3133
exportContents = exportContents.replace('exports.minify = function(files, options) {', 'exports.minify = function(files, options, name) {');
3234
exportContents = exportContents.replace('filename: options.fromString ? i : file,', 'filename: options.fromString ? name : file,');

build/jslib/uglifyjs/generate.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ rm -rf ./temp
44
mkdir temp
55
cd temp
66
mkdir node_modules
7-
npm install uglify-js
7+
npm install uglify-js@2.8.29
88
node_modules/.bin/uglifyjs --self -b -o raw.js
99

1010
node ../combine.js
1111
cp -r node_modules/source-map/dist/source-map.js ../../source-map.js
1212

13-
node ../fix-sourcemap.js ../../source-map.js
13+
node ../fix-sourcemap.js ../../source-map.js

build/jslib/x.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ var requirejs, require, define, xpcUtil;
419419
} else if (commandOption === 'v') {
420420
console.log('r.js: ' + version +
421421
', RequireJS: ' + this.requirejsVars.require.version +
422-
', UglifyJS: 2.7.5');
422+
', UglifyJS: 2.8.29');
423423
} else if (commandOption === 'convert') {
424424
loadLib();
425425

build/tests/lib/sourcemap/expected-main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/tests/lib/sourcemap/onejs/expected.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/tests/lib/sourcemapComments/expected-main-built.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/tests/lib/sourcemapComments/expected-main-built.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/tests/lib/sourcemapSingle/expected-main-built.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)