Update compile pipeline and fix eslint (#16129)

* Update pipelines

* eslint

* Fix layering

* update tsec exemption
This commit is contained in:
Charles Gagnon
2021-07-14 14:43:23 -07:00
committed by GitHub
parent f7bf914bcb
commit 8faa0cf0e2
13 changed files with 54 additions and 62 deletions

View File

@@ -12,6 +12,8 @@
**/vscode-api-tests/testWorkspace2/**
**/extensions/**/out/**
**/extensions/**/build/**
**/big-data-cluster/src/bigDataCluster/controller/apiGenerated.ts
**/big-data-cluster/src/bigDataCluster/controller/clusterApiGenerated2.ts
**/extensions/markdown-language-features/media/**
**/extensions/markdown-language-features/notebook-out/**
**/extensions/typescript-basics/test/colorize-fixtures/**

View File

@@ -581,7 +581,9 @@
"iconv-lite-umd",
"jschardet",
"@angular/*",
"rxjs/**"
"rxjs/**",
"sanitize-html",
"ansi_up"
]
},
{
@@ -743,7 +745,6 @@
"html-query-plan",
"turndown",
"gridstack",
"gridstack/**",
"mark.js",
"vscode-textmate",
"vscode-oniguruma",

View File

@@ -79,19 +79,8 @@ steps:
- script: |
set -e
yarn sqllint
yarn gulp hygiene
yarn strict-vscode
yarn valid-layers-check
displayName: Run hygiene, eslint
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
- script: |
set -e
yarn gulp compile-build
yarn gulp compile-extensions-build
yarn gulp minify-vscode
displayName: Compile
yarn npm-run-all -lp core-ci extensions-ci hygiene eslint valid-layers-check sqllint strict-vscode
displayName: Compile & Hygiene
- script: |
set -e

View File

@@ -112,33 +112,33 @@ gulp.task(optimizeVSCodeTask);
// List of ADS extension XLF files that we want to put into the English resource folder.
const extensionsFilter = filter([
"**/admin-tool-ext-win.xlf",
"**/agent.xlf",
"**/arc.xlf",
"**/asde-deployment.xlf",
"**/azdata.xlf",
"**/azurecore.xlf",
"**/azurehybridtoolkit.xlf",
"**/big-data-cluster.xlf",
"**/cms.xlf",
"**/dacpac.xlf",
"**/data-workspace.xlf",
"**/import.xlf",
"**/kusto.xlf",
"**/machine-learning.xlf",
"**/Microsoft.sqlservernotebook.xlf",
"**/mssql.xlf",
"**/notebook.xlf",
"**/profiler.xlf",
"**/query-history.xlf",
"**/resource-deployment.xlf",
"**/schema-compare.xlf",
"**/server-report.xlf",
"**/sql-assessment.xlf",
"**/sql-database-projects.xlf",
"**/sql-migration.xlf",
"**/xml-language-features.xlf"
])
'**/admin-tool-ext-win.xlf',
'**/agent.xlf',
'**/arc.xlf',
'**/asde-deployment.xlf',
'**/azdata.xlf',
'**/azurecore.xlf',
'**/azurehybridtoolkit.xlf',
'**/big-data-cluster.xlf',
'**/cms.xlf',
'**/dacpac.xlf',
'**/data-workspace.xlf',
'**/import.xlf',
'**/kusto.xlf',
'**/machine-learning.xlf',
'**/Microsoft.sqlservernotebook.xlf',
'**/mssql.xlf',
'**/notebook.xlf',
'**/profiler.xlf',
'**/query-history.xlf',
'**/resource-deployment.xlf',
'**/schema-compare.xlf',
'**/server-report.xlf',
'**/sql-assessment.xlf',
'**/sql-database-projects.xlf',
'**/sql-migration.xlf',
'**/xml-language-features.xlf'
]);
// Copy ADS extension XLFs into English resource folder.
const importExtensionsTask = task.define('import-extensions-xlfs', function () {
@@ -149,7 +149,7 @@ const importExtensionsTask = task.define('import-extensions-xlfs', function () {
)
.pipe(vfs.dest(`./resources/xlf/en`));
});
gulp.task(importExtensionsTask)
gulp.task(importExtensionsTask);
// {{SQL CARBON EDIT}} end
const sourceMappingURLBase = `https://sqlopsbuilds.blob.core.windows.net/sourcemaps/${commit}`;
@@ -486,7 +486,7 @@ const vscodeTranslationsExport = task.define(
'vscode-translations-export',
task.series(
compileBuildTask,
compileLocalizationExtensionsBuildTask, // {{SQL CARBON EDIT}} now include all extensions in ADS, not just a subset. (replaces "compileExtensionsBuildTask" here).
compileLocalizationExtensionsBuildTask, // {{SQL CARBON EDIT}} now include all extensions in ADS, not just a subset. (replaces 'compileExtensionsBuildTask' here).
optimizeVSCodeTask,
function () {
const pathToMetadata = './out-vscode/nls.metadata.json';
@@ -501,7 +501,7 @@ const vscodeTranslationsExport = task.define(
}
)
);
gulp.task(vscodeTranslationsExport)
gulp.task(vscodeTranslationsExport);
// {{SQL CARBON EDIT}} Localization gulp task, runs vscodeTranslationsExport and imports a subset of the generated XLFs into the folder.
gulp.task(task.define(

View File

@@ -207,8 +207,7 @@ export class CellSelectionModel<T> implements Slick.SelectionModel<T, Array<Slic
let i = 0;
while (true) {
if (i++ > 10000) {
console.error('InsertIntoSelection infinite loop: Report this error on github');
break;
throw new Error('InsertIntoSelection infinite loop');
}
let shouldContinue = false;
for (let current of newRanges) {

View File

@@ -61,3 +61,8 @@ export interface INotebookSearchConfigurationProperties {
};
sortOrder: SearchSortOrder;
}
export const RESULTS_GRID_DEFAULTS = {
cellPadding: [5, 8, 4],
rowHeight: 24
};

View File

@@ -19,7 +19,7 @@ import { QueryResultsInput } from 'sql/workbench/common/editor/query/queryResult
import { QueryResultsView } from 'sql/workbench/contrib/query/browser/queryResultsView';
import { CancellationToken } from 'vs/base/common/cancellation';
import { IStorageService } from 'vs/platform/storage/common/storage';
import { RESULTS_GRID_DEFAULTS } from 'sql/workbench/contrib/query/common/resultsGrid.contribution';
import { RESULTS_GRID_DEFAULTS } from 'sql/workbench/common/constants';
export const TextCompareEditorVisible = new RawContextKey<boolean>('textCompareEditorVisible', false);

View File

@@ -7,13 +7,9 @@ import { Extensions, IConfigurationRegistry, IConfigurationNode } from 'vs/platf
import { Registry } from 'vs/platform/registry/common/platform';
import * as nls from 'vs/nls';
import * as editorOptions from 'vs/editor/common/config/editorOptions';
import { RESULTS_GRID_DEFAULTS } from 'sql/workbench/common/constants';
import EDITOR_FONT_DEFAULTS = editorOptions.EDITOR_FONT_DEFAULTS;
export const RESULTS_GRID_DEFAULTS = {
cellPadding: [5, 8, 4],
rowHeight: 24
};
const configurationRegistry = <IConfigurationRegistry>Registry.as(Extensions.Configuration);
const resultsGridConfiguration: IConfigurationNode = {

View File

@@ -3,7 +3,7 @@
| Distributed under the terms of the Modified BSD License.
|----------------------------------------------------------------------------*/
import * as widgets from 'sql/workbench/contrib/notebook/browser/outputs/widgets';
import * as widgets from 'sql/workbench/services/notebook/browser/outputs/widgets';
import { ImageMimeTypes } from 'sql/workbench/services/notebook/common/contracts';
import { IRenderMime } from './renderMimeInterfaces';

View File

@@ -14,7 +14,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
import { MouseWheelSupport } from 'sql/base/browser/ui/table/plugins/mousewheelTableScroll.plugin';
import { AutoColumnSize } from 'sql/base/browser/ui/table/plugins/autoSizeColumns.plugin';
import { AdditionalKeyBindings } from 'sql/base/browser/ui/table/plugins/additionalKeyBindings.plugin';
import { RESULTS_GRID_DEFAULTS } from 'sql/workbench/contrib/query/common/resultsGrid.contribution';
import { RESULTS_GRID_DEFAULTS } from 'sql/workbench/common/constants';
import { values } from 'vs/base/common/collections';
/**
@@ -58,10 +58,10 @@ export function renderDataResource(
let detailTable = new Table(tableContainer, {
dataProvider: tableResultsData, columns: columnsTransformed
}, {
rowHeight: RESULTS_GRID_DEFAULTS.rowHeight,
forceFitColumns: false,
defaultColumnWidth: 120
});
rowHeight: RESULTS_GRID_DEFAULTS.rowHeight,
forceFitColumns: false,
defaultColumnWidth: 120
});
detailTable.registerPlugin(rowNumberColumn);
detailTable.registerPlugin(new MouseWheelSupport());
detailTable.registerPlugin(new AutoColumnSize({ autoSizeOnRender: true }));

View File

@@ -6,7 +6,7 @@
import * as renderers from './renderers';
import { Deferred } from 'sql/base/common/promise';
import { ReadonlyJSONObject } from 'sql/workbench/services/notebook/common/jsonext';
import * as tableRenderers from 'sql/workbench/contrib/notebook/browser/outputs/tableRenderers';
import * as tableRenderers from 'sql/workbench/services/notebook/browser/outputs/tableRenderers';
import type { IRenderMime } from 'sql/workbench/services/notebook/browser/outputs/renderMimeInterfaces';
/**

View File

@@ -49,16 +49,16 @@
"sql/workbench/contrib/query/browser/queryResultsEditor.ts",
"sql/workbench/services/objectExplorer/browser/iconRenderer.ts",
"sql/workbench/services/resourceProvider/browser/firewallRuleDialog.ts",
"sql/workbench/services/notebook/browser/outputs/renderers.ts",
"sql/workbench/contrib/welcome/page/browser/welcomePage.ts",
"sql/workbench/contrib/editData/browser/editDataResultsEditor.ts",
"sql/workbench/contrib/jobManagement/browser/jobHistoryTree.ts",
"sql/workbench/contrib/notebook/browser/outputs/mimeRenderer.component.ts",
"sql/workbench/contrib/notebook/browser/outputs/markdownOutput.component.ts",
"sql/workbench/contrib/notebook/browser/outputs/renderers.ts",
"vs/base/parts/tree/browser/treeDefaults.ts"
],
"ban-script-content-assignments": [
"sql/workbench/contrib/notebook/browser/outputs/renderers.ts"
"sql/workbench/services/notebook/browser/outputs/renderers.ts"
],
"ban-domparser-parsefromstring": [
"sql/workbench/contrib/queryPlan/browser/planXmlParser.ts"