[requirejs] don't use commonjs wrapper

as it works by searching through the module definition function's toString representation, the commonjs style requirejs wrapper is slower, and prone to subtle errors. We don't actually need it anywhere, so use regular requirejs define calls instead.

Author: jcb91

src/jupyter_contrib_nbextensions/nbextensions/code_prettify/2to3.js

@@ -4,11 +4,9 @@
 // Based on: https://github.com/jfbercher/code_prettify and
 //           https://gist.github.com/takluyver/c8839593c615bb2f6e80
 
-define(function(requirejs, exports, module) {
+define(['./kernel_exec_on_cell'], function(kernel_exec_on_cell) {
     'use strict';
 
-    var kernel_exec_on_cell = requirejs('./kernel_exec_on_cell');
-
     var mod_name = '2to3';
 
     // gives default settings

src/jupyter_contrib_nbextensions/nbextensions/code_prettify/autopep8.js

@@ -2,11 +2,9 @@
 // Distributed under the terms of the Modified BSD License.
 // Authors: @kenkoooo, @jfbercher and @jcb91
 
-define(function(requirejs, exports, module) {
+define(['./kernel_exec_on_cell'], function(kernel_exec_on_cell) {
     'use strict';
 
-    var kernel_exec_on_cell = requirejs('./kernel_exec_on_cell');
-
     var mod_name = 'autopep8';
 
     // gives default settings

src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.js

@@ -2,11 +2,9 @@
 // Distributed under the terms of the Modified BSD License.
 // Authors: @jfbercher and @jcb91
 
-define(function(requirejs, exports, module) {
+define(['./kernel_exec_on_cell'], function(kernel_exec_on_cell) {
     'use strict';
 
-    var kernel_exec_on_cell = requirejs('./kernel_exec_on_cell');
-
     var mod_name = 'code_prettify';
 
     // gives default settings

src/jupyter_contrib_nbextensions/nbextensions/code_prettify/kernel_exec_on_cell.js

@@ -1,13 +1,20 @@
 // Copyright (c) Jupyter-Contrib Team.
 // Distributed under the terms of the Modified BSD License.
 
-define(function(requirejs, exports, module) {
+define([
+    'jquery',
+    'base/js/namespace',
+    'base/js/events',
+    'notebook/js/codecell',
+], function(
+    $,
+    Jupyter,
+    events,
+    codecell
+) {
     'use strict';
 
-    var $ = requirejs('jquery');
-    var Jupyter = requirejs('base/js/namespace');
-    var events = requirejs('base/js/events');
-    var CodeCell = requirejs('notebook/js/codecell').CodeCell;
+    var CodeCell = codecell.CodeCell;
 
     // this wrapper function allows config & hotkeys to be per-plugin
     function KernelExecOnCells(mod_name, cfg) {
@@ -325,6 +332,5 @@ define(function(requirejs, exports, module) {
             });
     };
 
-    exports.define_plugin = KernelExecOnCells;
     return {define_plugin: KernelExecOnCells};
 });

src/jupyter_contrib_nbextensions/nbextensions/hinterland/hinterland.js

@@ -1,12 +1,25 @@
-define(function (requirejs, exports, module) {
+define([
+	'module',
+	'jquery',
+	'base/js/namespace',
+	'base/js/keyboard',
+	'notebook/js/cell',
+	'notebook/js/codecell',
+	'notebook/js/completer',
+], function (
+	module,
+	$,
+	Jupyter,
+	keyboard,
+	cell,
+	codecell,
+	completer
+) {
 	'use strict';
 
-	var $ = requirejs('jquery');
-	var Jupyter = requirejs('base/js/namespace');
-	var keyboard = requirejs('base/js/keyboard');
-	var Cell = requirejs('notebook/js/cell').Cell;
-	var CodeCell = requirejs('notebook/js/codecell').CodeCell;
-	var Completer = requirejs('notebook/js/completer').Completer;
+	var Cell = cell.Cell;
+	var CodeCell = codecell.CodeCell;
+	var Completer = completer.Completer;
 
 	var log_prefix = '[' + module.id + ']';
 

src/jupyter_contrib_nbextensions/nbextensions/nbTranslate/main.js

@@ -2,17 +2,23 @@
 // Distributed under the terms of the Modified BSD License.
 // Author: Jean-François Bercher 
 
-define(function(requirejs, exports, module) {
+define([
+    'module',
+    'require',
+    'jquery',
+    'base/js/namespace',
+    './nbTranslate',
+    './mutils',
+], function(
+    module,
+    requirejs,
+    $,
+    Jupyter,
+    nbt,
+    mutils
+) {
     'use strict';
 
-    var $ = requirejs('jquery');
-    var Jupyter = requirejs('base/js/namespace');
-    var keyboard = requirejs('base/js/keyboard');
-    var Cell = requirejs('notebook/js/cell').Cell;
-    var CodeCell = requirejs('notebook/js/codecell').CodeCell;
-
-    var nbt = requirejs('nbextensions/nbTranslate/nbTranslate');
-    var mutils = requirejs('nbextensions/nbTranslate/mutils');
     var sourceLang;
     var targetLang;
     var displayLangs;

src/jupyter_contrib_nbextensions/nbextensions/scratchpad/main.js

@@ -1,11 +1,20 @@
-define(function (requirejs, exports, module) {
+define([
+  'require',
+  'jquery',
+  'base/js/namespace',
+  'base/js/events',
+  'base/js/utils',
+  'notebook/js/codecell',
+], function (
+  requirejs,
+  $,
+  Jupyter,
+  events,
+  utils,
+  codecell
+) {
   "use strict";
-  var $ = requirejs('jquery');
-  var Jupyter = requirejs('base/js/namespace');
-  var events = requirejs('base/js/events');
-  var utils = requirejs('base/js/utils');
-  var CodeCell = requirejs('notebook/js/codecell').CodeCell;
-
+  var CodeCell = codecell.CodeCell;
 
   var Scratchpad = function (nb) {
     var scratchpad = this;