Merge branch 'main' into benjin/multipleConnectionBug

Author: Benjin

.github/workflows/file-size-check.yml

@@ -77,24 +77,6 @@ jobs:
           echo "webview_bundle_percentage_change=$percentage_change" >> $GITHUB_ENV
           webview_text_color=$(if [ $percentage_change -gt 0 ]; then echo "red"; else echo "green"; fi)
           echo "webview_text_color=$webview_text_color" >> $GITHUB_ENV
-          main_js_file=$(find ./main/out/src/reactviews/assets -name "*.js")
-          pr_js_file=$(find ./pr/out/src/reactviews/assets -name "*.js")
-          main_js_size=$(stat -c%s "$main_js_file")
-          pr_js_size=$(stat -c%s "$pr_js_file")
-          main_js_size=$((main_js_size / 1024))
-          pr_js_size=$((pr_js_size / 1024))
-          js_size_diff=$((pr_js_size - main_js_size))
-          js_percentage_change=$((100 * js_size_diff / main_js_size))
-          echo "Main branch JS bundle size: $main_js_size KB"
-          echo "PR branch JS bundle size: $pr_js_size KB"
-          echo "JS Size difference: $js_size_diff bytes"
-          echo "JS Percentage change: $js_percentage_change%"
-          echo "main_js_size=$main_js_size" >> $GITHUB_ENV
-          echo "pr_js_size=$pr_js_size" >> $GITHUB_ENV
-          echo "js_size_diff=$js_size_diff" >> $GITHUB_ENV
-          echo "js_percentage_change=$js_percentage_change" >> $GITHUB_ENV
-          js_text_color=$(if [ $js_percentage_change -gt 0 ]; then echo "red"; else echo "green"; fi)
-          echo "js_text_color=$js_text_color" >> $GITHUB_ENV
 
       - name: Calculate vsix file sizes
         run: |
@@ -127,10 +109,6 @@ jobs:
           echo "- **Main branch bundle size**: ${{ env.main_webview_bundle_size }} KB" >> results.md
           echo "- **PR branch bundle size**: ${{ env.pr_webview_bundle_size }} KB" >> results.md
           echo "- **Size difference**: ${{ '\$\${\color{' }}${{env.webview_text_color}}}  ${{ env.webview_size_diff }} KB \space (${{ env.webview_bundle_percentage_change }}\\\\%)  ${{ '}\$\$' }}  " >> results.md
-          echo "### React Webview JS Size Comparison" >> results.md
-          echo "- **Main branch JS size**: ${{ env.main_js_size }} KB" >> results.md
-          echo "- **PR branch JS size**: ${{ env.pr_js_size }} KB" >> results.md
-          echo "- **Size difference**: ${{ '\$\${\color{' }}${{env.js_text_color}}}  ${{ env.js_size_diff }} KB \space (${{ env.js_percentage_change }}\\\\%)  ${{ '}\$\$' }}  " >> results.md
 
       - name: Find comment
         uses: peter-evans/find-comment@v3
@@ -166,10 +144,6 @@ jobs:
         if: ${{ env.webview_bundle_percentage_change > 5 }}
         run: exit 1
 
-      - name: Fail if JS bundle size is increased by 5%
-        if: ${{ env.js_percentage_change > 5 }}
-        run: exit 1
-
 
 
 

.vscodeignore

@@ -5,6 +5,7 @@ coverage
 coverage-remapped
 lib
 localization
+! localization/l10n
 out/test
 packages
 samples

gulpfile.js

@@ -8,7 +8,6 @@ const config = require('./tasks/config');
 const concat = require('gulp-concat');
 const minifier = require('gulp-uglify/minifier');
 const uglifyjs = require('uglify-js');
-const nls = require('vscode-nls-dev');
 const argv = require('yargs').argv;
 const min = (argv.min === undefined) ? false : true;
 const prod = (argv.prod === undefined) ? false : true;
@@ -162,23 +161,7 @@ async function generateExtensionBundle() {
 	await ctx.dispose();
 }
 
-function transformExtensionLocalization(patterns) {
-	return gulp.src(patterns)
-		.pipe(nls.rewriteLocalizeCalls())
-		.pipe(nls.createAdditionalLanguageFiles(nls.coreLanguages, config.paths.project.root + '/localization/i18n', undefined, false))
-		.pipe(srcmap.write('.', { includeContent: false, sourceRoot: '../src' }))
-		.pipe(gulp.dest('out/src/'));
-}
-
-gulp.task('ext:bundle-src', gulp.series(generateExtensionBundle, () => transformExtensionLocalization(
-	[
-		'out/src/extension.js',
-		'out/src/languageService/serviceInstallerUtil.js',
-		'out/src/telemetry/telemetryInterfaces.js',
-		'out/src/protocol.js',
-		'out/src/models/interfaces.js'
-	]
-)));
+gulp.task('ext:bundle-src', gulp.series(generateExtensionBundle));
 
 gulp.task('ext:compile-src', (done) => {
 	return gulp.src([
@@ -194,21 +177,17 @@ gulp.task('ext:compile-src', (done) => {
 				process.exit(1);
 			}
 		})
-		.pipe(nls.rewriteLocalizeCalls())
-		.pipe(nls.createAdditionalLanguageFiles(nls.coreLanguages, config.paths.project.root + '/localization/i18n', undefined, false))
 		.pipe(srcmap.write('.', { includeContent: false, sourceRoot: '../src' }))
 		.pipe(gulp.dest('out/src/'));
 });
 
 // Compile angular view
 gulp.task('ext:compile-view', (done) => {
-	return gulp.src([
+return gulp.src([
 		config.paths.project.root + '/src/views/htmlcontent/**/*.ts',
 		config.paths.project.root + '/typings/**/*.d.ts'])
 		.pipe(srcmap.init())
 		.pipe(tsProject())
-		.pipe(nls.rewriteLocalizeCalls())
-		.pipe(nls.createAdditionalLanguageFiles(nls.coreLanguages, config.paths.project.root + '/localization/i18n', undefined, false))
 		.pipe(srcmap.write('.', { includeContent: false, sourceRoot: '../src' }))
 		.pipe(gulp.dest('out/src/views/htmlcontent'));
 });
@@ -220,7 +199,10 @@ async function generateReactWebviewsBundle() {
 		 * for each entry point, to be used by the webview's HTML content.
 		 */
 		entryPoints: {
-			mssqlwebview: 'src/reactviews/index.tsx'
+			'connectionDialog': 'src/reactviews/pages/ConnectionDialog/index.tsx',
+			'executionPlan': 'src/reactviews/pages/ExecutionPlan/index.tsx',
+			'tableDesigner': 'src/reactviews/pages/TableDesigner/index.tsx',
+			'objectExplorerFilter': 'src/reactviews/pages/ObjectExplorerFilter/index.tsx',
 		},
 		bundle: true,
 		outdir: 'out/src/reactviews/assets',
@@ -240,35 +222,32 @@ async function generateReactWebviewsBundle() {
 			typecheckPlugin()
 		],
 		sourcemap: prod ? false : 'inline',
-		metafile: !prod,
+		metafile: true,
 		minify: prod,
 		minifyWhitespace: prod,
 		minifyIdentifiers: prod,
+		format: 'esm',
+		splitting: true,
 	});
 
 	const result = await ctx.rebuild();
 
-	if (!prod) {
-		/**
-		 * Generating esbuild metafile for webviews. You can analyze the metafile https://esbuild.github.io/analyze/
-		 * to see the bundle size and other details.
-		 */
-		const fs = require('fs').promises;
-		if (result.metafile) {
-			await fs.writeFile('./webviews-metafile.json', JSON.stringify(result.metafile));
-		}
+	/**
+	 * Generating esbuild metafile for webviews. You can analyze the metafile https://esbuild.github.io/analyze/
+	 * to see the bundle size and other details.
+	 */
+	const fs = require('fs').promises;
+	if (result.metafile) {
+		await fs.writeFile('./webviews-metafile.json', JSON.stringify(result.metafile));
 	}
 
+
 	await ctx.dispose();
 }
 
 // Compile react views
 gulp.task('ext:compile-reactviews',
-	gulp.series(generateReactWebviewsBundle, function transformReactWebviewsLocalization() {
-		return transformExtensionLocalization([
-			'out/react-webviews/assets/*.js',
-		])
-	})
+	gulp.series(generateReactWebviewsBundle)
 );
 
 
@@ -419,9 +398,7 @@ gulp.task('ext:copy-js', () => {
 // Copy the files which aren't used in compilation
 gulp.task('ext:copy', gulp.series('ext:copy-tests', 'ext:copy-js', 'ext:copy-config', 'ext:copy-systemjs-config', 'ext:copy-dependencies', 'ext:copy-html', 'ext:copy-css', 'ext:copy-images'));
 
-gulp.task('ext:localization', gulp.series('ext:localization:generate-eng-package.nls', 'ext:localization:xliff-to-ts', 'ext:localization:xliff-to-json', 'ext:localization:xliff-to-package.nls'));
-
-gulp.task('ext:build', gulp.series('ext:localization', 'ext:copy', 'ext:clean-library-ts-files', 'ext:compile', 'ext:compile-view', 'ext:compile-reactviews')); // removed lint before copy
+gulp.task('ext:build', gulp.series('ext:generate-runtime-localization-files', 'ext:copy', 'ext:clean-library-ts-files', 'ext:compile', 'ext:compile-view', 'ext:compile-reactviews')); // removed lint before copy
 
 gulp.task('ext:test', async () => {
 	let workspace = process.env['WORKSPACE'];