Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build on node 18 #163334

Closed
wants to merge 179 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
179 commits
Select commit Hold shift + click to select a range
18828cb
fix: yellow warning
milahu Oct 11, 2022
116f89b
update all dependencies
milahu Oct 11, 2022
d90e38c
update all lockfiles
milahu Oct 11, 2022
175cf15
fix TS1452
milahu Oct 11, 2022
60659a2
fix TS1192
milahu Oct 11, 2022
b370470
fix TS7016
milahu Oct 11, 2022
b5b8f66
fix TS2339: Property 'lookup' does not exist on type 'Mime'.
milahu Oct 11, 2022
fd601e7
fix TS2345:: update API makeUniversalApp
milahu Oct 11, 2022
7b964d8
fix TS2345: argument type
milahu Oct 11, 2022
3d6d3ed
fix TS2349: import fancyLog
milahu Oct 11, 2022
dfc5ef4
fix TS2349: import rename
milahu Oct 11, 2022
23c10bc
downgrade got to 11.8.5
milahu Oct 11, 2022
ca4349b
downgrade got to 11.8.5 lockfile
milahu Oct 11, 2022
d3cd3b0
Argument of type '(p: ParsedPath) => string' is not assignable to par…
milahu Oct 11, 2022
9b41c5b
update-lockfile
milahu Oct 11, 2022
2aa216c
fix TS2345: Argument of type 'Dependency' is not assignable to parame…
milahu Oct 11, 2022
a6b5905
fix TS2345: Argument of type 'string' is not assignable to parameter …
milahu Oct 11, 2022
b9e205b
fix TS2345: Argument of type 'string | null' is not assignable to par…
milahu Oct 11, 2022
eba97ad
add source-map-sync
milahu Oct 11, 2022
e4222b1
add source-map-sync lockfile
milahu Oct 11, 2022
e95925b
use source-map-sync
milahu Oct 11, 2022
5f529e9
fix: TS2345: Argument of type 'NullablePosition' is not assignable to…
milahu Oct 11, 2022
44c0a4c
fix TS1479: downgrade to node-fetch 2
milahu Oct 11, 2022
2f4f0f7
downgrade to node-fetch 2 lockfile
milahu Oct 11, 2022
7dd792e
fix: TS2345: Argument of type 'Policy' is not assignable to parameter…
milahu Oct 11, 2022
480c3d2
fix: TS2322: Type 'string' is not assignable to type 'number'.
milahu Oct 11, 2022
d2088d7
fix: TS2741: Property 'file' is missing in type '{ version: number; n…
milahu Oct 11, 2022
6388e8b
update build
milahu Oct 11, 2022
6d3139c
update lockfile
milahu Oct 11, 2022
3372376
pin got in resolutions
milahu Oct 11, 2022
5306cff
pin node-fetch in resolutions
milahu Oct 11, 2022
7e2a0a6
downgrade p-all to ^3.0.0
milahu Oct 11, 2022
f3b29d9
update lockfile
milahu Oct 11, 2022
40f7411
downgrade p-all to ^3.0.0
milahu Oct 11, 2022
7337bd5
update lockfile
milahu Oct 11, 2022
9149833
fix import: fancy-log
milahu Oct 11, 2022
bf5b1bc
update build
milahu Oct 11, 2022
c179c86
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
4780e13
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
e7e5658
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
171d593
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
0c9f707
fix TS2351: This expression is not constructable.
milahu Oct 11, 2022
3ea6e3e
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
8fe4ce1
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
8ff1edf
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
a5ffe19
fix error TS2351: This expression is not constructable.
milahu Oct 11, 2022
7c2d018
fix error TS2351: This expression is not constructable.
milahu Oct 11, 2022
a126dcd
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
3fb994d
fix error TS2351: This expression is not constructable.
milahu Oct 11, 2022
6e44a19
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
5caf963
fix error TS2351: This expression is not constructable.
milahu Oct 11, 2022
bab294d
fix error TS2507: Type 'typeof File' is not a constructor function type.
milahu Oct 11, 2022
85d4df7
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
582f7e2
fix error TS2351: This expression is not constructable.
milahu Oct 11, 2022
8a1c8d1
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
5aea885
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
4906117
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
a4d2eef
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
798f980
fix error TS2351: This expression is not constructable.
milahu Oct 11, 2022
014fdcd
fix error TS2351: This expression is not constructable.
milahu Oct 11, 2022
2ff5dd7
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
c06e7d8
fix error TS2351: This expression is not constructable.
milahu Oct 11, 2022
e569815
fix error TS2351: This expression is not constructable.
milahu Oct 11, 2022
e558c80
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
7f64bb1
fix error TS2507: Type 'typeof File' is not a constructor function type.
milahu Oct 11, 2022
da3c2c5
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
bea0d5f
fix error TS2351: This expression is not constructable.
milahu Oct 11, 2022
e7eba5f
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
4e8b3f1
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
dd2770b
fix error TS2349: This expression is not callable.
milahu Oct 11, 2022
9a12d8d
enable esModuleInterop
milahu Oct 11, 2022
99eed47
update build
milahu Oct 11, 2022
db23dcf
error TS2694: Namespace 'MarkdownIt' has no exported member 'Token'.
milahu Oct 11, 2022
17253a5
fix error TS2345: Argument of type 'Node | undefined' is not assignab…
milahu Oct 11, 2022
b8cff76
fix error TS2351: This expression is not constructable.
milahu Oct 11, 2022
80c0b88
fix error TS2345: Argument of type 'Token[] | null' is not assignable…
milahu Oct 11, 2022
eb531db
enable esModuleInterop
milahu Oct 11, 2022
1f3592b
parse5 -> parse5-sax-parser
milahu Oct 11, 2022
3796e19
update lockfile
milahu Oct 11, 2022
b036b48
update lockfile
milahu Oct 11, 2022
b4cf3cb
update lockfile
milahu Oct 11, 2022
e062ffa
update lockfile
milahu Oct 11, 2022
2e8d353
update lockfile
milahu Oct 11, 2022
1d0bd73
update lockfile
milahu Oct 11, 2022
c3a27c0
yarn upgrade --latest
milahu Oct 11, 2022
152596c
yarn upgrade --latest
milahu Oct 11, 2022
8c6c758
update lockfile
milahu Oct 11, 2022
7734e9e
update lockfile
milahu Oct 11, 2022
c48b939
update lockfile
milahu Oct 11, 2022
f06e83e
update lockfile
milahu Oct 11, 2022
b4d6dca
yarn upgrade --latest
milahu Oct 11, 2022
d0cdcf9
update lockfile
milahu Oct 11, 2022
83fd22c
update lockfile
milahu Oct 11, 2022
cfb66b1
yarn upgrade --latest
milahu Oct 11, 2022
023bf81
update lockfile
milahu Oct 11, 2022
b4bc9aa
yarn upgrade --latest
milahu Oct 11, 2022
47f0a8f
yarn upgrade --latest
milahu Oct 11, 2022
1f42274
update lockfile
milahu Oct 11, 2022
11251e3
update lockfile
milahu Oct 11, 2022
e0a7805
update lockfile
milahu Oct 11, 2022
249258e
update lockfile
milahu Oct 11, 2022
2a01503
yarn upgrade --latest
milahu Oct 11, 2022
4d582b9
update lockfile
milahu Oct 11, 2022
4f7d161
update lockfile
milahu Oct 11, 2022
73b8045
update lockfile
milahu Oct 11, 2022
07d3419
update lockfile
milahu Oct 11, 2022
5006336
yarn upgrade --latest
milahu Oct 11, 2022
0203fcd
update lockfile
milahu Oct 11, 2022
75e6e40
yarn upgrade --latest
milahu Oct 11, 2022
b8cc256
update lockfile
milahu Oct 11, 2022
9d04497
update lockfile
milahu Oct 11, 2022
f4858ae
update lockfile
milahu Oct 11, 2022
25862ff
yarn upgrade --latest
milahu Oct 11, 2022
c1b33d8
update lockfile
milahu Oct 11, 2022
7189485
update lockfile
milahu Oct 11, 2022
be77e06
yarn upgrade --latest
milahu Oct 11, 2022
6aa9e4e
update lockfile
milahu Oct 11, 2022
8625621
yarn upgrade --latest
milahu Oct 11, 2022
a3f66dc
update lockfile
milahu Oct 11, 2022
13a0f83
update lockfile
milahu Oct 11, 2022
0c1f656
yarn upgrade --latest
milahu Oct 11, 2022
efb1418
update lockfile
milahu Oct 11, 2022
4a3265b
yarn upgrade --latest
milahu Oct 11, 2022
c04f65e
update lockfile
milahu Oct 11, 2022
4a1413c
update lockfile
milahu Oct 11, 2022
021b576
update lockfile
milahu Oct 11, 2022
3c5a82a
remove stub packages
milahu Oct 11, 2022
ef633fd
update lockfile
milahu Oct 11, 2022
1bb4b17
fix yarn upgrade
milahu Oct 11, 2022
186912d
fix yarn upgrade
milahu Oct 11, 2022
57180eb
downgrade gulp-bom to 3.0.0
milahu Oct 11, 2022
352432a
update lockfile
milahu Oct 11, 2022
8a729f8
remove typescript, use same as vscode
milahu Oct 11, 2022
18bc053
update lockfile
milahu Oct 11, 2022
310efaa
update lockfile
milahu Oct 11, 2022
34924bf
fix Type 'unknown' is not assignable to type '{ installed_version: st…
milahu Oct 12, 2022
2f6b392
fix 'accessTokenJson' is of type 'unknown'.
milahu Oct 12, 2022
11e4117
fix 'json' is of type 'unknown'.
milahu Oct 12, 2022
1361bb5
fix 'json' is of type 'unknown'.
milahu Oct 12, 2022
0c1a409
fix 'json' is of type 'unknown'.
milahu Oct 12, 2022
e3d09f3
fix Type 'unknown' is not assignable to type
milahu Oct 12, 2022
0a891d6
fix Type 'unknown' is not assignable to type
milahu Oct 12, 2022
27b5cff
fix This expression is not callable.
milahu Oct 12, 2022
557efe0
fix This expression is not callable.
milahu Oct 12, 2022
b03371d
fix This expression is not callable.
milahu Oct 12, 2022
a789f2f
fix This expression is not callable.
milahu Oct 12, 2022
603bf16
fix Argument of type 'string | undefined' is not assignable to parame…
milahu Oct 12, 2022
7afc353
fix Property 'fromBuffer' does not exist
milahu Oct 12, 2022
40ada59
fix This expression is not callable.
milahu Oct 12, 2022
2575de4
fix Could not find a declaration file for module 'vscode-markdown-lan…
milahu Oct 12, 2022
9b3fd92
fix Could not find a declaration file for module 'vscode-markdown-lan…
milahu Oct 12, 2022
b985247
fix Could not find a declaration file for module 'vscode-markdown-lan…
milahu Oct 12, 2022
243f871
fix This expression is not callable.
milahu Oct 12, 2022
97f8690
fix This expression is not callable.
milahu Oct 12, 2022
47a82f7
fix Type '{ before: (_id: any, _id2: any, rule: any) => void; }' is m…
milahu Oct 12, 2022
5b94c9e
fix This expression is not callable.
milahu Oct 12, 2022
88b9e9a
fix This expression is not callable.
milahu Oct 12, 2022
6e6c6cd
fix This expression is not callable.
milahu Oct 12, 2022
a397b85
fix This expression is not callable.
milahu Oct 12, 2022
92c6d40
fix This expression is not callable.
milahu Oct 12, 2022
6565bf2
fix This expression is not callable.
milahu Oct 12, 2022
7238da5
assert: fix This expression is not callable.
milahu Oct 12, 2022
3dd0948
enable esModuleInterop
milahu Oct 12, 2022
37666ef
TODO(milahu) remove. disable editor.formatOnSave
milahu Oct 12, 2022
31befb7
minimist: fix This expression is not callable.
milahu Oct 12, 2022
66aa23a
fixup 2127020bfce2 - restore @types/windows-process-tree
milahu Oct 12, 2022
54bdf53
fixup 2127020bfce2 - restore @types/windows-process-tree - lockfile
milahu Oct 12, 2022
b4b81b0
sinon-test: fix This expression is not callable.
milahu Oct 12, 2022
af8dff5
native-is-elevated: ignore This expression is not callable.
milahu Oct 12, 2022
fff9b9b
fix This expression is not constructable.
milahu Oct 12, 2022
b093e12
ignore This expression is not callable.
milahu Oct 12, 2022
87a823c
fix Cannot invoke an object which is possibly 'undefined'.
milahu Oct 12, 2022
51f3521
fix Argument of type '(error?: Error, zipfile?: ZipFile) => void' is …
milahu Oct 12, 2022
bff4fee
fix Argument of type '(error?: Error, stream?: Readable) => void' is …
milahu Oct 12, 2022
c08a29d
ignore Type '"x32"' is not comparable to type 'Architecture'.
milahu Oct 12, 2022
4918536
add comment: transpile-extensions uses SWC
milahu Oct 12, 2022
8d38cd8
add comment: transpile-extensions uses SWC - fixup
milahu Oct 12, 2022
6ddc72e
fix Cannot find module 'windows-process-tree' or its corresponding ty…
milahu Oct 12, 2022
893c017
add command fast-compile
milahu Oct 12, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@
},
"[typescript]": {
"editor.defaultFormatter": "vscode.typescript-language-features",
"editor.formatOnSave": true
"editor.formatOnSave": false
},
"[javascript]": {
"editor.defaultFormatter": "vscode.typescript-language-features",
"editor.formatOnSave": true
"editor.formatOnSave": false
},
"[rust]": {
"editor.defaultFormatter": "rust-lang.rust-analyzer",
"editor.formatOnSave": true,
"editor.formatOnSave": false,
"editor.insertSpaces": true
},
"typescript.tsc.autoDetect": "off",
Expand Down
29 changes: 26 additions & 3 deletions build/azure-pipelines/common/computeBuiltInDepsCacheKey.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,33 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
desc = { enumerable: true, get: function() { return m[k]; } };
}
Object.defineProperty(o, k2, desc);
}) : (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
o[k2] = m[k];
}));
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
o["default"] = v;
});
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
__setModuleDefault(result, mod);
return result;
};
Object.defineProperty(exports, "__esModule", { value: true });
const fs = require("fs");
const path = require("path");
const crypto = require("crypto");
const fs = __importStar(require("fs"));
const path = __importStar(require("path"));
const crypto = __importStar(require("crypto"));
const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../../product.json'), 'utf8'));
const shasum = crypto.createHash('sha1');
for (const ext of productjson.builtInExtensions) {
Expand Down
29 changes: 26 additions & 3 deletions build/azure-pipelines/common/computeNodeModulesCacheKey.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,33 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
desc = { enumerable: true, get: function() { return m[k]; } };
}
Object.defineProperty(o, k2, desc);
}) : (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
o[k2] = m[k];
}));
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
o["default"] = v;
});
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
__setModuleDefault(result, mod);
return result;
};
Object.defineProperty(exports, "__esModule", { value: true });
const fs = require("fs");
const path = require("path");
const crypto = require("crypto");
const fs = __importStar(require("fs"));
const path = __importStar(require("path"));
const crypto = __importStar(require("crypto"));
const { dirs } = require('../../npm/dirs');
const ROOT = path.join(__dirname, '../../../');
const shasum = crypto.createHash('sha1');
Expand Down
31 changes: 27 additions & 4 deletions build/azure-pipelines/common/createAsset.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,34 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
desc = { enumerable: true, get: function() { return m[k]; } };
}
Object.defineProperty(o, k2, desc);
}) : (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
o[k2] = m[k];
}));
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
o["default"] = v;
});
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
__setModuleDefault(result, mod);
return result;
};
Object.defineProperty(exports, "__esModule", { value: true });
const fs = require("fs");
const crypto = require("crypto");
const fs = __importStar(require("fs"));
const crypto = __importStar(require("crypto"));
const storage_blob_1 = require("@azure/storage-blob");
const mime = require("mime");
const mime = __importStar(require("mime"));
const cosmos_1 = require("@azure/cosmos");
const identity_1 = require("@azure/identity");
const retry_1 = require("./retry");
Expand Down Expand Up @@ -152,7 +175,7 @@ async function main() {
const blobClient = containerClient.getBlockBlobClient(blobName);
const blobOptions = {
blobHTTPHeaders: {
blobContentType: mime.lookup(filePath),
blobContentType: mime.getType(filePath) || undefined,
blobContentDisposition: `attachment; filename="${fileName}"`,
blobCacheControl: 'max-age=31536000, public'
}
Expand Down
2 changes: 1 addition & 1 deletion build/azure-pipelines/common/createAsset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ async function main(): Promise<void> {

const blobOptions: BlockBlobParallelUploadOptions = {
blobHTTPHeaders: {
blobContentType: mime.lookup(filePath),
blobContentType: mime.getType(filePath) || undefined,
blobContentDisposition: `attachment; filename="${fileName}"`,
blobCacheControl: 'max-age=31536000, public'
}
Expand Down
27 changes: 25 additions & 2 deletions build/azure-pipelines/common/listNodeModules.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,32 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
desc = { enumerable: true, get: function() { return m[k]; } };
}
Object.defineProperty(o, k2, desc);
}) : (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
o[k2] = m[k];
}));
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
o["default"] = v;
});
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
__setModuleDefault(result, mod);
return result;
};
Object.defineProperty(exports, "__esModule", { value: true });
const fs = require("fs");
const path = require("path");
const fs = __importStar(require("fs"));
const path = __importStar(require("path"));
if (process.argv.length !== 3) {
console.error('Usage: node listNodeModules.js OUTPUT_FILE');
process.exit(-1);
Expand Down
25 changes: 24 additions & 1 deletion build/azure-pipelines/common/sign-win32.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,32 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
desc = { enumerable: true, get: function() { return m[k]; } };
}
Object.defineProperty(o, k2, desc);
}) : (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
o[k2] = m[k];
}));
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
o["default"] = v;
});
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
__setModuleDefault(result, mod);
return result;
};
Object.defineProperty(exports, "__esModule", { value: true });
const sign_1 = require("./sign");
const path = require("path");
const path = __importStar(require("path"));
(0, sign_1.main)([
process.env['EsrpCliDllPath'],
'windows',
Expand Down
31 changes: 27 additions & 4 deletions build/azure-pipelines/common/sign.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,35 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
desc = { enumerable: true, get: function() { return m[k]; } };
}
Object.defineProperty(o, k2, desc);
}) : (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
o[k2] = m[k];
}));
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
o["default"] = v;
});
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
__setModuleDefault(result, mod);
return result;
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.main = void 0;
const cp = require("child_process");
const fs = require("fs");
const tmp = require("tmp");
const crypto = require("crypto");
const cp = __importStar(require("child_process"));
const fs = __importStar(require("fs"));
const tmp = __importStar(require("tmp"));
const crypto = __importStar(require("crypto"));
function getParams(type) {
switch (type) {
case 'windows':
Expand Down
72 changes: 49 additions & 23 deletions build/azure-pipelines/mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,51 +3,77 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
desc = { enumerable: true, get: function() { return m[k]; } };
}
Object.defineProperty(o, k2, desc);
}) : (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
o[k2] = m[k];
}));
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
o["default"] = v;
});
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
__setModuleDefault(result, mod);
return result;
};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
const json = require("gulp-json-editor");
const gulp_json_editor_1 = __importDefault(require("gulp-json-editor"));
const buffer = require('gulp-buffer');
const filter = require("gulp-filter");
const es = require("event-stream");
const vfs = require("vinyl-fs");
const fancyLog = require("fancy-log");
const ansiColors = require("ansi-colors");
const fs = require("fs");
const path = require("path");
const gulp_filter_1 = __importDefault(require("gulp-filter"));
const es = __importStar(require("event-stream"));
const vfs = __importStar(require("vinyl-fs"));
const fancy_log_1 = __importDefault(require("fancy-log"));
const ansiColors = __importStar(require("ansi-colors"));
const fs = __importStar(require("fs"));
const path = __importStar(require("path"));
async function mixinClient(quality) {
const productJsonFilter = filter(f => f.relative === 'product.json', { restore: true });
fancyLog(ansiColors.blue('[mixin]'), `Mixing in client:`);
const productJsonFilter = (0, gulp_filter_1.default)(f => f.relative === 'product.json', { restore: true });
(0, fancy_log_1.default)(ansiColors.blue('[mixin]'), `Mixing in client:`);
return new Promise((c, e) => {
vfs
.src(`quality/${quality}/**`, { base: `quality/${quality}` })
.pipe(filter(f => !f.isDirectory()))
.pipe(filter(f => f.relative !== 'product.server.json'))
.pipe((0, gulp_filter_1.default)(f => !f.isDirectory()))
.pipe((0, gulp_filter_1.default)(f => f.relative !== 'product.server.json'))
.pipe(productJsonFilter)
.pipe(buffer())
.pipe(json((o) => {
.pipe((0, gulp_json_editor_1.default)((o) => {
const originalProduct = JSON.parse(fs.readFileSync(path.join(__dirname, '..', '..', 'product.json'), 'utf8'));
let builtInExtensions = originalProduct.builtInExtensions;
if (Array.isArray(o.builtInExtensions)) {
fancyLog(ansiColors.blue('[mixin]'), 'Overwriting built-in extensions:', o.builtInExtensions.map(e => e.name));
(0, fancy_log_1.default)(ansiColors.blue('[mixin]'), 'Overwriting built-in extensions:', o.builtInExtensions.map(e => e.name));
builtInExtensions = o.builtInExtensions;
}
else if (o.builtInExtensions) {
const include = o.builtInExtensions['include'] || [];
const exclude = o.builtInExtensions['exclude'] || [];
fancyLog(ansiColors.blue('[mixin]'), 'OSS built-in extensions:', builtInExtensions.map(e => e.name));
fancyLog(ansiColors.blue('[mixin]'), 'Including built-in extensions:', include.map(e => e.name));
fancyLog(ansiColors.blue('[mixin]'), 'Excluding built-in extensions:', exclude);
(0, fancy_log_1.default)(ansiColors.blue('[mixin]'), 'OSS built-in extensions:', builtInExtensions.map(e => e.name));
(0, fancy_log_1.default)(ansiColors.blue('[mixin]'), 'Including built-in extensions:', include.map(e => e.name));
(0, fancy_log_1.default)(ansiColors.blue('[mixin]'), 'Excluding built-in extensions:', exclude);
builtInExtensions = builtInExtensions.filter(ext => !include.find(e => e.name === ext.name) && !exclude.find(name => name === ext.name));
builtInExtensions = [...builtInExtensions, ...include];
fancyLog(ansiColors.blue('[mixin]'), 'Final built-in extensions:', builtInExtensions.map(e => e.name));
(0, fancy_log_1.default)(ansiColors.blue('[mixin]'), 'Final built-in extensions:', builtInExtensions.map(e => e.name));
}
else {
fancyLog(ansiColors.blue('[mixin]'), 'Inheriting OSS built-in extensions', builtInExtensions.map(e => e.name));
(0, fancy_log_1.default)(ansiColors.blue('[mixin]'), 'Inheriting OSS built-in extensions', builtInExtensions.map(e => e.name));
}
return { webBuiltInExtensions: originalProduct.webBuiltInExtensions, ...o, builtInExtensions };
}))
.pipe(productJsonFilter.restore)
.pipe(es.mapSync((f) => {
fancyLog(ansiColors.blue('[mixin]'), f.relative, ansiColors.green('✔︎'));
(0, fancy_log_1.default)(ansiColors.blue('[mixin]'), f.relative, ansiColors.green('✔︎'));
return f;
}))
.pipe(vfs.dest('.'))
Expand All @@ -58,14 +84,14 @@ async function mixinClient(quality) {
function mixinServer(quality) {
const serverProductJsonPath = `quality/${quality}/product.server.json`;
if (!fs.existsSync(serverProductJsonPath)) {
fancyLog(ansiColors.blue('[mixin]'), `Server product not found`, serverProductJsonPath);
(0, fancy_log_1.default)(ansiColors.blue('[mixin]'), `Server product not found`, serverProductJsonPath);
return;
}
fancyLog(ansiColors.blue('[mixin]'), `Mixing in server:`);
(0, fancy_log_1.default)(ansiColors.blue('[mixin]'), `Mixing in server:`);
const originalProduct = JSON.parse(fs.readFileSync(path.join(__dirname, '..', '..', 'product.json'), 'utf8'));
const serverProductJson = JSON.parse(fs.readFileSync(serverProductJsonPath, 'utf8'));
fs.writeFileSync('product.json', JSON.stringify({ ...originalProduct, ...serverProductJson }, undefined, '\t'));
fancyLog(ansiColors.blue('[mixin]'), 'product.json', ansiColors.green('✔︎'));
(0, fancy_log_1.default)(ansiColors.blue('[mixin]'), 'product.json', ansiColors.green('✔︎'));
}
function main() {
const quality = process.env['VSCODE_QUALITY'];
Expand Down
6 changes: 3 additions & 3 deletions build/azure-pipelines/mixin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import * as json from 'gulp-json-editor';
import json from 'gulp-json-editor';
const buffer = require('gulp-buffer');
import * as filter from 'gulp-filter';
import filter from 'gulp-filter';
import * as es from 'event-stream';
import * as Vinyl from 'vinyl';
import * as vfs from 'vinyl-fs';
import * as fancyLog from 'fancy-log';
import fancyLog from 'fancy-log';
import * as ansiColors from 'ansi-colors';
import * as fs from 'fs';
import * as path from 'path';
Expand Down
Loading