Skip to content

Commit

Permalink
Feature/html bundle (#193)
Browse files Browse the repository at this point in the history
* added bundling

* added minify

* removed unnecessary npm packages

* removes unecessary file
  • Loading branch information
Anthony Dresser authored Oct 26, 2016
1 parent 2a1c29e commit 59e4ed7
Show file tree
Hide file tree
Showing 208 changed files with 563 additions and 17,271 deletions.
37 changes: 0 additions & 37 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 17 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{

"name": "mssql",
"displayName": "mssql",
"version": "0.1.1",
Expand Down Expand Up @@ -45,20 +44,24 @@
"devDependencies": {
"del": "^2.2.1",
"gulp": "github:gulpjs/gulp#4.0",
"gulp-concat": "^2.6.0",
"gulp-install": "^0.6.0",
"gulp-less": "^3.1.0",
"gulp-json-editor": "^2.2.1",
"gulp-rename": "^1.2.2",
"gulp-sourcemaps": "^1.6.0",
"gulp-tslint": "^6.0.2",
"gulp-typescript": "^2.13.6",
"gulp-rename": "^1.2.2",
"gulp-uglify": "^2.0.0",
"pm-mocha-jenkins-reporter": "^0.2.6",
"systemjs-builder": "^0.15.32",
"tslint": "^3.14.0",
"typescript": "^1.8.9",
"typemoq": "^0.3.2",
"vscode": "^0.11.0",
"gulp-json-editor": "^2.2.1"
"typescript": "^1.8.9",
"uglify-js": "mishoo/UglifyJS2#harmony",
"vscode": "^0.11.0"
},
"dependencies": {
"applicationinsights": "^0.15.0",
"body-parser": "^1.15.2",
"comment-json": "^1.1.3",
"copy-paste": "^1.3.0",
Expand All @@ -76,7 +79,6 @@
"tmp": "^0.0.28",
"underscore": "^1.8.3",
"vscode-extension-telemetry": "^0.0.5",
"applicationinsights": "^0.15.0",
"vscode-languageclient": "^2.5.0"
},
"contributes": {
Expand Down Expand Up @@ -108,14 +110,14 @@
"path": "./snippets/mssql.json"
}
],
"menus": {
"editor/context": [
{
"command": "extension.runQuery",
"when": "editorLangId == sql"
}
]
},
"menus": {
"editor/context": [
{
"command": "extension.runQuery",
"when": "editorLangId == sql"
}
]
},
"commands": [
{
"command": "extension.runQuery",
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/localWebService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default class LocalWebService {
private app = express();
static _servicePort: string;
static _vscodeExtensionPath: string;
static _htmlContentLocation = 'out/src/views/htmlcontent/src';
static _htmlContentLocation = 'out/src/views/htmlcontent';
static _staticContentPath: string;

constructor(extensionPath: string) {
Expand Down
2 changes: 1 addition & 1 deletion src/models/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const outputContentTypeEditorSelection = 'setEditorSelection';
export const outputContentTypeShowError = 'showError';
export const outputContentTypeShowWarning = 'showWarning';
export const outputServiceLocalhost = 'http://localhost:';
export const msgContentProviderSqlOutputHtml = 'sqlOutput.ejs';
export const msgContentProviderSqlOutputHtml = 'dist/html/sqlOutput.ejs';

export const configLogDebugInfo = 'logDebugInfo';
export const configMyConnections = 'connections';
Expand Down
4 changes: 0 additions & 4 deletions src/views/htmlcontent/src/app/libs/jquery-3.1.1.min.js

This file was deleted.

Loading

0 comments on commit 59e4ed7

Please sign in to comment.