Lazy load some more npm dependencies and smarter imports for lodash (microsoft#3461)

For microsoft#3018

Author: DonJayamanne

build/webpack/common.js

@@ -14,7 +14,17 @@ exports.nodeModulesToExternalize = [
  'unicode/category/Mn',
  'unicode/category/Mc',
  'unicode/category/Nd',
- 'unicode/category/Pc'
+ 'unicode/category/Pc',
+ '@jupyterlab/services',
+ 'azure-storage',
+ 'request',
+ 'request-progress',
+ 'source-map',
+ 'file-matcher',
+ 'diff-match-patch',
+ 'sudo-prompt',
+ 'node-stream-zip',
+ 'xml2js'
 ];
 function getDefaultPlugins(name) {
  const plugins = [];

build/webpack/common.ts

@@ -1,4 +1,3 @@
-
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
@@ -16,7 +15,17 @@ export const nodeModulesToExternalize = [
  'unicode/category/Mn',
  'unicode/category/Mc',
  'unicode/category/Nd',
- 'unicode/category/Pc'
+ 'unicode/category/Pc',
+ '@jupyterlab/services',
+ 'azure-storage',
+ 'request',
+ 'request-progress',
+ 'source-map',
+ 'file-matcher',
+ 'diff-match-patch',
+ 'sudo-prompt',
+ 'node-stream-zip',
+ 'xml2js'
 ];
 
 export function getDefaultPlugins(name: 'extension' | 'debugger' | 'dependencies' | 'datascience-ui') {

build/webpack/webpack.extension.dependencies.config.js

@@ -17,6 +17,19 @@ const config = {
  node: {
  __dirname: false
  },
+ module: {
+ rules: [
+ {
+ // JupyterServices imports node-fetch using `eval`.
+ test: /@jupyterlab[\\\/]services[\\\/].*js$/,
+ use: [
+ {
+ loader: path.join(__dirname, 'loaders', 'fixEvalRequire.js')
+ }
+ ]
+ }
+ ]
+ },
  externals: [
  'vscode',
  'commonjs'

build/webpack/webpack.extension.dependencies.config.ts

@@ -21,6 +21,19 @@ const config: webpack.Configuration = {
  node: {
  __dirname: false
  },
+ module: {
+ rules: [
+ {
+ // JupyterServices imports node-fetch using `eval`.
+ test: /@jupyterlab[\\\/]services[\\\/].*js$/,
+ use: [
+ {
+ loader: path.join(__dirname, 'loaders', 'fixEvalRequire.js')
+ }
+ ]
+ }
+ ]
+ },
  externals: [
  'vscode',
  'commonjs'

src/client/activation/downloader.ts

@@ -4,7 +4,6 @@
 'use strict';
 
 import * as path from 'path';
-import * as requestProgress from 'request-progress';
 import { ProgressLocation, window } from 'vscode';
 import { STANDARD_OUTPUT_CHANNEL } from '../common/constants';
 import { IFileSystem } from '../common/platform/types';
@@ -20,8 +19,6 @@ import {
 import { PlatformData } from './platformData';
 import { IHttpClient, ILanguageServerDownloader, ILanguageServerFolderService } from './types';
 
-// tslint:disable-next-line:no-require-imports no-var-requires
-const StreamZip = require('node-stream-zip');
 const downloadFileExtension = '.nupkg';
 
 export class LanguageServerDownloader implements ILanguageServerDownloader {
@@ -98,9 +95,11 @@ export class LanguageServerDownloader implements ILanguageServerDownloader {
 
  await window.withProgress({
  location: ProgressLocation.Window
- }, (progress) => {
+ }, async (progress) => {
  const httpClient = this.serviceContainer.get<IHttpClient>(IHttpClient);
- requestProgress(httpClient.downloadFile(uri))
+ const req = await httpClient.downloadFile(uri);
+ const requestProgress = await import('request-progress');
+ requestProgress(req)
  .on('progress', (state) => {
  // https://www.npmjs.com/package/request-progress
  const received = Math.round(state.size.transferred / 1024);
@@ -134,6 +133,8 @@ export class LanguageServerDownloader implements ILanguageServerDownloader {
  await window.withProgress({
  location: ProgressLocation.Window
  }, (progress) => {
+ // tslint:disable-next-line:no-require-imports no-var-requires
+ const StreamZip = require('node-stream-zip');
  const zip = new StreamZip({
  file: tempFilePath,
  storeEntries: true

src/client/activation/languageServer/languageServer.ts

@@ -151,7 +151,7 @@ export class LanguageServerExtensionActivator implements IExtensionActivator {
  const settings = this.configuration.getSettings();
  if (!settings.downloadLanguageServer) {
  // Depends on .NET Runtime or SDK. Typically development-only case.
- this.languageClient = this.createSimpleLanguageClient(clientOptions);
+ this.languageClient = await this.createSimpleLanguageClient(clientOptions);
  await this.startLanguageClient();
  return true;
  }
@@ -163,7 +163,7 @@ export class LanguageServerExtensionActivator implements IExtensionActivator {
  }
 
  const serverModule = path.join(this.context.extensionPath, this.languageServerFolder, this.platformData.getEngineExecutableName());
- this.languageClient = this.createSelfContainedLanguageClient(serverModule, clientOptions);
+ this.languageClient = await this.createSelfContainedLanguageClient(serverModule, clientOptions);
  try {
  await this.startLanguageClient();
  this.languageClient.onTelemetry(telemetryEvent => {
@@ -197,23 +197,25 @@ export class LanguageServerExtensionActivator implements IExtensionActivator {
  this.startupCompleted.resolve();
  }
 
- private createSimpleLanguageClient(clientOptions: LanguageClientOptions): LanguageClient {
+ private async createSimpleLanguageClient(clientOptions: LanguageClientOptions): Promise<LanguageClient> {
  const commandOptions = { stdio: 'pipe' };
  const serverModule = path.join(this.context.extensionPath, this.languageServerFolder, this.platformData.getEngineDllName());
  const serverOptions: ServerOptions = {
  run: { command: dotNetCommand, args: [serverModule], options: commandOptions },
  debug: { command: dotNetCommand, args: [serverModule, '--debug'], options: commandOptions }
  };
- return new LanguageClient(PYTHON, languageClientName, serverOptions, clientOptions);
+ const vscodeLanaguageClient = await import('vscode-languageclient');
+ return new vscodeLanaguageClient.LanguageClient(PYTHON, languageClientName, serverOptions, clientOptions);
  }
 
- private createSelfContainedLanguageClient(serverModule: string, clientOptions: LanguageClientOptions): LanguageClient {
+ private async createSelfContainedLanguageClient(serverModule: string, clientOptions: LanguageClientOptions): Promise<LanguageClient> {
  const options = { stdio: 'pipe' };
  const serverOptions: ServerOptions = {
  run: { command: serverModule, rgs: [], options: options },
  debug: { command: serverModule, args: ['--debug'], options }
  };
- return new LanguageClient(PYTHON, languageClientName, serverOptions, clientOptions);
+ const vscodeLanaguageClient = await import('vscode-languageclient');
+ return new vscodeLanaguageClient.LanguageClient(PYTHON, languageClientName, serverOptions, clientOptions);
  }
 
  // tslint:disable-next-line:member-ordering

src/client/activation/types.ts

@@ -26,7 +26,7 @@ export interface IExtensionActivator {
 
 export const IHttpClient = Symbol('IHttpClient');
 export interface IHttpClient {
- downloadFile(uri: string): RequestResult;
+ downloadFile(uri: string): Promise<RequestResult>;
  getJSON<T>(uri: string): Promise<T>;
 }
 

src/client/common/editor.ts

@@ -1,4 +1,4 @@
-import * as dmp from 'diff-match-patch';
+import { Diff, diff_match_patch } from 'diff-match-patch';
 import * as fs from 'fs-extra';
 import { injectable } from 'inversify';
 import * as md5 from 'md5';
@@ -17,7 +17,7 @@ enum EditAction {
 const NEW_LINE_LENGTH = EOL.length;
 
 class Patch {
- public diffs!: dmp.Diff[];
+ public diffs!: Diff[];
  public start1!: number;
  public start2!: number;
  public length1!: number;
@@ -61,7 +61,8 @@ export function getTextEditsFromPatch(before: string, patch: string): TextEdit[]
  // Remove the text added by unified_diff
  // # Work around missing newline (http://bugs.python.org/issue2142).
  patch = patch.replace(/\\ No newline at end of file[\r\n]/, '');
-
+ // tslint:disable-next-line:no-require-imports
+ const dmp = require('diff-match-patch') as typeof import('diff-match-patch');
  const d = new dmp.diff_match_patch();
  const patches = patch_fromText.call(d, patch);
  if (!Array.isArray(patches) || patches.length === 0) {
@@ -114,6 +115,8 @@ export function getWorkspaceEditsFromPatch(filePatches: string[], workspaceRoot?
  // # Work around missing newline (http://bugs.python.org/issue2142).
  patch = patch.replace(/\\ No newline at end of file[\r\n]/, '');
 
+ // tslint:disable-next-line:no-require-imports
+ const dmp = require('diff-match-patch') as typeof import('diff-match-patch');
  const d = new dmp.diff_match_patch();
  const patches = patch_fromText.call(d, patch);
  if (!Array.isArray(patches) || patches.length === 0) {
@@ -150,6 +153,8 @@ export function getWorkspaceEditsFromPatch(filePatches: string[], workspaceRoot?
  return workspaceEdit;
 }
 export function getTextEdits(before: string, after: string): TextEdit[] {
+ // tslint:disable-next-line:no-require-imports
+ const dmp = require('diff-match-patch') as typeof import('diff-match-patch');
  const d = new dmp.diff_match_patch();
  const diffs = d.diff_main(before, after);
  return getTextEditsInternal(before, diffs).map(edit => edit.apply());
@@ -178,6 +183,8 @@ function getTextEditsInternal(before: string, diffs: [number, string][], startLi
  }
  }
 
+ // tslint:disable-next-line:no-require-imports
+ const dmp = require('diff-match-patch') as typeof import('diff-match-patch');
  // tslint:disable-next-line:switch-default
  switch (diffs[i][0]) {
  case dmp.DIFF_DELETE:
@@ -261,7 +268,7 @@ function patch_fromText(textline): Patch[] {
  throw new Error(`Invalid patch string: ${text[textPointer]}`);
  }
  // tslint:disable-next-line:no-any
- const patch = new (<any>dmp.diff_match_patch).patch_obj();
+ const patch = new (<any>diff_match_patch).patch_obj();
  patches.push(patch);
  patch.start1 = parseInt(m[1], 10);
  if (m[2] === '') {
@@ -285,6 +292,8 @@ function patch_fromText(textline): Patch[] {
  patch.length2 = parseInt(m[4], 10);
  }
  textPointer += 1;
+ // tslint:disable-next-line:no-require-imports
+ const dmp = require('diff-match-patch') as typeof import('diff-match-patch');
 
  while (textPointer < text.length) {
  const sign = text[textPointer].charAt(0);
@@ -339,6 +348,8 @@ export class EditorUtils implements IEditorUtils {
  // # Work around missing newline (http://bugs.python.org/issue2142).
  patch = patch.replace(/\\ No newline at end of file[\r\n]/, '');
 
+ // tslint:disable-next-line:no-require-imports
+ const dmp = require('diff-match-patch') as typeof import('diff-match-patch');
  const d = new dmp.diff_match_patch();
  const patches = patch_fromText.call(d, patch);
  if (!Array.isArray(patches) || patches.length === 0) {

src/client/common/installer/moduleInstaller.ts

@@ -1,9 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-// tslint:disable-next-line:no-require-imports no-var-requires
-const sudo = require('sudo-prompt');
-
 import * as fs from 'fs';
 import { injectable } from 'inversify';
 import * as path from 'path';
@@ -90,6 +87,8 @@ export abstract class ModuleInstaller {
 
  outputChannel.appendLine('');
  outputChannel.appendLine(`[Elevated] ${command}`);
+ // tslint:disable-next-line:no-require-imports no-var-requires
+ const sudo = require('sudo-prompt');
 
  sudo.exec(command, options, (error, stdout, stderr) => {
  if (error) {

src/client/common/net/httpClient.ts

@@ -4,23 +4,27 @@
 'use strict';
 
 import { inject, injectable } from 'inversify';
-import * as request from 'request';
+import * as requestTypes from 'request';
 import { IHttpClient } from '../../activation/types';
 import { IServiceContainer } from '../../ioc/types';
 import { IWorkspaceService } from '../application/types';
 
 @injectable()
 export class HttpClient implements IHttpClient {
- public readonly requestOptions: request.CoreOptions;
+ public readonly requestOptions: requestTypes.CoreOptions;
  constructor(@inject(IServiceContainer) serviceContainer: IServiceContainer) {
  const workspaceService = serviceContainer.get<IWorkspaceService>(IWorkspaceService);
  this.requestOptions = { proxy: workspaceService.getConfiguration('http').get('proxy', '') };
  }
 
- public downloadFile(uri: string): request.Request {
+ public async downloadFile(uri: string): Promise<requestTypes.Request> {
+ // tslint:disable-next-line:no-any
+ const request = await import('request') as any as typeof requestTypes;
  return request(uri, this.requestOptions);
  }
- public getJSON<T>(uri: string): Promise<T> {
+ public async getJSON<T>(uri: string): Promise<T> {
+ // tslint:disable-next-line:no-require-imports
+ const request = require('request') as typeof requestTypes;
  return new Promise<T>((resolve, reject) => {
  request(uri, this.requestOptions, (ex, response, body) => {
  if (ex) {