Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1238595 syntaxerror in compressed jquery ui #3150

Merged
merged 2 commits into from
Jan 12, 2016
Merged

Bug 1238595 syntaxerror in compressed jquery ui #3150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5b2099
correct name of exploitability bundle
peterbe Jan 11, 2016
db0eb09
fixes bug 1238595 - switch to use uglifyjs for pipeline js
peterbe Jan 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion webapp-django/crashstats/settings/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,8 +597,14 @@ def JINJA_CONFIG():
STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'

# You have to run `npm install` for this to be installed in `./node_modules`
PIPELINE_YUGLIFY_BINARY = path('node_modules/.bin/yuglify')

PIPELINE_LESS_BINARY = path('node_modules/.bin/lessc')
PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.uglifyjs.UglifyJSCompressor'
PIPELINE_UGLIFYJS_BINARY = path('node_modules/.bin/uglifyjs')
PIPELINE_UGLIFYJS_ARGUMENTS = '--mangle'
PIPELINE_CSS_COMPRESSOR = 'pipeline.compressors.cssmin.CSSMinCompressor'
PIPELINE_CSSMIN_BINARY = path('node_modules/.bin/cssmin')


# Don't wrap javascript code in... `(...code...)();`
# because possibly much code has been built with the assumption that things
Expand Down
3 changes: 2 additions & 1 deletion webapp-django/crashstats/settings/bundles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
'source_filenames': (
'crashstats/js/socorro/exploitability.js',
),
'output_filename': 'js/.min.js',
'output_filename': 'js/exploitability.min.js',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hah, good catch!

},
'gccrashes': {
'source_filenames': (
Expand Down Expand Up @@ -442,6 +442,7 @@
out = v['output_filename']
assert isinstance(v['source_filenames'], tuple), v
assert isinstance(out, basestring), v
assert not out.split('/')[-1].startswith('.'), k
assert '_' not in out
assert out.endswith('.min.css') or out.endswith('.min.js')
for asset_file in v['source_filenames']:
Expand Down
3 changes: 2 additions & 1 deletion webapp-django/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"author": "Mozilla",
"license": "MPL-2.0",
"dependencies": {
"cssmin": "0.4.3",
"less": "2.5.3",
"yuglify": "0.1.4"
"uglify-js": "2.6.1"
}
}