From c43537fc763f56012505aa9d1d162ef99e79cb23 Mon Sep 17 00:00:00 2001 From: Maki Nishifuji Date: Sun, 11 Sep 2016 15:22:16 +0900 Subject: [PATCH] Bugfix: Babel compile --- .../client/views/integrationsIncoming.html | 2 +- .../client/views/integrationsOutgoing.html | 2 +- .../server/methods/incoming/addIncomingIntegration.coffee | 6 +++--- .../methods/incoming/updateIncomingIntegration.coffee | 6 +++--- .../server/methods/outgoing/addOutgoingIntegration.coffee | 6 +++--- .../methods/outgoing/updateOutgoingIntegration.coffee | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/rocketchat-integrations/client/views/integrationsIncoming.html b/packages/rocketchat-integrations/client/views/integrationsIncoming.html index 836d97bdb30..73e26c23151 100644 --- a/packages/rocketchat-integrations/client/views/integrationsIncoming.html +++ b/packages/rocketchat-integrations/client/views/integrationsIncoming.html @@ -91,7 +91,7 @@
{{data.scriptError.name}}
- 
{{data.scriptError.codeFrame}}
+ 
{{data.scriptError.message}}
{{/if}} diff --git a/packages/rocketchat-integrations/client/views/integrationsOutgoing.html b/packages/rocketchat-integrations/client/views/integrationsOutgoing.html index 2abbce5bdc4..4d7bca6929e 100644 --- a/packages/rocketchat-integrations/client/views/integrationsOutgoing.html +++ b/packages/rocketchat-integrations/client/views/integrationsOutgoing.html @@ -109,7 +109,7 @@
{{data.scriptError.name}}
- 
{{data.scriptError.codeFrame}}
+ 
{{data.scriptError.message}}
{{/if}} diff --git a/packages/rocketchat-integrations/server/methods/incoming/addIncomingIntegration.coffee b/packages/rocketchat-integrations/server/methods/incoming/addIncomingIntegration.coffee index bd29ad99b11..bcf6823ba08 100644 --- a/packages/rocketchat-integrations/server/methods/incoming/addIncomingIntegration.coffee +++ b/packages/rocketchat-integrations/server/methods/incoming/addIncomingIntegration.coffee @@ -23,14 +23,14 @@ Meteor.methods if integration.scriptEnabled is true and integration.script? and integration.script.trim() isnt '' try - babelOptions = Babel.getDefaultOptions() - babelOptions.externalHelpers = false + babelOptions = Babel.getDefaultOptions({ runtime: false }) + babelOptions = _.extend(babelOptions, { compact: true, minified: true, comments: false }) integration.scriptCompiled = Babel.compile(integration.script, babelOptions).code integration.scriptError = undefined catch e integration.scriptCompiled = undefined - integration.scriptError = _.pick e, 'name', 'message', 'pos', 'loc', 'codeFrame' + integration.scriptError = _.pick e, 'name', 'message', 'stack' for channel in channels record = undefined diff --git a/packages/rocketchat-integrations/server/methods/incoming/updateIncomingIntegration.coffee b/packages/rocketchat-integrations/server/methods/incoming/updateIncomingIntegration.coffee index 2fc5e411296..ce0db5d79df 100644 --- a/packages/rocketchat-integrations/server/methods/incoming/updateIncomingIntegration.coffee +++ b/packages/rocketchat-integrations/server/methods/incoming/updateIncomingIntegration.coffee @@ -26,14 +26,14 @@ Meteor.methods if integration.scriptEnabled is true and integration.script? and integration.script.trim() isnt '' try - babelOptions = Babel.getDefaultOptions() - babelOptions.externalHelpers = false + babelOptions = Babel.getDefaultOptions({ runtime: false }) + babelOptions = _.extend(babelOptions, { compact: true, minified: true, comments: false }) integration.scriptCompiled = Babel.compile(integration.script, babelOptions).code integration.scriptError = undefined catch e integration.scriptCompiled = undefined - integration.scriptError = _.pick e, 'name', 'message', 'pos', 'loc', 'codeFrame' + integration.scriptError = _.pick e, 'name', 'message', 'stack' for channel in channels record = undefined diff --git a/packages/rocketchat-integrations/server/methods/outgoing/addOutgoingIntegration.coffee b/packages/rocketchat-integrations/server/methods/outgoing/addOutgoingIntegration.coffee index 72e67772eb2..90e9860285c 100644 --- a/packages/rocketchat-integrations/server/methods/outgoing/addOutgoingIntegration.coffee +++ b/packages/rocketchat-integrations/server/methods/outgoing/addOutgoingIntegration.coffee @@ -40,14 +40,14 @@ Meteor.methods if integration.scriptEnabled is true and integration.script? and integration.script.trim() isnt '' try - babelOptions = Babel.getDefaultOptions() - babelOptions.externalHelpers = false + babelOptions = Babel.getDefaultOptions({ runtime: false }) + babelOptions = _.extend(babelOptions, { compact: true, minified: true, comments: false }) integration.scriptCompiled = Babel.compile(integration.script, babelOptions).code integration.scriptError = undefined catch e integration.scriptCompiled = undefined - integration.scriptError = _.pick e, 'name', 'message', 'pos', 'loc', 'codeFrame' + integration.scriptError = _.pick e, 'name', 'message', 'stack' for channel in channels diff --git a/packages/rocketchat-integrations/server/methods/outgoing/updateOutgoingIntegration.coffee b/packages/rocketchat-integrations/server/methods/outgoing/updateOutgoingIntegration.coffee index 00fe3d44719..c1bc0c2aca8 100644 --- a/packages/rocketchat-integrations/server/methods/outgoing/updateOutgoingIntegration.coffee +++ b/packages/rocketchat-integrations/server/methods/outgoing/updateOutgoingIntegration.coffee @@ -52,14 +52,14 @@ Meteor.methods if integration.scriptEnabled is true and integration.script? and integration.script.trim() isnt '' try - babelOptions = Babel.getDefaultOptions() - babelOptions.externalHelpers = false + babelOptions = Babel.getDefaultOptions({ runtime: false }) + babelOptions = _.extend(babelOptions, { compact: true, minified: true, comments: false }) integration.scriptCompiled = Babel.compile(integration.script, babelOptions).code integration.scriptError = undefined catch e integration.scriptCompiled = undefined - integration.scriptError = _.pick e, 'name', 'message', 'pos', 'loc', 'codeFrame' + integration.scriptError = _.pick e, 'name', 'message', 'stack', for channel in channels