Merge pull request #6219 from blink1073/upgrade-ts-jest

Switch to esnext imports

README.md

@@ -79,7 +79,7 @@ Adding `--user` after `pip install` will install the files to a local user insta
 
 #### pipenv
 
-`Pipenv` provides users and developers of applications with an easy method to setup a working environment, however Python must be installed first. See the [pipenv installation documentation](https://docs.pipenv.org/install) to use Pipenv if it is not installed.
+`Pipenv` provides users and developers of applications with an easy method to setup a working environment, however Python must be installed first. See the [pipenv installation documentation](https://docs.pipenv.org/en/latest/install/) to use Pipenv if it is not installed.
 
 `pipenv` can be installed as:
 

buildutils/tsconfig.json

@@ -2,7 +2,8 @@
   "extends": "../tsconfigbase",
   "compilerOptions": {
     "outDir": "lib",
-    "rootDir": "src"
+    "rootDir": "src",
+    "module": "commonjs"
   },
   "include": ["src/*"]
 }

packages/coreutils/tsconfig.json

@@ -2,7 +2,8 @@
   "extends": "../../tsconfigbase",
   "compilerOptions": {
     "outDir": "lib",
-    "rootDir": "src"
+    "rootDir": "src",
+    "module": "commonjs"
   },
   "files": ["src/plugin-schema.json"],
   "include": ["src/*"]

packages/rendermime/src/renderers.ts

@@ -15,7 +15,7 @@ import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
 
 import { toArray } from '@phosphor/algorithm';
 
-import escape = require('lodash.escape');
+import escape from 'lodash.escape';
 
 import { removeMath, replaceMath } from './latex';
 

packages/services/tsconfig.json

@@ -3,6 +3,7 @@
   "compilerOptions": {
     "outDir": "lib",
     "rootDir": "src",
+    "module": "commonjs",
     "types": ["node"]
   },
   "include": ["src/**/*"],

packages/terminal-extension/src/index.ts

@@ -403,19 +403,7 @@ namespace Private {
       return widgetReady;
     }
 
-    widgetReady = new Promise((resolve, reject) => {
-      require.ensure(
-        ['@jupyterlab/terminal/lib/widget'],
-        // see https://webpack.js.org/api/module-methods/#require-ensure
-        // this argument MUST be named `require` for the WebPack parser
-        require => resolve(require('@jupyterlab/terminal/lib/widget')),
-        (error: any) => {
-          showErrorMessage(error);
-          reject();
-        },
-        'terminal'
-      );
-    });
+    widgetReady = import('@jupyterlab/terminal/lib/widget');
 
     return widgetReady;
   }

packages/vega5-extension/src/index.ts

@@ -188,22 +188,7 @@ namespace Private {
       return vegaReady;
     }
 
-    vegaReady = new Promise((resolve, reject) => {
-      require.ensure(
-        ['vega-embed'],
-        // see https://webpack.js.org/api/module-methods/#require-ensure
-        // this argument MUST be named `require` for the WebPack parser
-        require => {
-          vega = require('vega-embed') as typeof VegaModuleType;
-          resolve(vega);
-        },
-        (error: any) => {
-          console.error(error);
-          reject();
-        },
-        'vega'
-      );
-    });
+    vegaReady = import('vega-embed');
 
     return vegaReady;
   }

tests/convert-to-jest.js

@@ -77,8 +77,10 @@ utils.writeJSONFile(path.join(testSrc, 'tsconfig.json'), tsData);
   utils.run(`git rm -f ./test-${name}/${fname}`);
 });
 
-// Copy run.py from coreutils
-fs.copySync(path.join(coreUtils, 'run.py'), path.join(testSrc, 'run.py'));
+// Copy common files from coreutils
+['run.py', 'babel.config.js'].forEach(fname => {
+  fs.copySync(path.join(coreUtils, fname, path.join(testSrc, fname)));
+});
 
 // Add new files to git
 utils.run(`git add ./test-${name}/run.py ./test-${name}/jest.config.js`);

tests/karma-cov.conf.js

@@ -8,7 +8,10 @@ module.exports = function(config) {
     // instrument only testing sources with Istanbul
     {
       test: /\.js$/,
-      use: { loader: 'istanbul-instrumenter-loader' },
+      use: {
+        loader: 'istanbul-instrumenter-loader',
+        options: { esModules: true }
+      },
       include: process.env.KARMA_COVER_FOLDER
     }
   );

tests/package.json

@@ -3,6 +3,7 @@
   "version": "1.0.0-alpha.6",
   "private": true,
   "dependencies": {
+    "@babel/preset-env": "^7.4.3",
     "@jupyterlab/apputils": "^1.0.0-alpha.6",
     "@jupyterlab/cells": "^1.0.0-alpha.7",
     "@jupyterlab/codeeditor": "^1.0.0-alpha.6",
@@ -38,6 +39,7 @@
     "chai": "~4.1.2",
     "expect.js": "~0.3.1",
     "json-to-html": "~0.1.2",
+    "karma-babel-preprocessor": "^8.0.0",
     "react": "~16.8.4",
     "simulate-event": "~1.4.0"
   },

tests/test-application/babel.config.js

@@ -0,0 +1 @@
+module.exports = require('@jupyterlab/testutils/lib/babel.config');

tests/test-apputils/babel.config.js

@@ -0,0 +1 @@
+module.exports = require('@jupyterlab/testutils/lib/babel.config');

tests/test-cells/babel.config.js

@@ -0,0 +1 @@
+module.exports = require('@jupyterlab/testutils/lib/babel.config');

tests/test-codeeditor/babel.config.js

@@ -0,0 +1 @@
+module.exports = require('@jupyterlab/testutils/lib/babel.config');

tests/test-codemirror/babel.config.js

@@ -0,0 +1 @@
+module.exports = require('@jupyterlab/testutils/lib/babel.config');

tests/test-completer/babel.config.js

@@ -0,0 +1 @@
+module.exports = require('@jupyterlab/testutils/lib/babel.config');

tests/test-coreutils/babel.config.js

@@ -0,0 +1 @@
+module.exports = require('@jupyterlab/testutils/lib/babel.config');

tests/test-docregistry/babel.config.js

@@ -0,0 +1 @@
+module.exports = require('@jupyterlab/testutils/lib/babel.config');

tests/test-fileeditor/babel.config.js

@@ -0,0 +1 @@
+module.exports = require('@jupyterlab/testutils/lib/babel.config');

tests/test-imageviewer/babel.config.js

@@ -0,0 +1 @@
+module.exports = require('@jupyterlab/testutils/lib/babel.config');

tests/test-inspector/babel.config.js

@@ -0,0 +1 @@
+module.exports = require('@jupyterlab/testutils/lib/babel.config');

tests/test-mainmenu/babel.config.js

@@ -0,0 +1 @@
+module.exports = require('@jupyterlab/testutils/lib/babel.config');

tests/test-observables/babel.config.js

@@ -0,0 +1 @@
+module.exports = require('@jupyterlab/testutils/lib/babel.config');

tests/test-outputarea/babel.config.js

@@ -0,0 +1 @@
+module.exports = require('@jupyterlab/testutils/lib/babel.config');

tests/test-services/babel.config.js

@@ -0,0 +1 @@
+module.exports = require('@jupyterlab/testutils/lib/babel.config');

tests/test-statusbar/babel.config.js

@@ -0,0 +1 @@
+module.exports = require('@jupyterlab/testutils/lib/babel.config');

testutils/src/babel.config.ts

@@ -0,0 +1,12 @@
+module.exports = {
+  presets: [
+    [
+      '@babel/preset-env',
+      {
+        targets: {
+          node: 'current'
+        }
+      }
+    ]
+  ]
+};

testutils/src/jest-config.ts

@@ -2,9 +2,7 @@ import path = require('path');
 
 module.exports = function(name: string, baseDir: string) {
   return {
-    transform: {
-      '^.+\\.tsx?$': 'ts-jest'
-    },
+    preset: 'ts-jest/presets/js-with-babel',
     moduleNameMapper: {
       '\\.(css|less|sass|scss)$': 'identity-obj-proxy',
       '\\.(gif|ttf|eot|svg)$': '@jupyterlab/testutils/lib/jest-file-mock.js'

testutils/tsconfig.json

@@ -3,6 +3,7 @@
   "compilerOptions": {
     "outDir": "lib",
     "rootDir": "src",
+    "module": "commonjs",
     "types": ["node"]
   },
   "include": ["src/*"],

tsconfigbase.json

@@ -6,7 +6,7 @@
     "esModuleInterop": true,
     "incremental": true,
     "jsx": "react",
-    "module": "commonjs",
+    "module": "esnext",
     "moduleResolution": "node",
     "noEmitOnError": true,
     "noImplicitAny": true,