Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/azure-pipelines/darwin/build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
steps:
- task: NodeTool@0
inputs:
versionSpec: '20.15.1'
versionSpec: '22.15.0'
displayName: 'Install Node.js'

- script: |
Expand Down
2 changes: 1 addition & 1 deletion build/azure-pipelines/linux/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ steps:

- task: NodeTool@0
inputs:
versionSpec: '20.15.1'
versionSpec: '22.15.0'
displayName: 'Install Node.js'

- script: |
Expand Down
36 changes: 18 additions & 18 deletions build/azure-pipelines/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ extends:
testPlatforms:
- name: Linux
nodeVersions:
- 20.15.1
- 22.15.0
- name: MacOS
nodeVersions:
- 20.15.1
- 22.15.0
- name: Windows
nodeVersions:
- 20.15.1
- 22.15.0
testSteps:
- template: /build/azure-pipelines/templates/test-steps.yml@self
parameters:
Expand All @@ -81,13 +81,13 @@ extends:
testPlatforms:
- name: Linux
nodeVersions:
- 20.15.1
- 22.15.0
- name: MacOS
nodeVersions:
- 20.15.1
- 22.15.0
- name: Windows
nodeVersions:
- 20.15.1
- 22.15.0
testSteps:
- template: /build/azure-pipelines/templates/test-steps.yml@self
parameters:
Expand All @@ -107,13 +107,13 @@ extends:
testPlatforms:
- name: Linux
nodeVersions:
- 20.15.1
- 22.15.0
- name: MacOS
nodeVersions:
- 20.15.1
- 22.15.0
- name: Windows
nodeVersions:
- 20.15.1
- 22.15.0
testSteps:
- template: /build/azure-pipelines/templates/test-steps.yml@self
parameters:
Expand All @@ -133,13 +133,13 @@ extends:
testPlatforms:
- name: Linux
nodeVersions:
- 20.15.1
- 22.15.0
- name: MacOS
nodeVersions:
- 20.15.1
- 22.15.0
- name: Windows
nodeVersions:
- 20.15.1
- 22.15.0
testSteps:
- template: /build/azure-pipelines/templates/test-steps.yml@self
parameters:
Expand All @@ -159,13 +159,13 @@ extends:
testPlatforms:
- name: Linux
nodeVersions:
- 20.15.1
- 22.15.0
- name: MacOS
nodeVersions:
- 20.15.1
- 22.15.0
- name: Windows
nodeVersions:
- 20.15.1
- 22.15.0
testSteps:
- template: /build/azure-pipelines/templates/test-steps.yml@self
parameters:
Expand All @@ -185,13 +185,13 @@ extends:
testPlatforms:
- name: Linux
nodeVersions:
- 20.15.1
- 22.15.0
- name: MacOS
nodeVersions:
- 20.15.1
- 22.15.0
- name: Windows
nodeVersions:
- 20.15.1
- 22.15.0
testSteps:
- template: /build/azure-pipelines/templates/test-steps.yml@self
parameters:
Expand Down
2 changes: 1 addition & 1 deletion build/azure-pipelines/win32/build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
steps:
- task: NodeTool@0
inputs:
versionSpec: '20.15.1'
versionSpec: '22.15.0'
displayName: 'Install Node.js'

- script: |
Expand Down
2 changes: 1 addition & 1 deletion sync-api-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"homepage": "https://github.com/microsoft/vscode-wasm/blob/main/sync-api-client/README.md",
"dependencies": {
"vscode-uri": "^3.0.8",
"vscode-uri": "^3.1.0",
"@vscode/sync-api-common": "0.9.0"
},
"devDependencies": {
Expand Down
6 changes: 2 additions & 4 deletions sync-api-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,11 @@
"fsChunks"
],
"dependencies": {
"uuid": "^9.0.1",
"vscode-uri": "^3.0.8",
"vscode-uri": "^3.1.0",
"@vscode/sync-api-common": "0.9.0"
},
"devDependencies": {
"@types/vscode": "1.71.0",
"@types/uuid": "^9.0.7"
"@types/vscode": "1.71.0"
},
"scripts": {
"prepublishOnly": "echo \"⛔ Can only publish from a secure pipeline ⛔\" && node ../build/npm/fail",
Expand Down
6 changes: 3 additions & 3 deletions sync-api-service/src/terminal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
* ------------------------------------------------------------------------------------------ */

import { Event, EventEmitter, Pseudoterminal, Uri } from 'vscode';
import { randomUUID } from 'node:crypto';

import * as uuid from 'uuid';
import { Event, EventEmitter, Pseudoterminal, Uri } from 'vscode';

import { RAL } from '@vscode/sync-api-common';
import { CharacterDeviceDriver, FileDescriptorDescription } from './device';
Expand Down Expand Up @@ -232,7 +232,7 @@ class ServiceTerminalImpl implements ServicePseudoTerminal, CharacterDeviceDrive
this._onAnyKey = new EventEmitter<void>;
this.onAnyKey = this._onAnyKey.event;

const id = this.id = uuid.v4();
const id = this.id = randomUUID();
this.encoder = RAL().TextEncoder.create();
this.decoder = RAL().TextDecoder.create();

Expand Down
1 change: 1 addition & 0 deletions sync-api-service/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"compilerOptions": {
"composite": true,
"types": [
"node",
"vscode"
],
"module": "Node16",
Expand Down
15 changes: 1 addition & 14 deletions sync-api-service/tsconfig.publish.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,9 @@
"compilerOptions": {
"composite": true,
"types": [
"node",
"vscode"
],
"module": "Node16",
"moduleResolution": "Node16",
"target": "es2022",
"lib": [
"es2022"
],
"rootDir": "./src",
"strict": true,
"noImplicitAny": true,
"noImplicitReturns": true,
"noImplicitThis": true,
"declaration": true,
"stripInternal": true,
"sourceMap": false,
"declarationMap": false,
"noUnusedLocals": true,
"noUnusedParameters": true,
Expand Down
17 changes: 1 addition & 16 deletions sync-api-service/tsconfig.watch.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,9 @@
"compilerOptions": {
"composite": true,
"types": [
"node",
"vscode"
],
"module": "Node16",
"moduleResolution": "Node16",
"target": "es2022",
"lib": [
"es2022"
],
"rootDir": "./src",
"strict": true,
"noImplicitAny": true,
"noImplicitReturns": true,
"noImplicitThis": true,
"declaration": true,
"stripInternal": true,
"sourceMap": true,
"declarationMap": true,
"noUnusedLocals": false,
"noUnusedParameters": false,
"assumeChangesOnlyAffectDirectDependencies": true,
"outDir": "./lib",
Expand Down
4 changes: 1 addition & 3 deletions sync-api-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,10 @@
},
"dependencies": {
"@vscode/sync-api-client": "0.9.0",
"vscode-uri": "^3.0.8"
"vscode-uri": "^3.1.0"
},
"devDependencies": {
"@types/uuid": "^9.0.7",
"@types/vscode": "1.71.0",
"uuid": "^9.0.1",
"find-process": "^1.4.7"
}
}
4 changes: 2 additions & 2 deletions sync-api-tests/src/desktop/runTests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import fs from 'fs';
import os from 'os';
import path from 'path';
import * as uuid from 'uuid';
import { randomUUID } from 'node:crypto';
import find = require('find-process');

import { runTests } from '@vscode/test-electron';
Expand All @@ -29,7 +29,7 @@ function rimraf(location: string) {


async function go() {
const testDir = path.join(os.tmpdir(), uuid.v4());
const testDir = path.join(os.tmpdir(), randomUUID());
try {
const extensionDevelopmentPath = path.join(__dirname, '..', '..');
const extensionTestsPath = __dirname;
Expand Down
2 changes: 1 addition & 1 deletion testbeds/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "wasm-testbeds",
"private": true,
"dependencies": {
"vscode-uri": "3.0.3"
"vscode-uri": "^3.1.0"
},
"devDependencies": {
"@types/vscode": "^1.92.0"
Expand Down
6 changes: 2 additions & 4 deletions wasm-component-model/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,11 @@
],
"dependencies": {
"yargs": "^17.7.2",
"semver": "^7.7.2",
"uuid": "^11.1.0"
"semver": "^7.7.2"
},
"devDependencies": {
"@types/yargs": "^17.0.33",
"@types/semver": "^7.7.0",
"@types/uuid": "^10.0.0"
"@types/semver": "^7.7.0"
},
"scripts": {
"prepublishOnly": "echo \"⛔ Can only publish from a secure pipeline ⛔\" && node ../build/npm/fail",
Expand Down
3 changes: 1 addition & 2 deletions wasm-component-model/src/common/componentModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import * as uuid from 'uuid';
import RAL from './ral';

// Type arrays are stored either little or big endian depending on the platform.
Expand Down Expand Up @@ -497,7 +496,7 @@ export namespace Memory {
if (exports.memory === undefined || exports.cabi_realloc === undefined) {
throw new MemoryError('The exports object must contain a memory object and a cabi_realloc function.');
}
this.id = id ?? uuid.v4();
this.id = id ?? (globalThis as unknown as { crypto: { randomUUID(): string } }).crypto.randomUUID();
this.memory = exports.memory;
this.cabi_realloc = exports.cabi_realloc;
}
Expand Down
3 changes: 1 addition & 2 deletions wasm-component-model/src/common/connection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
* ------------------------------------------------------------------------------------------ */
/// <reference path="../../typings/webAssemblyCommon.d.ts" preserve="true"/>
import * as uuid from 'uuid';

import { $exports, $imports, Alignment, ComponentModelTrap, Memory, MemoryRange, ReadonlyMemoryRange, WasmContext, type Code, type JType, type MainConnection, type Options, type WasmType, type WorkerConnection, type WorldType } from './componentModel';
import { CapturedPromise } from './promises';
Expand Down Expand Up @@ -34,7 +33,7 @@ class ConnectionMemory implements Memory {
sizeOrBuffer = 64 * 1024;
}
if (typeof sizeOrBuffer === 'number') {
this.id = uuid.v4();
this.id = (globalThis as unknown as { crypto: { randomUUID(): string } }).crypto.randomUUID();
this.buffer = new SharedArrayBuffer(sizeOrBuffer);
this.next = new Uint32Array(this.buffer, ConnectionMemory.Header.next.offset, 1);
this.next[0] = ConnectionMemory.Header.end.offset;
Expand Down
4 changes: 1 addition & 3 deletions wasm-kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,8 @@
"simulation": "node ./lib/node/test/arrayMain.js"
},
"dependencies": {
"uuid": "^9.0.1",
"vscode-uri": "^3.0.8"
"vscode-uri": "^3.1.0"
},
"devDependencies": {
"@types/uuid": "^9.0.8"
}
}
4 changes: 1 addition & 3 deletions wasm-kit/src/common/sharedObject.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
* ------------------------------------------------------------------------------------------ */
import RAL from './ral';

import * as uuid from 'uuid';

import {
Alignment, ComponentModelContext,
ComponentModelTrap,
Expand Down Expand Up @@ -134,7 +132,7 @@ class MemoryImpl implements SharedMemory {
public constructor(module: WebAssembly_.Module, memory: WebAssembly_.Memory, exports: SharedMemory.Exports, size: u32);
public constructor(module: WebAssembly_.Module, memory: WebAssembly_.Memory, exports: SharedMemory.Exports, size: u32, id: string, counter: ptr);
public constructor(module: WebAssembly_.Module, memory: WebAssembly_.Memory, exports: SharedMemory.Exports, size: u32, id?: string, counter?: ptr) {
this.id = id ?? uuid.v4();
this.id = id ?? (globalThis as unknown as { crypto: { randomUUID(): string } }).crypto.randomUUID();
this.module = module;
this.memory = memory;
this.exports = exports;
Expand Down
2 changes: 1 addition & 1 deletion wasm-wasi-core/build/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ parameters:
extends:
template: azure-pipelines/extension/pre-release.yml@templates
parameters:
nodeVersion: 20.15.1
nodeVersion: 22.15.0
buildSteps:
- script: |
npm ci
Expand Down
2 changes: 1 addition & 1 deletion wasm-wasi-core/build/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ parameters:
extends:
template: azure-pipelines/extension/stable.yml@templates
parameters:
nodeVersion: 20.15.1
nodeVersion: 22.15.0
buildSteps:
- script: |
npm ci
Expand Down
4 changes: 1 addition & 3 deletions wasm-wasi-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@
"browser": "./dist/web/extension.js",
"activationEvents": [],
"dependencies": {
"uuid": "^9.0.1",
"vscode-uri": "^3.0.8"
"vscode-uri": "^3.1.0"
},
"devDependencies": {
"@types/vscode": "1.88.0",
"@types/uuid": "^9.0.8",
"@types/assert": "^1.5.10",
"assert": "^2.1.0",
"find-process": "^1.4.7"
Expand Down
Loading
Loading