mirror of
https://github.com/atom/atom.git
synced 2026-01-21 04:48:12 -05:00
Prevent overriding coffee cache once registered
Previously this was done afterwards in index.html and task.coffee but should really be handled by the cache itself so any module require a different version of coffee-script are not reregistering a different require extension handler.
This commit is contained in:
@@ -34,4 +34,8 @@ requireCoffeeScript = (module, filePath) ->
|
||||
|
||||
module.exports =
|
||||
cacheDir: cacheDir
|
||||
register: -> require.extensions['.coffee'] = requireCoffeeScript
|
||||
register: ->
|
||||
Object.defineProperty(require.extensions, '.coffee', {
|
||||
writable: false
|
||||
value: requireCoffeeScript
|
||||
})
|
||||
|
||||
@@ -49,10 +49,6 @@ class Task
|
||||
bootstrap = """
|
||||
#{coffeeScriptRequire}
|
||||
#{coffeeCacheRequire}
|
||||
Object.defineProperty(require.extensions, '.coffee', {
|
||||
writable: false,
|
||||
value: require.extensions['.coffee']
|
||||
});
|
||||
#{taskBootstrapRequire}
|
||||
"""
|
||||
|
||||
|
||||
@@ -9,10 +9,6 @@
|
||||
try {
|
||||
require('coffee-script');
|
||||
require('../src/coffee-cache').register();
|
||||
Object.defineProperty(require.extensions, '.coffee', {
|
||||
writable: false,
|
||||
value: require.extensions['.coffee']
|
||||
});
|
||||
require(currentWindow.loadSettings.bootstrapScript);
|
||||
currentWindow.emit('window:loaded');
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user