diff --git a/build/gulpfile.extensions.js b/build/gulpfile.extensions.js index 4f38911459..c03b0c4f0f 100644 --- a/build/gulpfile.extensions.js +++ b/build/gulpfile.extensions.js @@ -26,19 +26,9 @@ const ext = require('./lib/extensions'); const extensionsPath = path.join(path.dirname(__dirname), 'extensions'); -// {{SQL CARBON EDIT}} +// {{SQL CARBON EDIT}} - TODO: Import needs to be updated to work with langpacks. const sqlLocalizedExtensions = [ - 'admin-tool-ext-win', - 'agent', - 'cms', - 'dacpac', 'import', - 'machine-learning', - 'profiler', - 'schema-compare', - 'server-report', - 'sql-assessment', - 'sql-database-projects' ]; // {{SQL CARBON EDIT}} Not doing this for us right now diff --git a/extensions/admin-tool-ext-win/.vscodeignore b/extensions/admin-tool-ext-win/.vscodeignore index e5a5f0a51c..4e46104b9b 100644 --- a/extensions/admin-tool-ext-win/.vscodeignore +++ b/extensions/admin-tool-ext-win/.vscodeignore @@ -1,8 +1,9 @@ coverage -out/test -src +out/** +src/** +extension.webpack.config.js .gitignore coverConfig.json tsconfig.json -cgmanifest.json -.vscode +*.vsix +yarn.lock diff --git a/extensions/server-report/src/localizedConstants.ts b/extensions/admin-tool-ext-win/extension.webpack.config.js similarity index 68% rename from extensions/server-report/src/localizedConstants.ts rename to extensions/admin-tool-ext-win/extension.webpack.config.js index b50733f6a3..b63c59c65d 100644 --- a/extensions/server-report/src/localizedConstants.ts +++ b/extensions/admin-tool-ext-win/extension.webpack.config.js @@ -2,6 +2,16 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + +//@ts-check + 'use strict'; -export const msgErrorLoadingTab = 'An error occurred while loading the tab.'; +const withDefaults = require('../shared.webpack.config'); + +module.exports = withDefaults({ + context: __dirname, + entry: { + main: './src/main.ts' + } +}); diff --git a/extensions/admin-tool-ext-win/package.json b/extensions/admin-tool-ext-win/package.json index 01bc92c7f2..5efe3b5d59 100644 --- a/extensions/admin-tool-ext-win/package.json +++ b/extensions/admin-tool-ext-win/package.json @@ -93,7 +93,7 @@ "dependencies": { "@microsoft/ads-extension-telemetry": "^1.1.3", "service-downloader": "0.2.1", - "vscode-nls": "^3.2.1" + "vscode-nls": "^4.1.2" }, "devDependencies": { "@types/mocha": "^5.2.5", diff --git a/extensions/admin-tool-ext-win/yarn.lock b/extensions/admin-tool-ext-win/yarn.lock index fdd1cbfe4e..12a2022525 100644 --- a/extensions/admin-tool-ext-win/yarn.lock +++ b/extensions/admin-tool-ext-win/yarn.lock @@ -981,10 +981,10 @@ vscode-extension-telemetry@^0.1.6: dependencies: applicationinsights "1.7.4" -vscode-nls@^3.2.1: - version "3.2.5" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4" - integrity sha512-ITtoh3V4AkWXMmp3TB97vsMaHRgHhsSFPsUdzlueSL+dRZbSNTZeOmdQv60kjCV306ghPxhDeoNUEm3+EZMuyw== +vscode-nls@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167" + integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw== vscodetestcover@^1.1.0: version "1.1.0" diff --git a/extensions/agent/.vscodeignore b/extensions/agent/.vscodeignore index 3290f546de..3a5495419b 100644 --- a/extensions/agent/.vscodeignore +++ b/extensions/agent/.vscodeignore @@ -1,5 +1,9 @@ -src -out/test +src/** +out/** +extension.webpack.config.js +.gitignore tsconfig.json coverage coverConfig.json +*.vsix +yarn.lock diff --git a/extensions/agent/extension.webpack.config.js b/extensions/agent/extension.webpack.config.js new file mode 100644 index 0000000000..b63c59c65d --- /dev/null +++ b/extensions/agent/extension.webpack.config.js @@ -0,0 +1,17 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +//@ts-check + +'use strict'; + +const withDefaults = require('../shared.webpack.config'); + +module.exports = withDefaults({ + context: __dirname, + entry: { + main: './src/main.ts' + } +}); diff --git a/extensions/agent/package.json b/extensions/agent/package.json index 96d85eaea4..086ae25ae5 100644 --- a/extensions/agent/package.json +++ b/extensions/agent/package.json @@ -80,7 +80,7 @@ } }, "dependencies": { - "vscode-nls": "^3.2.1" + "vscode-nls": "^4.1.2" }, "devDependencies": { "@types/mocha": "^5.2.5", diff --git a/extensions/agent/yarn.lock b/extensions/agent/yarn.lock index 8232f2f760..a72594b85c 100644 --- a/extensions/agent/yarn.lock +++ b/extensions/agent/yarn.lock @@ -764,10 +764,10 @@ typemoq@^2.1.0: lodash "^4.17.4" postinstall-build "^5.0.1" -vscode-nls@^3.2.1: - version "3.2.5" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4" - integrity sha512-ITtoh3V4AkWXMmp3TB97vsMaHRgHhsSFPsUdzlueSL+dRZbSNTZeOmdQv60kjCV306ghPxhDeoNUEm3+EZMuyw== +vscode-nls@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167" + integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw== vscodetestcover@^1.1.0: version "1.1.0" diff --git a/extensions/cms/.vscodeignore b/extensions/cms/.vscodeignore index c349925fb5..703fe2c174 100644 --- a/extensions/cms/.vscodeignore +++ b/extensions/cms/.vscodeignore @@ -1,5 +1,9 @@ -out/test -src +out/** +src/** +extension.webpack.config.js +.gitignore tsconfig.json coverage coverConfig.json +*.vsix +yarn.lock diff --git a/extensions/cms/extension.webpack.config.js b/extensions/cms/extension.webpack.config.js new file mode 100644 index 0000000000..35b95ccffc --- /dev/null +++ b/extensions/cms/extension.webpack.config.js @@ -0,0 +1,17 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +//@ts-check + +'use strict'; + +const withDefaults = require('../shared.webpack.config'); + +module.exports = withDefaults({ + context: __dirname, + entry: { + extension: './src/extension.ts' + } +}); diff --git a/extensions/dacpac/.vscodeignore b/extensions/dacpac/.vscodeignore index de341d9b17..44fe8f3e7b 100644 --- a/extensions/dacpac/.vscodeignore +++ b/extensions/dacpac/.vscodeignore @@ -1,5 +1,9 @@ coverage -coverageConfig.json -src -out/test +coverConfig.json +src/** +out/** +extension.webpack.config.js +.gitignore tsconfig.json +*.vsix +yarn.lock diff --git a/extensions/dacpac/extension.webpack.config.js b/extensions/dacpac/extension.webpack.config.js new file mode 100644 index 0000000000..35b95ccffc --- /dev/null +++ b/extensions/dacpac/extension.webpack.config.js @@ -0,0 +1,17 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +//@ts-check + +'use strict'; + +const withDefaults = require('../shared.webpack.config'); + +module.exports = withDefaults({ + context: __dirname, + entry: { + extension: './src/extension.ts' + } +}); diff --git a/extensions/machine-learning/.vscodeignore b/extensions/machine-learning/.vscodeignore index 540efdf330..a8e9564a73 100644 --- a/extensions/machine-learning/.vscodeignore +++ b/extensions/machine-learning/.vscodeignore @@ -1,7 +1,11 @@ -src +src/** tsconfig.json python r_packages -out/test +out/** coverage coverConfig.json +extension.webpack.config.js +.gitignore +*.vsix +yarn.lock diff --git a/extensions/machine-learning/extension.webpack.config.js b/extensions/machine-learning/extension.webpack.config.js new file mode 100644 index 0000000000..b63c59c65d --- /dev/null +++ b/extensions/machine-learning/extension.webpack.config.js @@ -0,0 +1,17 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +//@ts-check + +'use strict'; + +const withDefaults = require('../shared.webpack.config'); + +module.exports = withDefaults({ + context: __dirname, + entry: { + main: './src/main.ts' + } +}); diff --git a/extensions/profiler/.vscodeignore b/extensions/profiler/.vscodeignore index 7f47d852aa..7719e433b3 100644 --- a/extensions/profiler/.vscodeignore +++ b/extensions/profiler/.vscodeignore @@ -1,2 +1,9 @@ src/** +out/** tsconfig.json +.gitignore +coverage +coverConfig.json +extension.webpack.config.js +*.vsix +yarn.lock diff --git a/extensions/profiler/extension.webpack.config.js b/extensions/profiler/extension.webpack.config.js new file mode 100644 index 0000000000..b63c59c65d --- /dev/null +++ b/extensions/profiler/extension.webpack.config.js @@ -0,0 +1,17 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +//@ts-check + +'use strict'; + +const withDefaults = require('../shared.webpack.config'); + +module.exports = withDefaults({ + context: __dirname, + entry: { + main: './src/main.ts' + } +}); diff --git a/extensions/profiler/package.json b/extensions/profiler/package.json index 77e631be42..99db03f29d 100644 --- a/extensions/profiler/package.json +++ b/extensions/profiler/package.json @@ -83,7 +83,7 @@ ] }, "dependencies": { - "vscode-nls": "^3.2.1" + "vscode-nls": "^4.1.2" }, "devDependencies": { }, "__metadata": { diff --git a/extensions/profiler/yarn.lock b/extensions/profiler/yarn.lock index 45f8b9278d..2c3a6ce5b6 100644 --- a/extensions/profiler/yarn.lock +++ b/extensions/profiler/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -vscode-nls@^3.2.1: - version "3.2.5" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4" - integrity sha512-ITtoh3V4AkWXMmp3TB97vsMaHRgHhsSFPsUdzlueSL+dRZbSNTZeOmdQv60kjCV306ghPxhDeoNUEm3+EZMuyw== +vscode-nls@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167" + integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw== diff --git a/extensions/query-history/.vscodeignore b/extensions/query-history/.vscodeignore index 2173b21bcf..0d465c5bf7 100644 --- a/extensions/query-history/.vscodeignore +++ b/extensions/query-history/.vscodeignore @@ -1,5 +1,7 @@ src/** +out/** .gitignore tsconfig.json -cgmanifest.json -.vscode +extension.webpack.config.js +*.vsix +yarn.lock diff --git a/extensions/query-history/extension.webpack.config.js b/extensions/query-history/extension.webpack.config.js new file mode 100644 index 0000000000..b63c59c65d --- /dev/null +++ b/extensions/query-history/extension.webpack.config.js @@ -0,0 +1,17 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +//@ts-check + +'use strict'; + +const withDefaults = require('../shared.webpack.config'); + +module.exports = withDefaults({ + context: __dirname, + entry: { + main: './src/main.ts' + } +}); diff --git a/extensions/resource-deployment/.vscodeignore b/extensions/resource-deployment/.vscodeignore index bf25fcd96d..1704425381 100644 --- a/extensions/resource-deployment/.vscodeignore +++ b/extensions/resource-deployment/.vscodeignore @@ -1,4 +1,4 @@ -coverageConfig.json +coverConfig.json coverage out src diff --git a/extensions/schema-compare/.vscodeignore b/extensions/schema-compare/.vscodeignore index 3290f546de..770c782593 100644 --- a/extensions/schema-compare/.vscodeignore +++ b/extensions/schema-compare/.vscodeignore @@ -1,5 +1,9 @@ -src -out/test +.gitignore +src/** +out/** +extension.webpack.config.js tsconfig.json -coverage +yarn.lock coverConfig.json +*.vsix +coverage diff --git a/extensions/schema-compare/extension.webpack.config.js b/extensions/schema-compare/extension.webpack.config.js new file mode 100644 index 0000000000..35b95ccffc --- /dev/null +++ b/extensions/schema-compare/extension.webpack.config.js @@ -0,0 +1,17 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +//@ts-check + +'use strict'; + +const withDefaults = require('../shared.webpack.config'); + +module.exports = withDefaults({ + context: __dirname, + entry: { + extension: './src/extension.ts' + } +}); diff --git a/extensions/server-report/.vscodeignore b/extensions/server-report/.vscodeignore index 2e5248ad27..28020bd5b4 100644 --- a/extensions/server-report/.vscodeignore +++ b/extensions/server-report/.vscodeignore @@ -1,6 +1,7 @@ *.vsix src/** .gitignore -**/*.ts -**/*.map -.gitignore +out/** +tsconfig.json +extension.webpack.config.js +yarn.lock diff --git a/extensions/server-report/extension.webpack.config.js b/extensions/server-report/extension.webpack.config.js new file mode 100644 index 0000000000..35b95ccffc --- /dev/null +++ b/extensions/server-report/extension.webpack.config.js @@ -0,0 +1,17 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +//@ts-check + +'use strict'; + +const withDefaults = require('../shared.webpack.config'); + +module.exports = withDefaults({ + context: __dirname, + entry: { + extension: './src/extension.ts' + } +}); diff --git a/extensions/server-report/package.json b/extensions/server-report/package.json index 82a8f5b8f8..0295197c16 100644 --- a/extensions/server-report/package.json +++ b/extensions/server-report/package.json @@ -26,32 +26,32 @@ "command": "tempdb.startEvent", "title": "Start", "icon": { - "light": "./out/media/launch.svg", - "dark": "./out/media/launch_inverse.svg" + "light": "./dist/media/launch.svg", + "dark": "./dist/media/launch_inverse.svg" } }, { "command": "tempdb.stopEvent", "title": "Stop", "icon": { - "light": "./out/media/blocker.svg", - "dark": "./out/media/blocker_inverse.svg" + "light": "./dist/media/blocker.svg", + "dark": "./dist/media/blocker_inverse.svg" } }, { "command": "tempdb.contention", "title": "Contention Help for Tempdb", "icon": { - "light": "./out/media/documentation.svg", - "dark": "./out/media/documentation_inverse.svg" + "light": "./dist/media/documentation.svg", + "dark": "./dist/media/documentation_inverse.svg" } }, { "command": "tempdb.pauseEvent", "title": "Toggle Auto Refresh", "icon": { - "light": "./out/media/insights.svg", - "dark": "./out/media/insights_inverse.svg" + "light": "./dist/media/insights.svg", + "dark": "./dist/media/insights_inverse.svg" } } ], @@ -71,8 +71,8 @@ "id": "server-reports-monitoring", "title": "Monitor", "icon": { - "light": "./out/media/monitor.svg", - "dark": "./out/media/monitor_inverse.svg" + "light": "./dist/media/monitor.svg", + "dark": "./dist/media/monitor_inverse.svg" }, "container": { "server-reports-monitoring-container": {} @@ -82,8 +82,8 @@ "id": "server-reports-performance", "title": "Performance", "icon": { - "light": "./out/media/performance.svg", - "dark": "./out/media/performance_inverse.svg" + "light": "./dist/media/performance.svg", + "dark": "./dist/media/performance_inverse.svg" }, "container": { "server-reports-performance-container": {} @@ -98,8 +98,8 @@ "group": "monitoring", "description": "TempDB reports", "icon": { - "light": "./out/media/tempdb.svg", - "dark": "./out/media/tempdb_inverse.svg" + "light": "./dist/media/tempdb.svg", + "dark": "./dist/media/tempdb_inverse.svg" }, "container": { "server-reports-tempdb-container": {} @@ -119,7 +119,7 @@ "columnsAsLabels": true } }, - "queryFile": "./out/sql/all_db_space_used.sql" + "queryFile": "./dist/sql/all_db_space_used.sql" } }, { @@ -134,7 +134,7 @@ "columnsAsLabels": false } }, - "queryFile": "./out/sql/cpumetric.sql" + "queryFile": "./dist/sql/cpumetric.sql" } }, { @@ -150,7 +150,7 @@ "columnsAsLabels": false } }, - "queryFile": "./out/sql/backup_size_trend.sql" + "queryFile": "./dist/sql/backup_size_trend.sql" } }, { @@ -165,9 +165,9 @@ "columnsAsLabels": true } }, - "queryFile": "./out/sql/waits_paul_randal.sql", + "queryFile": "./dist/sql/waits_paul_randal.sql", "details": { - "queryFile": "./out/sql/waits_detail_paul_randal.sql", + "queryFile": "./dist/sql/waits_detail_paul_randal.sql", "label": { "column": "WaitType", "state": [] @@ -188,9 +188,9 @@ "columnsAsLabels": true } }, - "queryFile": "./out/sql/wait_resources.sql", + "queryFile": "./dist/sql/wait_resources.sql", "details": { - "queryFile": "./out/sql/wait_resources.sql", + "queryFile": "./dist/sql/wait_resources.sql", "label": { "column": "WaitType", "state": [] @@ -211,7 +211,7 @@ "columnsAsLabels": true } }, - "queryFile": "./out/sql/memorybydb.sql" + "queryFile": "./dist/sql/memorybydb.sql" } }, { @@ -225,7 +225,7 @@ "legendPosition": "none" } }, - "queryFile": "./out/sql/typeofContentions.sql", + "queryFile": "./dist/sql/typeofContentions.sql", "autoRefreshInterval": 0.05 } }, @@ -241,7 +241,7 @@ "xAxisLabel": "Object Ids for System Tables" } }, - "queryFile": "./out/sql/metadataContention.sql", + "queryFile": "./dist/sql/metadataContention.sql", "autoRefreshInterval": 0.05 } }, @@ -257,7 +257,7 @@ "xAxisLabel": "Page Types" } }, - "queryFile": "./out/sql/allocationContention.sql", + "queryFile": "./dist/sql/allocationContention.sql", "autoRefreshInterval": 0.05 } } @@ -380,7 +380,6 @@ }, "dependencies": { "fs-extra": "^8.1.0", - "handlebars": "^4.7.7", "openurl": "^1.1.1", "vscode-nls": "^5.0.0" }, diff --git a/extensions/server-report/src/resources/templateTab.html b/extensions/server-report/src/resources/templateTab.html deleted file mode 100644 index d4f7bf5f0e..0000000000 --- a/extensions/server-report/src/resources/templateTab.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/extensions/server-report/src/utils.ts b/extensions/server-report/src/utils.ts index f371a67688..2f419a8efb 100644 --- a/extensions/server-report/src/utils.ts +++ b/extensions/server-report/src/utils.ts @@ -5,11 +5,7 @@ 'use strict'; import * as vscode from 'vscode'; -import * as path from 'path'; -import * as fs from 'fs-extra'; -import * as handlebars from 'handlebars'; import * as Constants from './constants'; -import * as LocalizedConstants from './localizedConstants'; /** * Helper to log messages to the developer console if enabled @@ -24,23 +20,3 @@ export function logDebug(msg: any): void { console.log(outputMsg); } } - -export function renderTemplateHtml(extensionPath: string, templateName: string, templateValues: object): Thenable { - let templatePath = path.join(extensionPath, 'resources', templateName); - - // 1) Read the template from the disk - // 2) Compile it as a handlebars template and render the HTML - // 3) On failure, return a simple string as an error - return fs.readFile(templatePath, 'utf-8') - .then(templateText => { - let template = handlebars.compile(templateText); - return template(templateValues); - }) - .then( - undefined, - error => { - logDebug(error); - return LocalizedConstants.msgErrorLoadingTab; - } - ); -} diff --git a/extensions/server-report/yarn.lock b/extensions/server-report/yarn.lock index 09dee94366..c8392ac5c1 100644 --- a/extensions/server-report/yarn.lock +++ b/extensions/server-report/yarn.lock @@ -14,11 +14,6 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18" integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw== -commander@~2.20.3: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -33,18 +28,6 @@ graceful-fs@^4.1.6, graceful-fs@^4.2.0: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== -handlebars@^4.7.7: - version "4.7.7" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" - integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== - dependencies: - minimist "^1.2.5" - neo-async "^2.6.0" - source-map "^0.6.1" - wordwrap "^1.0.0" - optionalDependencies: - uglify-js "^3.1.4" - jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -52,33 +35,11 @@ jsonfile@^4.0.0: optionalDependencies: graceful-fs "^4.1.6" -minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== - -neo-async@^2.6.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" - integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== - openurl@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/openurl/-/openurl-1.1.1.tgz#3875b4b0ef7a52c156f0db41d4609dbb0f94b387" integrity sha1-OHW0sO96UsFW8NtB1GCduw+Us4c= -source-map@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -uglify-js@^3.1.4: - version "3.9.1" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.9.1.tgz#a56a71c8caa2d36b5556cc1fd57df01ae3491539" - integrity sha512-JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA== - dependencies: - commander "~2.20.3" - universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -88,8 +49,3 @@ vscode-nls@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840" integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA== - -wordwrap@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= diff --git a/extensions/sql-assessment/.gitignore b/extensions/sql-assessment/.gitignore new file mode 100644 index 0000000000..dfacd4d5b4 --- /dev/null +++ b/extensions/sql-assessment/.gitignore @@ -0,0 +1 @@ +*.vsix \ No newline at end of file diff --git a/extensions/sql-assessment/.vscodeignore b/extensions/sql-assessment/.vscodeignore new file mode 100644 index 0000000000..28020bd5b4 --- /dev/null +++ b/extensions/sql-assessment/.vscodeignore @@ -0,0 +1,7 @@ +*.vsix +src/** +.gitignore +out/** +tsconfig.json +extension.webpack.config.js +yarn.lock diff --git a/extensions/sql-assessment/extension.webpack.config.js b/extensions/sql-assessment/extension.webpack.config.js new file mode 100644 index 0000000000..b63c59c65d --- /dev/null +++ b/extensions/sql-assessment/extension.webpack.config.js @@ -0,0 +1,17 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +//@ts-check + +'use strict'; + +const withDefaults = require('../shared.webpack.config'); + +module.exports = withDefaults({ + context: __dirname, + entry: { + main: './src/main.ts' + } +}); diff --git a/extensions/sql-assessment/package.json b/extensions/sql-assessment/package.json index c5b9ed3049..a1cb8add1c 100644 --- a/extensions/sql-assessment/package.json +++ b/extensions/sql-assessment/package.json @@ -38,7 +38,7 @@ ] }, "dependencies": { - "vscode-nls": "^3.2.1", + "vscode-nls": "^4.1.2", "@microsoft/ads-extension-telemetry": "^1.1.3", "vscode-languageclient": "^5.3.0-next.1" }, diff --git a/extensions/sql-assessment/yarn.lock b/extensions/sql-assessment/yarn.lock index b917abf46a..4d80cf4a77 100644 --- a/extensions/sql-assessment/yarn.lock +++ b/extensions/sql-assessment/yarn.lock @@ -123,7 +123,7 @@ vscode-languageserver-types@3.15.1: resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz#17be71d78d2f6236d414f0001ce1ef4d23e6b6de" integrity sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ== -vscode-nls@^3.2.1: - version "3.2.5" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4" - integrity sha512-ITtoh3V4AkWXMmp3TB97vsMaHRgHhsSFPsUdzlueSL+dRZbSNTZeOmdQv60kjCV306ghPxhDeoNUEm3+EZMuyw== +vscode-nls@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167" + integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw== diff --git a/extensions/sql-database-projects/.vscodeignore b/extensions/sql-database-projects/.vscodeignore index 7f47d852aa..7719e433b3 100644 --- a/extensions/sql-database-projects/.vscodeignore +++ b/extensions/sql-database-projects/.vscodeignore @@ -1,2 +1,9 @@ src/** +out/** tsconfig.json +.gitignore +coverage +coverConfig.json +extension.webpack.config.js +*.vsix +yarn.lock diff --git a/extensions/sql-database-projects/extension.webpack.config.js b/extensions/sql-database-projects/extension.webpack.config.js new file mode 100644 index 0000000000..35b95ccffc --- /dev/null +++ b/extensions/sql-database-projects/extension.webpack.config.js @@ -0,0 +1,17 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +//@ts-check + +'use strict'; + +const withDefaults = require('../shared.webpack.config'); + +module.exports = withDefaults({ + context: __dirname, + entry: { + extension: './src/extension.ts' + } +}); diff --git a/extensions/sql-database-projects/package.json b/extensions/sql-database-projects/package.json index 407a9e52ea..a0192475d7 100644 --- a/extensions/sql-database-projects/package.json +++ b/extensions/sql-database-projects/package.json @@ -373,7 +373,7 @@ "fast-glob": "^3.1.0", "promisify-child-process": "^3.1.1", "vscode-languageclient": "^5.3.0-next.1", - "vscode-nls": "^3.2.1", + "vscode-nls": "^4.1.2", "xml-formatter": "^2.1.0", "xmldom": "^0.3.0" }, diff --git a/extensions/sql-database-projects/yarn.lock b/extensions/sql-database-projects/yarn.lock index caeb92ca3a..3ebcf69f3b 100644 --- a/extensions/sql-database-projects/yarn.lock +++ b/extensions/sql-database-projects/yarn.lock @@ -1208,10 +1208,10 @@ vscode-languageserver-types@3.15.1: resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz#17be71d78d2f6236d414f0001ce1ef4d23e6b6de" integrity sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ== -vscode-nls@^3.2.1: - version "3.2.5" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4" - integrity sha512-ITtoh3V4AkWXMmp3TB97vsMaHRgHhsSFPsUdzlueSL+dRZbSNTZeOmdQv60kjCV306ghPxhDeoNUEm3+EZMuyw== +vscode-nls@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167" + integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw== vscodetestcover@^1.1.0: version "1.1.0" diff --git a/extensions/sql-migration/.gitignore b/extensions/sql-migration/.gitignore new file mode 100644 index 0000000000..dfacd4d5b4 --- /dev/null +++ b/extensions/sql-migration/.gitignore @@ -0,0 +1 @@ +*.vsix \ No newline at end of file diff --git a/extensions/sql-migration/.vscodeignore b/extensions/sql-migration/.vscodeignore index f8160b9539..40e678b577 100644 --- a/extensions/sql-migration/.vscodeignore +++ b/extensions/sql-migration/.vscodeignore @@ -1,3 +1,9 @@ src/** +out/** tsconfig.json images/ADSMigration.gif +tsconfig.json +extension.webpack.config.js +.gitignore +*.vsix +yarn.lock diff --git a/extensions/sql-migration/extension.webpack.config.js b/extensions/sql-migration/extension.webpack.config.js new file mode 100644 index 0000000000..b63c59c65d --- /dev/null +++ b/extensions/sql-migration/extension.webpack.config.js @@ -0,0 +1,17 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +//@ts-check + +'use strict'; + +const withDefaults = require('../shared.webpack.config'); + +module.exports = withDefaults({ + context: __dirname, + entry: { + main: './src/main.ts' + } +}); diff --git a/extensions/sql-migration/package.json b/extensions/sql-migration/package.json index 303a4697d8..e8fbb62685 100644 --- a/extensions/sql-migration/package.json +++ b/extensions/sql-migration/package.json @@ -89,7 +89,7 @@ }, "dependencies": { "@microsoft/ads-extension-telemetry": "^1.1.3", - "vscode-nls": "^3.2.1" + "vscode-nls": "^4.1.2" }, "__metadata": { "publisherDisplayName": "Microsoft", diff --git a/extensions/sql-migration/yarn.lock b/extensions/sql-migration/yarn.lock index 0ff038d7e8..01ce252d21 100644 --- a/extensions/sql-migration/yarn.lock +++ b/extensions/sql-migration/yarn.lock @@ -92,7 +92,7 @@ vscode-extension-telemetry@^0.1.6: dependencies: applicationinsights "1.7.4" -vscode-nls@^3.2.1: - version "3.2.5" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4" - integrity sha512-ITtoh3V4AkWXMmp3TB97vsMaHRgHhsSFPsUdzlueSL+dRZbSNTZeOmdQv60kjCV306ghPxhDeoNUEm3+EZMuyw== +vscode-nls@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167" + integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==