Skip to content
This repository has been archived by the owner on May 7, 2024. It is now read-only.

Commit

Permalink
fix: include inversify & vscode-languageserver in bundle
Browse files Browse the repository at this point in the history
  • Loading branch information
znck committed Apr 1, 2020
1 parent f375fed commit 62c8392
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 163 deletions.
1 change: 1 addition & 0 deletions .vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ vsc-extension-quickstart.md
**/*.map
**/*.ts
node_modules/**
!node_module/vscode-languageserver
34 changes: 28 additions & 6 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,18 @@ import cjs from '@rollup/plugin-commonjs';
import ts from 'rollup-plugin-typescript';
import json from '@rollup/plugin-json';

function onwarn(message) {
if (
/node_modules\/inversify\/lib\/syntax\/binding_on_syntax\.js/.test(message)
)
return;
console.error(message);
}

/** @type {import('rollup').RollupOptions[]} */
export default [
{
onwarn,
input: 'src/extension.ts',
output: {
format: 'cjs',
Expand All @@ -16,10 +25,8 @@ export default [
plugins: [node(), cjs(), ts()],
external: [
'vscode',
'vscode-languageserver',
'keytar',
'inversify',
'keytar',
// 'vscode-languageserver',
// BuiltIns
'child_process',
'crypto',
Expand All @@ -39,16 +46,31 @@ export default [
],
},
{
onwarn,
input: 'src/server/index.ts',
output: {
format: 'cjs',
file: 'out/server.js',
sourcemap: true,
},
plugins: [node(), cjs(), ts(), json()],
plugins: [
node(),
cjs({
namedExports: {
'vscode-languageserver': [
'DiagnosticSeverity',
'Disposable',
'Connection',
'TextDocumentSyncKind',
'ServerCapabilities',
'DiagnosticTag',
],
},
}),
ts(),
json(),
],
external: [
'inversify',
'vscode-languageserver',
// BuiltIns
'child_process',
'crypto',
Expand Down
9 changes: 7 additions & 2 deletions src/commands/set-credentials.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
import { Registerable } from '@/interfaces';
import { injectable } from 'inversify';
import { commands, window, QuickInputButtons, InputBox } from 'vscode';
import {
commands,
window,
QuickInputButtons,
InputBox,
Disposable,
} from 'vscode';
import keytar from 'keytar';
import { Disposable } from 'vscode-languageclient';
import { AuthParams } from '@/server/socket';
import { authenticate } from '@/server/grammarly/auth';

Expand Down
12 changes: 6 additions & 6 deletions src/server/grammarly/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import WebSocket from 'ws';
import { AuthParams, connect, Connection } from '../socket';
import { EventEmitter } from 'events';
import { TextDocument } from 'vscode-languageclient';
import { AuthCookie } from './auth';
import { GrammarlySettings } from '@/settings';
import createLogger from 'debug';
import { GrammarlySettings } from '../../settings';
import { EventEmitter } from 'events';
import minimatch from 'minimatch';
import { TextDocument } from 'vscode-languageserver-textdocument';
import WebSocket from 'ws';
import { AuthParams, connect, Connection } from '@/server/socket';
import { AuthCookie } from './auth';

process.env.DEBUG = 'grammarly:*';

Expand Down
70 changes: 0 additions & 70 deletions src/shared/credentialsStore.ts

This file was deleted.

51 changes: 0 additions & 51 deletions src/shared/events.ts

This file was deleted.

28 changes: 0 additions & 28 deletions src/shared/inMemoryKeyChain.ts

This file was deleted.

0 comments on commit 62c8392

Please sign in to comment.