From 8f2770d08449ee8f4b4ac04488301487e179e809 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 4 Oct 2013 09:25:31 -0700 Subject: [PATCH] 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. --- src/coffee-cache.coffee | 6 +++++- src/task.coffee | 4 ---- static/index.html | 4 ---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/coffee-cache.coffee b/src/coffee-cache.coffee index 6f0286767..25c6a7472 100644 --- a/src/coffee-cache.coffee +++ b/src/coffee-cache.coffee @@ -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 + }) diff --git a/src/task.coffee b/src/task.coffee index ba6979f26..e3ea96a22 100644 --- a/src/task.coffee +++ b/src/task.coffee @@ -49,10 +49,6 @@ class Task bootstrap = """ #{coffeeScriptRequire} #{coffeeCacheRequire} - Object.defineProperty(require.extensions, '.coffee', { - writable: false, - value: require.extensions['.coffee'] - }); #{taskBootstrapRequire} """ diff --git a/static/index.html b/static/index.html index dd2b83bf5..e1e51852c 100644 --- a/static/index.html +++ b/static/index.html @@ -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'); }