Updated build scripts to build command-line version into an npm module.

Author: msfterictraut

.gitignore

@@ -5,6 +5,7 @@ node_modules
 .npm
 
 # Output files
+dist
 server/out/
 client/out/
 client/server/

.npmignore

@@ -0,0 +1,9 @@
+/.vscode
+/client
+/docs
+/node_modules
+/server
+.gitignore
+*.md
+settings.json
+

client/package-lock.json

@@ -3,7 +3,7 @@
     "displayName": "Pyright",
     "description": "VS Code language support and type checking for Python",
     "version": "1.0.1",
-    "licensce": "MIT",
+    "license": "MIT",
     "author": {
         "name": "Microsoft Corporation"
     },

client/package.json

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+
+// Stash the base directory into a global variable.
+global.__rootDirectory = __dirname + '/dist/';
+
+require('./dist/pyright')

index.js

@@ -1,19 +1,30 @@
 {
     "name": "pyright",
     "displayName": "Pyright",
-    "description": "VS Code language support and type checking for Python",
+    "description": "Type checker for the Python language",
     "version": "1.0.1",
+    "license": "MIT",
+    "author": {
+        "name": "Microsoft Corporation"
+    },
+    "publisher": "Microsoft Corporation",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/Microsoft/pyright"
+    },
     "scripts": {
         "postinstall": "cd server && npm install && cd ../client && npm install && cd ..",
         "build": "npm run build:client && npm run build:server",
         "build:client": "cd client && npm run build && cd ..",
         "build:server": "cd server && npm run build && cd ..",
         "build:analyzer": "cd server && npm run build:analyzer && cd ..",
+        "build:pyright": "cd server && npm run build:pyright && cd ..",
         "package": "npm run build && cd client && npx vsce package && cd .."
     },
     "devDependencies": {
         "@types/mocha": "^5.2.5",
         "@types/node": "^11.10.5",
         "typescript": "^3.2.2"
-    }
+    },
+    "main": "index.js"
 }

package-lock.json

@@ -0,0 +1,13 @@
+#!/usr/bin/env node
+
+// This script helps build the command-line version of pyright
+// by copying the typeshed-fallback directory to the dist directory.
+
+var fsExtra = require('fs-extra');
+
+// Clean the dist directory
+fsExtra.emptyDirSync('../dist');
+
+fsExtra.mkdirSync('../dist/typeshed-fallback');
+fsExtra.copySync('../client/typeshed-fallback', '../dist/typeshed-fallback');
+

package.json

@@ -1,17 +1,18 @@
 {
     "name": "pyright",
     "displayName": "pyright",
-    "description": "Linter and type checker for the Python language",
+    "description": "Type checker for the Python language",
     "version": "1.0.1",
     "license": "MIT",
     "scripts": {
         "start": "npm run start:analyzer && npm run start:server",
         "start:analyzer": "npm i && npm run build:analyzer",
         "start:server": "npm i && npm run build:server",
-        "build": "npm run build:server && npm run build:analyzer",
+        "build": "npm run build:server && npm run build:analyzer && npm run build:pyright",
         "build:analyzer": "npm run tslint && tsc",
-        "build:server": "npm run installServer && webpack",
+        "build:server": "npm run installServer && webpack --config webpack.config-server.js",
         "installServer": "node ./customInstallServerIntoExtension.js ../client ./package.json ./tsconfig.json ./package-lock.json",
+        "build:pyright": "node ./copyTypeshedFallback.js && npm run tslint && webpack --config webpack.config-pyright.js",
         "watch": "tsc --watch",
         "tslint": "tslint --project tsconfig.json --fix",
         "test": "jest"
@@ -24,8 +25,10 @@
     },
     "devDependencies": {
         "@types/command-line-args": "^5.0.0",
+        "@types/fs-extra": "^5.0.5",
         "@types/jest": "^24.0.9",
         "@types/node": "^11.10.5",
+        "fs-extra": "^7.0.1",
         "jest": "^24.1.0",
         "ts-jest": "^24.0.0",
         "tslint": "^5.13.1",

server/copyTypeshedFallback.js

@@ -143,7 +143,7 @@ export class ImportResolver {
         } else {
             // Assume that the 'typeshed-fallback' directory is up one level
             // from this javascript file.
-            const moduleDirectory = (global as any).__basedir;
+            const moduleDirectory = (global as any).__rootDirectory;
             if (moduleDirectory) {
                 typeshedPath = combinePaths(getDirectoryPath(moduleDirectory), 'typeshed-fallback');
             }

server/package-lock.json

@@ -23,9 +23,6 @@ import { combinePaths, normalizePath } from './common/pathUtils';
 
 const toolName = 'pyright';
 
-// Stash the base directory into a global variable.
-(global as any).__basedir = __dirname;
-
 enum ExitStatus {
     Success = 0,
     DiagnosticsPresent_OutputsSkipped = 1,

server/package.json

@@ -26,7 +26,7 @@ interface Settings {
 }
 
 // Stash the base directory into a global variable.
-(global as any).__basedir = __dirname;
+(global as any).__rootDirectory = __dirname;
 
 // Create a connection for the server. The connection uses Node's IPC as a transport
 let _connection: IConnection = createConnection(new IPCMessageReader(process), new IPCMessageWriter(process));

server/src/analyzer/importResolver.ts

@@ -0,0 +1,44 @@
+/**
+* webpack.config-pyright.js
+* Copyright: Microsoft 2018
+*
+* Configuration for webpack to bundle the javascript into a single file
+* for the pyright command-line tool.
+*/
+
+const path = require('path');
+
+module.exports = {
+    entry: './src/pyright.ts',
+    mode: 'development',
+    target: 'node',
+    output: {
+        filename: 'pyright.js',
+        path: path.resolve(__dirname, '../dist')
+    },
+
+    resolve: {
+        modules: [
+            path.resolve(__dirname, '.'),
+            'node_modules'
+        ],
+        // Add '.ts' and '.tsx' as resolvable extensions.
+        extensions: ['.webpack.js', '.web.js', '.ts', '.tsx', '.js']
+    },
+
+    module: {
+        rules: [
+            {
+                test: /\.tsx?$/,
+                loader: 'ts-loader',
+                options: {
+                    configFile: 'tsconfig.json'
+                }
+            }
+        ]
+    },
+
+    node: {
+        fs: 'empty'
+    }
+};

server/src/pyright.ts

@@ -1,8 +1,9 @@
 /**
-* webpack.config.js
+* webpack.config-server.js
 * Copyright: Microsoft 2018
 *
-* Configuration for webpack to bundle the javascript into a single file.
+* Configuration for webpack to bundle the javascript into a single file
+* for the VS Code Extension language server.
 */
 
 const path = require('path');