Skip to content
Merged
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
8 changes: 1 addition & 7 deletions common/src/types/settings.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Copyright 2018-2019 VMware, Inc.
* Copyright 2018-2021 VMware, Inc.
* SPDX-License-Identifier: MIT
*/

Expand Down Expand Up @@ -32,11 +32,6 @@ export interface TasksInfo {
disable: boolean
exclude: string[]
}

export interface ExperimentalFlags {
typescript: boolean
}

export interface BuildTools {
defaultVersion: string
}
Expand All @@ -59,7 +54,6 @@ export interface VrealizeSettings {
commandPalette: CommandPaletteInfo
tasks: TasksInfo
maven: MavenInfo
experimental: ExperimentalFlags
buildTools: BuildTools
views: Views
vra: VraInfo
Expand Down
21 changes: 7 additions & 14 deletions extension/src/client/command/NewProject.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Copyright 2018-2020 VMware, Inc.
* Copyright 2018-2021 VMware, Inc.
* SPDX-License-Identifier: MIT
*/

Expand All @@ -21,6 +21,12 @@ interface State extends ProjectPickInfo {
}

const projectTypes: ProjectType[] = [
{
id: "vro-ts",
label: "vRO TypeScript-based",
containsWorkflows: false,
description: "A vRO project that contains actions, workflows and configs as TypeScript files."
},
{
id: "vro-js",
label: "vRO JavaScript-based",
Expand Down Expand Up @@ -75,19 +81,6 @@ export class NewProject extends Command<void> {
}

async execute(context: vscode.ExtensionContext): Promise<void> {
const noTypeScriptProject = projectTypes.every(e => e.id !== "vro-ts")
if (this.config.vrdev.experimental.typescript && noTypeScriptProject) {
projectTypes.unshift({
id: "vro-ts",
label: "vRO TypeScript-based",
containsWorkflows: false,
description: "A vRO project that contains actions, workflows and configs as TypeScript files."
})
} else if (!this.config.vrdev.experimental.typescript && !noTypeScriptProject) {
// remove the TS project from the list
projectTypes.shift()
}

this.logger.info("Executing command New Project")
const multiStep = new MultiStepInput(TITLE, context, this.config)
await multiStep.run(this.buildStepTree(), this.state)
Expand Down
10 changes: 1 addition & 9 deletions extension/src/client/command/RunAction.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Copyright 2018-2020 VMware, Inc.
* Copyright 2018-2021 VMware, Inc.
* SPDX-License-Identifier: MIT
*/

Expand Down Expand Up @@ -154,14 +154,6 @@ export class RunAction extends Command<void> {
return false
}

if (!this.config.vrdev.experimental.typescript && document.languageId === "typescript") {
vscode.window.showErrorMessage(
"Running a TypeScript action is experimental feature and " +
"must be enabled via the `vrdev.experimental.typescript` setting"
)
return false
}

return true
}

Expand Down
33 changes: 0 additions & 33 deletions extension/src/client/command/ToggleTypeScript.ts

This file was deleted.

3 changes: 1 addition & 2 deletions extension/src/client/command/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Copyright 2018-2020 VMware, Inc.
* Copyright 2018-2021 VMware, Inc.
* SPDX-License-Identifier: MIT
*/

Expand All @@ -11,7 +11,6 @@ export * from "./ShowResources"
export * from "./TriggerCollection"
export * from "./NewProject"
export * from "./RunAction"
export * from "./ToggleTypeScript"
export * from "./FetchRemoteElement"
export * from "./FetchWorkflowSchema"
export * from "./ConfigureVraAuth"
Expand Down
9 changes: 1 addition & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -499,17 +499,10 @@
"description": "",
"scope": "window"
},
"vrdev.experimental.typescript": {
"type": "boolean",
"required": false,
"default": false,
"description": "Enables experimental vRO TypeScript support.",
"scope": "application"
},
"vrdev.buildTools.defaultVersion": {
"type": "string",
"required": false,
"default": "1.7.1",
"default": "2.12.5",
"description": "The version of vRealize Build Tools to be used outside the context of a project (e.g. when onboarding project and running untitled actions).",
"scope": "application"
},
Expand Down
1 change: 0 additions & 1 deletion wiki/vRO-project.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ services
└── dunes-meta-inf.xml
```
### TypeScript-Based Project
**EXPERIMENTAL**

This project contains actions as *.ts, workflows as *.wf.ts, configuration elements as *.config.ts and resource files.

Expand Down