diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f713eb429c..17bbd83e80 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,19 +1,19 @@ -## Contributing to Angular Console +## Contributing to Nx Console -We would love for you to contribute to Angular Console! Read this document to see how to do it. +We would love for you to contribute to Nx Console! Read this document to see how to do it. ## Got a Question? -We are trying to keep GitHub issues for bug reports and feature requests. Stack Overflow is a much better place to ask general questions about how to use Angular Console. +We are trying to keep GitHub issues for bug reports and feature requests. Stack Overflow is a much better place to ask general questions about how to use Nx Console. ## Two Platforms -Angular Console runs on two platforms: +Nx Console runs on two platforms: - VSCode - IntelliJ -The two versions of Angular Console share most of the code, but they are bundled differently. +The two versions of Nx Console share most of the code, but they are bundled differently. ## Building the VSCode Plugin diff --git a/README.md b/README.md index c3b483f355..bca8de2139 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # The UI for the Angular CLI -[![Angular Console Website](https://img.shields.io/badge/Angular-Console-blue.png)](https://angularconsole.org/) +[![Nx Console Website](https://img.shields.io/badge/Angular-Console-blue.png)](https://angularconsole.org/) [![License](https://img.shields.io/npm/l/@nrwl/schematics.png)](https://opensource.org/licenses/MIT)
@@ -15,7 +15,7 @@ Angular CLI transformed the Angular ecosystem. With it, you can get a full-stack application up and running in minutes, no need to figure out source maps, webpack, test runners. It all works out of the box. Angular CLI also helps you enforce consistent development practices by generating components, services, and state management modules. -## Why Angular Console? +## Why Nx Console? Professional developers use both command-line tools and user interfaces. They commit in the terminal, but resolve conflicts in VSCode or WebStorm. They use the right tool for the job. @@ -23,34 +23,34 @@ Angular CLI is a command-line tool, which works great when you want to serve an For instance: -- Exploring custom schematic collections is hard in the terminal, but it's easy using Angular Console. -- Using rarely-used flags is challenging. Do you pass absolute or relative paths? You don't have to remember any flags, names, or paths -- Angular Console will help you by providing autocompletion and validating your inputs. -- Finding the right Angular CLI extension can take a long time. When using Angular Console, you can find and install an extension in minutes. +- Exploring custom schematic collections is hard in the terminal, but it's easy using Nx Console. +- Using rarely-used flags is challenging. Do you pass absolute or relative paths? You don't have to remember any flags, names, or paths -- Nx Console will help you by providing autocompletion and validating your inputs. +- Finding the right Angular CLI extension can take a long time. When using Nx Console, you can find and install an extension in minutes. -Angular Console does all that and more! +Nx Console does all that and more! ## Download -For VSCode users, you can install the [Angular Console VSCode Plugin](https://marketplace.visualstudio.com/items?itemName=nrwl.angular-console) from Marketplace. +For VSCode users, you can install the [Nx Console VSCode Plugin](https://marketplace.visualstudio.com/items?itemName=nrwl.angular-console) from Marketplace. ## True UI for the Angular CLI -Angular Console is an UI for the Angular CLI. It will work for any schematic or any architect commands. Angular Console does not have a specific UI for, say, generating a component. Instead, Angular Console does what the command-line version of the Angular CLI does--it analyzes the same meta information to create the needed UI. This means that anything you can do with the Angular CLI, you can do with Angular Console. After all, Angular Console is the UI for the Angular CLI. +Nx Console is an UI for the Angular CLI. It will work for any schematic or any architect commands. Nx Console does not have a specific UI for, say, generating a component. Instead, Nx Console does what the command-line version of the Angular CLI does--it analyzes the same meta information to create the needed UI. This means that anything you can do with the Angular CLI, you can do with Nx Console. After all, Nx Console is the UI for the Angular CLI. ## Useful for Both Experts and Beginners -Even though we started building Angular Console as a tool for expert, we also aimed to make Angular Console a great tool for developers who are new to Angular or Angular CLI. You can create projects, interact with your editor, run generators and commands, install extensions without ever touching the terminal or having to install any node packages globally. If you get a new laptop, you can install Angular Console and start building Angular apps. Also, Angular Console highlights the properties you are likely to use for build-in generators and commands . So if you haven't used the CLI, you don't get overwhelmed. +Even though we started building Nx Console as a tool for expert, we also aimed to make Nx Console a great tool for developers who are new to Angular or Angular CLI. You can create projects, interact with your editor, run generators and commands, install extensions without ever touching the terminal or having to install any node packages globally. If you get a new laptop, you can install Nx Console and start building Angular apps. Also, Nx Console highlights the properties you are likely to use for build-in generators and commands . So if you haven't used the CLI, you don't get overwhelmed. ## Great for Windows Users -A lot of Windows users are terminal shy and cannot take full advantage of tools like the Angular CLI and [Nrwl Nx](http://nrwl.io/nx). By using Angular Console, Windows users can start using the powerful capabilities these tools provide via an easy-to-use UI. They can create new projects, generate components, build, test, deploy Angular apps without having to even open the terminal. +A lot of Windows users are terminal shy and cannot take full advantage of tools like the Angular CLI and [Nrwl Nx](http://nrwl.io/nx). By using Nx Console, Windows users can start using the powerful capabilities these tools provide via an easy-to-use UI. They can create new projects, generate components, build, test, deploy Angular apps without having to even open the terminal. # Learn More - [angularconsole.com](http://angularconsole.com) - the official site of the project -- [Watch Angular Console 5-minute overview video by Angular Firebase folks](https://www.youtube.com/watch?time_continue=18&v=d2K2Cp8BJx0) -- [Angular CLI course by John Papa](https://www.pluralsight.com/courses/angular-cli) - the Angular CLI course by John Papa has a video on Angular Console -- [Learn more about the team at Nrwl](https://www.nrwl.io) - The team at Nrwl led the development of Angular Console, after working with many Enterprise clients. +- [Watch Nx Console 5-minute overview video by Angular Firebase folks](https://www.youtube.com/watch?time_continue=18&v=d2K2Cp8BJx0) +- [Angular CLI course by John Papa](https://www.pluralsight.com/courses/angular-cli) - the Angular CLI course by John Papa has a video on Nx Console +- [Learn more about the team at Nrwl](https://www.nrwl.io) - The team at Nrwl led the development of Nx Console, after working with many Enterprise clients. # Contribute @@ -70,7 +70,7 @@ Pick one of the issues from the [good first issue](https://github.com/nrwl/angul [fk]: https://avatars0.githubusercontent.com/u/17149942?s=150&v=4 [kk]: https://avatars1.githubusercontent.com/u/8167190?s=150&v=4 -The following folks from the Angular team at Google are working with the Angular Console team. +The following folks from the Angular team at Google are working with the Nx Console team. | Alex Eagle | Stephen Fluin | Matias Niemelä | | ----------------- | -------------------- | --------------------- | diff --git a/apps/vscode-ui/src/app/app.module.ts b/apps/vscode-ui/src/app/app.module.ts index 81bd2ad027..e5f12f3b74 100644 --- a/apps/vscode-ui/src/app/app.module.ts +++ b/apps/vscode-ui/src/app/app.module.ts @@ -4,7 +4,7 @@ import { NgModule } from '@angular/core'; import { VscodeUiFeatureTaskExecutionFormModule, TaskExecutionFormComponent -} from '@angular-console/vscode-ui/feature-task-execution-form'; +} from '@nx-console/vscode-ui/feature-task-execution-form'; import { environment } from '../environments/environment'; @NgModule({ diff --git a/apps/vscode-ui/src/environments/environment.ts b/apps/vscode-ui/src/environments/environment.ts index 605815acfc..42563076d1 100644 --- a/apps/vscode-ui/src/environments/environment.ts +++ b/apps/vscode-ui/src/environments/environment.ts @@ -1,4 +1,4 @@ -import { TASK_EXECUTION_SCHEMA } from '@angular-console/vscode-ui/feature-task-execution-form'; +import { TASK_EXECUTION_SCHEMA } from '@nx-console/vscode-ui/feature-task-execution-form'; // This file can be replaced during build by using the `fileReplacements` array. // `ng build --prod` replaces `environment.ts` with `environment.prod.ts`. diff --git a/apps/vscode/src/app/cli-task/cli-task-commands.ts b/apps/vscode/src/app/cli-task/cli-task-commands.ts index b3327fd19f..5ecb598078 100644 --- a/apps/vscode/src/app/cli-task/cli-task-commands.ts +++ b/apps/vscode/src/app/cli-task/cli-task-commands.ts @@ -10,7 +10,7 @@ import { import { CliTaskProvider } from './cli-task-provider'; import { CliTaskQuickPickItem } from './cli-task-quick-pick-item'; import { selectFlags } from './select-flags'; -import { Option } from '@angular-console/schema'; +import { Option } from '@nx-console/schema'; import { OptionType } from '@angular/cli/models/interface'; const CLI_COMMAND_LIST = [ 'build', @@ -48,14 +48,14 @@ export function registerCliTaskCommands( }); commands.registerCommand(`ng.generate`, () => - selectSchematicAndPromptForFlags(n.getWorkspacePath()!) + selectSchematicAndPromptForFlags(n.getWorkspaceJsonPath()) ); commands.registerCommand(`ng.generate.ui`, () => selectCliCommandAndShowUi('generate', context.extensionPath) ); commands.registerCommand(`nx.generate`, () => - selectSchematicAndPromptForFlags(n.getWorkspacePath()!) + selectSchematicAndPromptForFlags(n.getWorkspaceJsonPath()) ); commands.registerCommand(`nx.generate.ui`, () => @@ -67,7 +67,7 @@ function selectCliCommandAndShowUi(command: string, extensionPath: string) { const workspacePath = cliTaskProvider.getWorkspacePath(); if (!workspacePath) { window.showErrorMessage( - 'Angular Console requires a workspace be set to perform this action' + 'Nx Console requires a workspace be set to perform this action' ); return; } @@ -78,10 +78,7 @@ function selectCliCommandAndShowUi(command: string, extensionPath: string) { extensionPath ); - commands.executeCommand( - 'angularConsole.revealWebViewPanel', - workspaceTreeItem - ); + commands.executeCommand('nxConsole.revealWebViewPanel', workspaceTreeItem); } async function selectCliCommandAndPromptForFlags(command: string) { @@ -133,16 +130,16 @@ async function selectCliCommandAndPromptForFlags(command: string) { } } -async function selectSchematicAndPromptForFlags(workspacePath: string) { +async function selectSchematicAndPromptForFlags(workspaceJsonPath: string) { const { validWorkspaceJson, workspaceType } = verifyWorkspaceJson( - workspacePath + workspaceJsonPath ); if (!validWorkspaceJson) { return; } - const selection = await selectSchematic(workspacePath); + const selection = await selectSchematic(workspaceJsonPath); if (!selection) { return; } @@ -181,7 +178,7 @@ export function selectCliProject(command: string, json: any) { if (!items.length) { window.showInformationMessage( - `None of your projects support ng ${command}` + `No projects have an architect command for ${command}` ); return; diff --git a/apps/vscode/src/app/cli-task/cli-task-flag-quick-pick-item.ts b/apps/vscode/src/app/cli-task/cli-task-flag-quick-pick-item.ts index 76fdb7d872..ac3849500d 100644 --- a/apps/vscode/src/app/cli-task/cli-task-flag-quick-pick-item.ts +++ b/apps/vscode/src/app/cli-task/cli-task-flag-quick-pick-item.ts @@ -1,4 +1,4 @@ -import { Option } from '@angular-console/schema'; +import { Option } from '@nx-console/schema'; import { QuickPickItem } from 'vscode'; export class CliTaskFlagQuickPickItem implements QuickPickItem { diff --git a/apps/vscode/src/app/cli-task/cli-task.ts b/apps/vscode/src/app/cli-task/cli-task.ts index 0927328e76..46fdfba22d 100644 --- a/apps/vscode/src/app/cli-task/cli-task.ts +++ b/apps/vscode/src/app/cli-task/cli-task.ts @@ -1,7 +1,7 @@ import { CliTaskDefinition } from './cli-task-definition'; import { Task, TaskGroup, TaskScope } from 'vscode'; import { getShellExecutionForConfig } from './shell-execution'; -import { findClosestNg, findClosestNx } from '@angular-console/server'; +import { findClosestNg, findClosestNx } from '@nx-console/server'; import { join } from 'path'; export class CliTask extends Task { @@ -26,10 +26,10 @@ export class CliTask extends Task { : `ng ${args.join(' ')}`; const task = new CliTask( - { ...definition, type: 'ng' }, // definition + { ...definition, type: useNxCli ? 'nx' : 'ng' }, // definition TaskScope.Workspace, // scope displayCommand, // name - 'angular-console', // source + 'nx-console', // source // execution getShellExecutionForConfig({ displayCommand, diff --git a/apps/vscode/src/app/cli-task/nx-task.ts b/apps/vscode/src/app/cli-task/nx-task.ts index dcf5611934..e887695bdb 100644 --- a/apps/vscode/src/app/cli-task/nx-task.ts +++ b/apps/vscode/src/app/cli-task/nx-task.ts @@ -1,6 +1,6 @@ import { Task, TaskScope } from 'vscode'; import { getShellExecutionForConfig } from './shell-execution'; -import { findClosestNx } from '@angular-console/server'; +import { findClosestNx } from '@nx-console/server'; export interface NxTaskDefinition { positional: string; @@ -19,7 +19,7 @@ export class NxTask extends Task { { ...definition, type: 'nx' }, // definition TaskScope.Workspace, // scope displayCommand, // name - 'angular-console', // source + 'nx-console', // source // execution getShellExecutionForConfig({ displayCommand, diff --git a/apps/vscode/src/app/cli-task/select-flags.ts b/apps/vscode/src/app/cli-task/select-flags.ts index a5fd77640a..166ba2155f 100644 --- a/apps/vscode/src/app/cli-task/select-flags.ts +++ b/apps/vscode/src/app/cli-task/select-flags.ts @@ -1,4 +1,4 @@ -import { Option } from '@angular-console/schema'; +import { Option } from '@nx-console/schema'; import { QuickPickItem, window } from 'vscode'; import { CliTaskFlagQuickPickItem } from './cli-task-flag-quick-pick-item'; diff --git a/apps/vscode/src/app/nx-task/nx-task-commands.ts b/apps/vscode/src/app/nx-task/nx-task-commands.ts index cfbf4c0bae..26fe328d04 100644 --- a/apps/vscode/src/app/nx-task/nx-task-commands.ts +++ b/apps/vscode/src/app/nx-task/nx-task-commands.ts @@ -1,4 +1,4 @@ -import { Option } from '@angular-console/schema'; +import { Option } from '@nx-console/schema'; import { OptionType } from '@angular/cli/models/interface'; import { commands, ExtensionContext, window, tasks } from 'vscode'; @@ -54,7 +54,7 @@ async function promptForTarget(): Promise { if (!validTargets.length) { window.showErrorMessage( - 'None of your workspace projects have architect commands to run' + 'None of your workspace projects have an architect command' ); return; } diff --git a/apps/vscode/src/app/nx-task/nx-task.ts b/apps/vscode/src/app/nx-task/nx-task.ts index 5f1f5d7246..7df2230789 100644 --- a/apps/vscode/src/app/nx-task/nx-task.ts +++ b/apps/vscode/src/app/nx-task/nx-task.ts @@ -1,6 +1,6 @@ import { Task, TaskScope } from 'vscode'; import { getShellExecutionForConfig } from '../cli-task/shell-execution'; -import { findClosestNx } from '@angular-console/server'; +import { findClosestNx } from '@nx-console/server'; export interface NxTaskDefinition { positional: string; @@ -19,7 +19,7 @@ export class NxTask extends Task { { ...definition, type: 'nx' }, // definition TaskScope.Workspace, // scope displayCommand, // name - 'angular-console', // source + 'nx-console', // source // execution getShellExecutionForConfig({ displayCommand, diff --git a/apps/vscode/src/app/output-channel.ts b/apps/vscode/src/app/output-channel.ts index 49d0bd6066..bee81eacbd 100644 --- a/apps/vscode/src/app/output-channel.ts +++ b/apps/vscode/src/app/output-channel.ts @@ -4,7 +4,7 @@ let _channel: OutputChannel; export function getOutputChannel(): OutputChannel { if (!_channel) { - _channel = window.createOutputChannel('Angular Console'); + _channel = window.createOutputChannel('Nx Console'); } return _channel; } diff --git a/apps/vscode/src/app/select-schematic.ts b/apps/vscode/src/app/select-schematic.ts index 4dacb2af5d..23551c5373 100644 --- a/apps/vscode/src/app/select-schematic.ts +++ b/apps/vscode/src/app/select-schematic.ts @@ -1,5 +1,5 @@ -import { Schematic } from '@angular-console/schema'; -import { readAllSchematicCollections } from '@angular-console/server'; +import { Schematic } from '@nx-console/schema'; +import { readAllSchematicCollections } from '@nx-console/server'; import { QuickPickItem, window } from 'vscode'; import { join } from 'path'; diff --git a/apps/vscode/src/app/telemetry.ts b/apps/vscode/src/app/telemetry.ts index dd90edd0b2..ece4ee354f 100644 --- a/apps/vscode/src/app/telemetry.ts +++ b/apps/vscode/src/app/telemetry.ts @@ -1,4 +1,4 @@ -import { Store, Telemetry } from '@angular-console/server'; +import { Store, Telemetry } from '@nx-console/server'; import { Disposable, window, workspace } from 'vscode'; import { environment } from '../environments/environment'; @@ -23,7 +23,7 @@ export function initTelemetry(store: Store) { if (!store.get('shownTelemetryPrompt')) { window.showInformationMessage( - 'Help improve Angular Console by allowing us to collect data. To opt-out set angularConsole.enableTelemetry to false in settings.' + 'Help improve Nx Console by allowing us to collect data. To opt-out set nxConsole.enableTelemetry to false in settings.' ); store.set('shownTelemetryPrompt', true); diff --git a/apps/vscode/src/app/verify-workspace/verify-angular-json.ts b/apps/vscode/src/app/verify-workspace/verify-angular-json.ts index b927227b67..ccf8d90d2f 100644 --- a/apps/vscode/src/app/verify-workspace/verify-angular-json.ts +++ b/apps/vscode/src/app/verify-workspace/verify-angular-json.ts @@ -1,4 +1,4 @@ -import { readAndParseJson } from '@angular-console/server'; +import { readAndParseJson } from '@nx-console/server'; import { window } from 'vscode'; import { getOutputChannel } from '../output-channel'; diff --git a/apps/vscode/src/app/verify-workspace/verify-builder-definition.ts b/apps/vscode/src/app/verify-workspace/verify-builder-definition.ts index 2073f4932f..a7eee68593 100644 --- a/apps/vscode/src/app/verify-workspace/verify-builder-definition.ts +++ b/apps/vscode/src/app/verify-workspace/verify-builder-definition.ts @@ -1,5 +1,5 @@ -import { Option } from '@angular-console/schema'; -import { readBuilderSchema } from '@angular-console/server'; +import { Option } from '@nx-console/schema'; +import { readBuilderSchema } from '@nx-console/server'; import { window } from 'vscode'; import { workspaceJsonTreeProvider } from '../workspace-json-tree/workspace-json-tree-provider'; import { getTelemetry } from '../telemetry'; diff --git a/apps/vscode/src/app/vscode-storage.ts b/apps/vscode/src/app/vscode-storage.ts index 944ea7c644..f5668cdafb 100644 --- a/apps/vscode/src/app/vscode-storage.ts +++ b/apps/vscode/src/app/vscode-storage.ts @@ -1,8 +1,8 @@ import { ConfigurationTarget, ExtensionContext, workspace } from 'vscode'; -import { Store } from '@angular-console/server'; +import { Store } from '@nx-console/server'; export class VSCodeStorage implements Store { - static configurationSection = 'angularConsole'; + static configurationSection = 'nxConsole'; static fromContext(context: ExtensionContext): VSCodeStorage { return new VSCodeStorage(context.globalState); diff --git a/apps/vscode/src/app/webview.ts b/apps/vscode/src/app/webview.ts index d21a0300b5..8302c303df 100644 --- a/apps/vscode/src/app/webview.ts +++ b/apps/vscode/src/app/webview.ts @@ -18,7 +18,7 @@ import { NxTask } from './cli-task/nx-task'; import { TaskExecutionSchema, TaskExecutionMessage -} from '@angular-console/schema'; +} from '@nx-console/schema'; let webviewPanel: WebviewPanel | undefined; let indexHtml: string | undefined; @@ -73,7 +73,7 @@ export function createWebViewPanel( webviewPanel.reveal(); } else { webviewPanel = window.createWebviewPanel( - 'angular-console', // Identifies the type of the webview. Used internally + 'nx-console', // Identifies the type of the webview. Used internally title, // Title of the panel displayed to the user ViewColumn.Active, // Editor column to show the new webview panel in. { diff --git a/apps/vscode/src/app/workspace-json-tree/workspace-json-tree-item.ts b/apps/vscode/src/app/workspace-json-tree/workspace-json-tree-item.ts index f9ba722dd1..cf57b5176d 100644 --- a/apps/vscode/src/app/workspace-json-tree/workspace-json-tree-item.ts +++ b/apps/vscode/src/app/workspace-json-tree/workspace-json-tree-item.ts @@ -11,7 +11,7 @@ export class WorkspaceJsonTreeItem extends TreeItem { if (collapsibleState) { this.command = { title: 'Expand/contract item in workspace tree', - command: 'angularConsole.toggleTreeItem' + command: 'nxConsole.toggleTreeItem' }; } } diff --git a/apps/vscode/src/app/workspace-json-tree/workspace-json-tree-provider.ts b/apps/vscode/src/app/workspace-json-tree/workspace-json-tree-provider.ts index 4ab173fd24..c364cbb902 100644 --- a/apps/vscode/src/app/workspace-json-tree/workspace-json-tree-provider.ts +++ b/apps/vscode/src/app/workspace-json-tree/workspace-json-tree-provider.ts @@ -33,7 +33,7 @@ export class WorkspaceJsonTreeProvider extends AbstractTreeProvider< workspaceJsonTreeProvider = this; - commands.registerCommand('angularConsole.refreshWorkspaceJsonTree', () => + commands.registerCommand('nxConsole.refreshWorkspaceJsonTree', () => this.refresh() ); @@ -45,7 +45,7 @@ export class WorkspaceJsonTreeProvider extends AbstractTreeProvider< ([commandSuffix, callback]) => { context.subscriptions.push( commands.registerCommand( - `angularConsole.${commandSuffix}`, + `nxConsole.${commandSuffix}`, callback, this ) @@ -94,7 +94,7 @@ export class WorkspaceJsonTreeProvider extends AbstractTreeProvider< ); item.command = { title: 'Edit workspace definition', - command: 'angularConsole.editWorkspaceJson', + command: 'nxConsole.editWorkspaceJson', arguments: [item] }; if (!workspaceJsonLabel.architect) { diff --git a/apps/vscode/src/app/workspace-tree/get-task-execution-schema.ts b/apps/vscode/src/app/workspace-tree/get-task-execution-schema.ts index 1c40097e8f..661ba2b787 100644 --- a/apps/vscode/src/app/workspace-tree/get-task-execution-schema.ts +++ b/apps/vscode/src/app/workspace-tree/get-task-execution-schema.ts @@ -1,5 +1,5 @@ -import { TaskExecutionSchema } from '@angular-console/schema'; -import { readArchitectDef, readBuilderSchema } from '@angular-console/server'; +import { TaskExecutionSchema } from '@nx-console/schema'; +import { readArchitectDef, readBuilderSchema } from '@nx-console/server'; import { window } from 'vscode'; import { selectCliProject } from '../cli-task/cli-task-commands'; @@ -20,7 +20,7 @@ export async function getTaskExecutionSchema( if (!cliTaskProvider.getWorkspacePath()) { return; } - const { validWorkspaceJson, json } = verifyWorkspaceJson( + const { validWorkspaceJson, json, workspaceType } = verifyWorkspaceJson( cliTaskProvider.getWorkspaceJsonPath() ); @@ -31,12 +31,10 @@ export async function getTaskExecutionSchema( const command = workspaceRouteTitle.toLowerCase(); switch (workspaceRouteTitle) { case 'Build': - case 'Deploy': case 'E2e': case 'Lint': case 'Serve': case 'Test': - case 'Xi18n': const selectedProject = await selectCliProject(command, json); if (!selectedProject) return; @@ -59,7 +57,8 @@ export async function getTaskExecutionSchema( ), options, positional: selectedProject.projectName, - command + command, + cliName: workspaceType }; case 'Run': @@ -108,11 +107,12 @@ export async function getTaskExecutionSchema( ), command: 'run', positional: `${selection.projectName}:${selection.command}`, - options: builderOptions + options: builderOptions, + cliName: workspaceType }; }); case 'Generate': - return selectSchematic(cliTaskProvider.getWorkspacePath()).then( + return selectSchematic(cliTaskProvider.getWorkspaceJsonPath()).then( schematic => { if (!schematic) { return; @@ -131,7 +131,7 @@ export async function getTaskExecutionSchema( } }); - return schematic; + return { ...schematic, cliName: workspaceType }; } ); } @@ -142,7 +142,7 @@ export async function getTaskExecutionSchema( window .showErrorMessage( - 'Angular Console encountered an error parsing your node modules', + 'Nx Console encountered an error parsing your node modules', 'See details' ) .then(value => { diff --git a/apps/vscode/src/app/workspace-tree/workspace-tree-item.ts b/apps/vscode/src/app/workspace-tree/workspace-tree-item.ts index 7f269b0ce8..765d335300 100644 --- a/apps/vscode/src/app/workspace-tree/workspace-tree-item.ts +++ b/apps/vscode/src/app/workspace-tree/workspace-tree-item.ts @@ -4,44 +4,36 @@ import { TreeItem, TreeItemCollapsibleState, TreeView, Uri } from 'vscode'; export type WorkspaceRouteTitle = | 'Add' | 'Build' - | 'Deploy' | 'E2e' | 'Generate' | 'Lint' | 'Run' | 'Serve' | 'Test' - | 'Xi18n' | 'Change workspace' | 'Select workspace'; const ROUTE_TO_ICON_MAP = new Map([ ['Add', 'angular-cli.svg'], ['Build', 'angular-cli.svg'], - ['Deploy', 'angular-cli.svg'], ['E2e', 'angular-cli.svg'], ['Generate', 'angular-cli.svg'], ['Lint', 'angular-cli.svg'], ['Run', 'angular-cli.svg'], ['Serve', 'angular-cli.svg'], - ['Test', 'angular-cli.svg'], - ['Xi18n', 'angular-cli.svg'], - ['Select workspace', 'angular-console.png'], - ['Change workspace', 'angular-console.png'] + ['Test', 'angular-cli.svg'] ]); -export const ROUTE_LIST = [ +export const ROUTE_LIST: WorkspaceRouteTitle[] = [ 'Add', 'Build', - 'Deploy', 'E2e', 'Generate', 'Lint', 'Run', 'Serve', - 'Test', - 'Xi18n' -] as WorkspaceRouteTitle[]; + 'Test' +]; export class WorkspaceTreeItem extends TreeItem { revealWorkspaceRoute(currentWorkspace: TreeView) { @@ -56,7 +48,7 @@ export class WorkspaceTreeItem extends TreeItem { command = { title: this.route, - command: 'angularConsole.revealWebViewPanel', + command: 'nxConsole.revealWebViewPanel', tooltip: '', arguments: [this] }; diff --git a/apps/vscode/src/app/workspace-tree/workspace-tree-provider.ts b/apps/vscode/src/app/workspace-tree/workspace-tree-provider.ts index ce9d223bdd..ace70a9ad1 100644 --- a/apps/vscode/src/app/workspace-tree/workspace-tree-provider.ts +++ b/apps/vscode/src/app/workspace-tree/workspace-tree-provider.ts @@ -1,7 +1,7 @@ -import { WorkspaceTreeItem, ROUTE_LIST } from './workspace-tree-item'; -import { AbstractTreeProvider } from '../abstract-tree-provider'; import { TreeItem } from 'vscode'; -import { join } from 'path'; + +import { AbstractTreeProvider } from '../abstract-tree-provider'; +import { ROUTE_LIST, WorkspaceTreeItem } from './workspace-tree-item'; const SCANNING_FOR_WORKSPACE = new TreeItem( 'Scanning for your Angular Workspace...' @@ -10,13 +10,13 @@ export const LOCATE_YOUR_WORKSPACE = new TreeItem('Select workspace json'); LOCATE_YOUR_WORKSPACE.command = { tooltip: 'Select an workspace json file to open', title: 'Select workspace json', - command: 'angularConsole.selectWorkspaceManually' + command: 'nxConsole.selectWorkspaceManually' }; export const CHANGE_WORKSPACE = new TreeItem('Change workspace'); CHANGE_WORKSPACE.command = { tooltip: 'Select an workspace json file to open', title: 'Change workspace', - command: 'angularConsole.selectWorkspaceManually' + command: 'nxConsole.selectWorkspaceManually' }; export class WorkspaceTreeProvider extends AbstractTreeProvider< @@ -39,17 +39,6 @@ export class WorkspaceTreeProvider extends AbstractTreeProvider< readonly extensionPath: string ) { super(); - - LOCATE_YOUR_WORKSPACE.iconPath = join( - extensionPath, - 'assets', - 'angular-console.png' - ); - CHANGE_WORKSPACE.iconPath = join( - extensionPath, - 'assets', - 'angular-console.png' - ); } getParent(_: WorkspaceTreeItem) { diff --git a/apps/vscode/src/main.ts b/apps/vscode/src/main.ts index f48240f666..fce1528a15 100644 --- a/apps/vscode/src/main.ts +++ b/apps/vscode/src/main.ts @@ -1,4 +1,4 @@ -import { EXTENSIONS } from '@angular-console/server'; +import { EXTENSIONS } from '@nx-console/server'; import { stream } from 'fast-glob'; import { existsSync } from 'fs'; import { dirname, join, parse } from 'path'; @@ -51,14 +51,14 @@ export function activate(c: ExtensionContext) { const store = VSCodeStorage.fromContext(context); initTelemetry(store); - workspaceTreeView = window.createTreeView('angularConsole', { + workspaceTreeView = window.createTreeView('nxConsole', { treeDataProvider: currentWorkspaceTreeProvider }) as TreeView; context.subscriptions.push(workspaceTreeView); context.subscriptions.push( commands.registerCommand( - 'angularConsole.revealWebViewPanel', + 'nxConsole.revealWebViewPanel', async (workspaceTreeItem: WorkspaceTreeItem) => { if ( !existsSync( @@ -121,10 +121,10 @@ export function activate(c: ExtensionContext) { getTelemetry().extensionActivated((Date.now() - startTime) / 1000); } catch (e) { window.showErrorMessage( - 'Angular Console encountered an error when activating (see output panel)' + 'Nx Console encountered an error when activating (see output panel)' ); getOutputChannel().appendLine( - 'Angular Console encountered an error when activating' + 'Nx Console encountered an error when activating' ); getOutputChannel().appendLine(JSON.stringify(e)); getTelemetry().exception(e.message); @@ -204,9 +204,6 @@ async function setWorkspaceJson(workspaceJsonPath: string) { cliTaskProvider ); - workspaceJsonTreeView = window.createTreeView('angularConsoleJson', { - treeDataProvider: workspaceJsonTreeProvider - }) as TreeView; workspaceJsonTreeView = window.createTreeView('workspaceJson', { treeDataProvider: workspaceJsonTreeProvider }) as TreeView; diff --git a/apps/vscode/src/package.json b/apps/vscode/src/package.json index e9e4ee1b86..e3ef0cc933 100644 --- a/apps/vscode/src/package.json +++ b/apps/vscode/src/package.json @@ -1,7 +1,7 @@ { "name": "angular-console", - "displayName": "Angular Console", - "description": "Angular Console for Visual Studio Code. The user interface app for the Angular CLI", + "displayName": "Nx Console", + "description": "Nx Console for Visual Studio Code. The user interface app for the Angular CLI", "version": "10.0.0", "repository": { "type": "git", @@ -47,42 +47,34 @@ "menus": { "view/title": [ { -<<<<<<< HEAD -<<<<<<< HEAD - "command": "angularConsole.refreshWorkspaceJsonTree", -======= - "command": "ng.refreshWorkspaceJsonTree", ->>>>>>> feat(vscode): Support workspace.json for non Angular workspaces -======= - "command": "angularConsole.refreshWorkspaceJsonTree", ->>>>>>> fix: Workspace JSON explorer panel - "when": "view == angularConsoleJson", + "command": "nxConsole.refreshWorkspaceJsonTree", + "when": "view == nxConsoleJson", "group": "navigation" }, { - "command": "angularConsole.refreshWorkspaceJsonTree", + "command": "nxConsole.refreshWorkspaceJsonTree", "when": "view == workspaceJson", "group": "navigation" } ], "view/item/context": [ { - "command": "angularConsole.revealInExplorer", - "when": "view == angularConsoleJson && viewItem == project", + "command": "nxConsole.revealInExplorer", + "when": "view == nxConsoleJson && viewItem == project", "group": "inline" }, { - "command": "angularConsole.runTask", - "when": "view == angularConsoleJson && viewItem == task", + "command": "nxConsole.runTask", + "when": "view == nxConsoleJson && viewItem == task", "group": "inline" }, { - "command": "angularConsole.revealInExplorer", + "command": "nxConsole.revealInExplorer", "when": "view == workspaceJson && viewItem == project", "group": "inline" }, { - "command": "angularConsole.runTask", + "command": "nxConsole.runTask", "when": "view == workspaceJson && viewItem == task", "group": "inline" } @@ -90,7 +82,7 @@ }, "commands": [ { - "command": "angularConsole.refreshWorkspaceJsonTree", + "command": "nxConsole.refreshWorkspaceJsonTree", "title": "Refresh", "icon": { "light": "assets/refresh-light.svg", @@ -98,7 +90,7 @@ } }, { - "command": "angularConsole.revealInExplorer", + "command": "nxConsole.revealInExplorer", "title": "Reveal in Explorer", "icon": { "light": "assets/folder-light.svg", @@ -106,7 +98,7 @@ } }, { - "command": "angularConsole.runTask", + "command": "nxConsole.runTask", "title": "Execute task", "icon": { "light": "assets/continue-light.svg", @@ -271,14 +263,14 @@ } ], "configuration": { - "title": "Angular Console", + "title": "Nx Console", "properties": { - "angularConsole.enableTelemetry": { + "nxConsole.enableTelemetry": { "type": "boolean", "default": true, - "description": "Help make Angular Console better by sending anonymous usage data to the Angular Console team." + "description": "Help make Nx Console better by sending anonymous usage data to the Nx Console team." }, - "angularConsole.useNVM": { + "nxConsole.useNVM": { "type": "boolean", "default": false, "description": "Runs tasks using Node Version Manager" @@ -355,22 +347,17 @@ "viewsContainers": { "activitybar": [ { - "id": "angular-console", - "title": "Angular Console", + "id": "nx-console", + "title": "Nx Console", "icon": "tree-view-icon.svg" } ] }, "views": { - "angular-console": [ + "nx-console": [ { - "id": "angularConsole", - "name": "Navigation" - }, - { - "id": "angularConsoleJson", - "name": "Angular JSON", - "when": "isAngularWorkspace" + "id": "nxConsole", + "name": "UI" }, { "id": "workspaceJson", diff --git a/libs/schema/src/index.ts b/libs/schema/src/index.ts index 810f23fa7a..2f2ac28868 100644 --- a/libs/schema/src/index.ts +++ b/libs/schema/src/index.ts @@ -11,6 +11,7 @@ export interface TaskExecutionSchema { name: string; command: string; positional: string; + cliName: 'nx' | 'ng'; builder?: string; description: string; configurations?: ArchitectConfiguration[]; diff --git a/libs/server/src/lib/find-closest-ng.ts b/libs/server/src/lib/find-closest-ng.ts deleted file mode 100644 index 506945e62f..0000000000 --- a/libs/server/src/lib/find-closest-ng.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { platform } from 'os'; -import { dirname, join } from 'path'; - -import { directoryExists, fileExistsSync } from './utils/utils'; - -export function findClosestNg(dir: string): string { - if (directoryExists(join(dir, 'node_modules'))) { - if (platform() === 'win32') { - if (fileExistsSync(join(dir, 'ng.cmd'))) { - return join(dir, 'ng.cmd'); - } else { - return join(dir, 'node_modules', '.bin', 'ng.cmd'); - } - } else { - if (fileExistsSync(join(dir, 'node_modules', '.bin', 'ng'))) { - return join(dir, 'node_modules', '.bin', 'ng'); - } else { - return join(dir, 'node_modules', '@angular', 'cli', 'bin', 'ng'); - } - } - } else { - const parent = dirname(dir); - if (parent === dir) { - throw new Error(`Cannot find 'ng'`); - } - return findClosestNg(parent); - } -} diff --git a/libs/server/src/lib/telemetry/sinks/google-analytics-sink.ts b/libs/server/src/lib/telemetry/sinks/google-analytics-sink.ts index 2572d0c194..8145df8614 100644 --- a/libs/server/src/lib/telemetry/sinks/google-analytics-sink.ts +++ b/libs/server/src/lib/telemetry/sinks/google-analytics-sink.ts @@ -128,7 +128,7 @@ export class GoogleAnalyticsSink implements Sink, TelemetryMessageBuilder { screenViewed(screen: string): void { this.visitor .screenview({ - an: 'Angular Console', + an: 'Nx Console', cd: screen }) .send(); diff --git a/libs/server/src/lib/telemetry/telemetry.ts b/libs/server/src/lib/telemetry/telemetry.ts index ada9b9fdff..a33d257fb1 100644 --- a/libs/server/src/lib/telemetry/telemetry.ts +++ b/libs/server/src/lib/telemetry/telemetry.ts @@ -3,7 +3,7 @@ import { Sink } from './sink'; import { LoggerSink, GoogleAnalyticsSink, ApplicationPlatform } from './sinks'; import { User, UserState } from './user'; import { TelemetryMessageBuilder } from './message-builder'; -import { Store } from '@angular-console/server'; +import { Store } from '@nx-console/server'; export class Telemetry implements TelemetryMessageBuilder { readonly sinks: Sink[] = []; diff --git a/libs/server/src/lib/telemetry/user.ts b/libs/server/src/lib/telemetry/user.ts index d8525f8f8b..633459090d 100644 --- a/libs/server/src/lib/telemetry/user.ts +++ b/libs/server/src/lib/telemetry/user.ts @@ -1,4 +1,4 @@ -import { Store } from '@angular-console/server'; +import { Store } from '@nx-console/server'; export type UserState = 'untracked' | 'tracked'; diff --git a/libs/server/src/lib/utils/read-projects.ts b/libs/server/src/lib/utils/read-projects.ts index 0b90b9f730..cb3d33800b 100644 --- a/libs/server/src/lib/utils/read-projects.ts +++ b/libs/server/src/lib/utils/read-projects.ts @@ -4,7 +4,7 @@ import { Option, DefaultValue, ArchitectConfiguration -} from '@angular-console/schema'; +} from '@nx-console/schema'; import * as path from 'path'; import { diff --git a/libs/server/src/lib/utils/read-schematic-collections.ts b/libs/server/src/lib/utils/read-schematic-collections.ts index 4c7092ad90..cbf92ff3b8 100644 --- a/libs/server/src/lib/utils/read-schematic-collections.ts +++ b/libs/server/src/lib/utils/read-schematic-collections.ts @@ -1,4 +1,4 @@ -import { Schematic, SchematicCollection } from '@angular-console/schema'; +import { Schematic, SchematicCollection } from '@nx-console/schema'; import { basename, dirname, join } from 'path'; import { diff --git a/libs/server/src/lib/utils/telemetry.ts b/libs/server/src/lib/utils/telemetry.ts index a49c29f6db..ab4b5f5b47 100644 --- a/libs/server/src/lib/utils/telemetry.ts +++ b/libs/server/src/lib/utils/telemetry.ts @@ -61,7 +61,7 @@ export class Telemetry { reportPageView(path: string) { try { if (this.canCollectData()) { - this.visitor.pageview(path, 'Angular Console', '6.0.0').send(); + this.visitor.pageview(path, 'Nx Console', '6.0.0').send(); } } catch (e) { console.error('reportPageView', e); diff --git a/libs/vscode-ui/components/src/lib/autocomplete/autocomplete.component.scss b/libs/vscode-ui/components/src/lib/autocomplete/autocomplete.component.scss index 5fe31d57fc..4b18fc1e20 100644 --- a/libs/vscode-ui/components/src/lib/autocomplete/autocomplete.component.scss +++ b/libs/vscode-ui/components/src/lib/autocomplete/autocomplete.component.scss @@ -1,6 +1,6 @@ @import 'variables'; -angular-console-autocomplete { +nx-console-autocomplete { .description { margin: 0 0 0.5rem 0; user-select: text; diff --git a/libs/vscode-ui/components/src/lib/autocomplete/autocomplete.component.ts b/libs/vscode-ui/components/src/lib/autocomplete/autocomplete.component.ts index 97ab4fc5b1..86d169ad4f 100644 --- a/libs/vscode-ui/components/src/lib/autocomplete/autocomplete.component.ts +++ b/libs/vscode-ui/components/src/lib/autocomplete/autocomplete.component.ts @@ -33,7 +33,7 @@ import { merge, of } from 'rxjs'; -import { Option } from '@angular-console/schema'; +import { Option } from '@nx-console/schema'; export enum AutocompleteNavKeys { Enter = 'Enter', @@ -44,7 +44,7 @@ export enum AutocompleteNavKeys { export const AUTOCOMPLETE_NAV_KEYS = new Set(['Enter', 'ArrowUp', 'ArrowDown']); @Component({ - selector: 'angular-console-autocomplete', + selector: 'nx-console-autocomplete', templateUrl: './autocomplete.component.html', styleUrls: ['./autocomplete.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/libs/vscode-ui/components/src/lib/checkbox/checkbox.component.scss b/libs/vscode-ui/components/src/lib/checkbox/checkbox.component.scss index 086f484dea..eb04d95ab0 100644 --- a/libs/vscode-ui/components/src/lib/checkbox/checkbox.component.scss +++ b/libs/vscode-ui/components/src/lib/checkbox/checkbox.component.scss @@ -1,6 +1,6 @@ @import 'variables'; -angular-console-checkbox { +nx-console-checkbox { .description { margin: 0; user-select: text; diff --git a/libs/vscode-ui/components/src/lib/checkbox/checkbox.component.ts b/libs/vscode-ui/components/src/lib/checkbox/checkbox.component.ts index 6f3881cc45..1bc6425013 100644 --- a/libs/vscode-ui/components/src/lib/checkbox/checkbox.component.ts +++ b/libs/vscode-ui/components/src/lib/checkbox/checkbox.component.ts @@ -6,10 +6,10 @@ import { EventEmitter, ViewEncapsulation } from '@angular/core'; -import { Option } from '@angular-console/schema'; +import { Option } from '@nx-console/schema'; @Component({ - selector: 'angular-console-checkbox', + selector: 'nx-console-checkbox', templateUrl: './checkbox.component.html', styleUrls: ['./checkbox.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/libs/vscode-ui/components/src/lib/field-tree/field-tree.component.ts b/libs/vscode-ui/components/src/lib/field-tree/field-tree.component.ts index 9b98796725..c1b7422930 100644 --- a/libs/vscode-ui/components/src/lib/field-tree/field-tree.component.ts +++ b/libs/vscode-ui/components/src/lib/field-tree/field-tree.component.ts @@ -6,7 +6,7 @@ import { OnChanges, ChangeDetectionStrategy } from '@angular/core'; -import { Option } from '@angular-console/schema'; +import { Option } from '@nx-console/schema'; @Component({ selector: 'vscode-ui-field-tree', @@ -65,7 +65,7 @@ export class FieldTreeComponent implements OnChanges { this.activeFieldName = fieldName; this.userSelectedField = fieldName; const element = document.getElementById( - fieldName + '-angular-console-field' + fieldName + '-nx-console-field' ); if (element) { element.scrollIntoView({ diff --git a/libs/vscode-ui/components/src/lib/field/field.component.html b/libs/vscode-ui/components/src/lib/field/field.component.html index ffb2a372e3..5c84e475ac 100644 --- a/libs/vscode-ui/components/src/lib/field/field.component.html +++ b/libs/vscode-ui/components/src/lib/field/field.component.html @@ -5,31 +5,31 @@ - + > - + > - + > - + > diff --git a/libs/vscode-ui/components/src/lib/field/field.component.ts b/libs/vscode-ui/components/src/lib/field/field.component.ts index 7be26b2816..7d87da3205 100644 --- a/libs/vscode-ui/components/src/lib/field/field.component.ts +++ b/libs/vscode-ui/components/src/lib/field/field.component.ts @@ -1,4 +1,4 @@ -import { Option } from '@angular-console/schema'; +import { Option } from '@nx-console/schema'; import { ChangeDetectionStrategy, ChangeDetectorRef, @@ -17,7 +17,7 @@ import { Subscription } from 'rxjs'; /* Wrapper for select, text input, checkbox, autocomplete */ @Component({ - selector: 'angular-console-field', + selector: 'nx-console-field', templateUrl: './field.component.html', changeDetection: ChangeDetectionStrategy.OnPush, styleUrls: ['field.component.scss'], diff --git a/libs/vscode-ui/components/src/lib/input/input.component.ts b/libs/vscode-ui/components/src/lib/input/input.component.ts index 00fc6095ce..c5eee36a08 100644 --- a/libs/vscode-ui/components/src/lib/input/input.component.ts +++ b/libs/vscode-ui/components/src/lib/input/input.component.ts @@ -5,10 +5,10 @@ import { Output, EventEmitter } from '@angular/core'; -import { Option } from '@angular-console/schema'; +import { Option } from '@nx-console/schema'; @Component({ - selector: 'angular-console-input', + selector: 'nx-console-input', templateUrl: './input.component.html', styleUrls: ['./input.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush diff --git a/libs/vscode-ui/components/src/lib/select/select.component.ts b/libs/vscode-ui/components/src/lib/select/select.component.ts index 6efab09530..c9ab611151 100644 --- a/libs/vscode-ui/components/src/lib/select/select.component.ts +++ b/libs/vscode-ui/components/src/lib/select/select.component.ts @@ -5,10 +5,10 @@ import { Output, EventEmitter } from '@angular/core'; -import { Option } from '@angular-console/schema'; +import { Option } from '@nx-console/schema'; @Component({ - selector: 'angular-console-select', + selector: 'nx-console-select', templateUrl: './select.component.html', styleUrls: ['./select.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush diff --git a/libs/vscode-ui/feature-task-execution-form/src/lib/task-execution-form.component.html b/libs/vscode-ui/feature-task-execution-form/src/lib/task-execution-form.component.html index b29fb85d16..ae8631a541 100644 --- a/libs/vscode-ui/feature-task-execution-form/src/lib/task-execution-form.component.html +++ b/libs/vscode-ui/feature-task-execution-form/src/lib/task-execution-form.component.html @@ -1,4 +1,4 @@ - +
- ng {{ taskExecForm.architect.command }} + {{ taskExecForm.architect.cliName }} + {{ taskExecForm.architect.command }} {{ taskExecForm.architect.positional }} - + + >
(''); readonly activeFieldName$ = this.activeFieldIdSubject.pipe( distinctUntilChanged(), - map(field => field.replace('-angular-console-field', '')) + map(field => field.replace('-nx-console-field', '')) ); private readonly architectSubject = new ReplaySubject(); @@ -201,7 +201,7 @@ export class TaskExecutionFormComponent implements OnInit, AfterViewChecked { } const fields = Array.from( - scrollElement.querySelectorAll('angular-console-field') + scrollElement.querySelectorAll('nx-console-field') ); const top = Number(scrollElement.scrollTop) + diff --git a/libs/vscode-ui/feature-task-execution-form/src/lib/vscode-ui-feature-task-execution-form.module.ts b/libs/vscode-ui/feature-task-execution-form/src/lib/vscode-ui-feature-task-execution-form.module.ts index fab8c58fac..922b1c931c 100644 --- a/libs/vscode-ui/feature-task-execution-form/src/lib/vscode-ui-feature-task-execution-form.module.ts +++ b/libs/vscode-ui/feature-task-execution-form/src/lib/vscode-ui-feature-task-execution-form.module.ts @@ -2,10 +2,10 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { ReactiveFormsModule } from '@angular/forms'; import { TaskExecutionFormComponent } from './task-execution-form.component'; -import { VscodeUiComponentsModule } from '@angular-console/vscode-ui/components'; +import { VscodeUiComponentsModule } from '@nx-console/vscode-ui/components'; import { TASK_EXECUTION_SCHEMA } from './task-execution-form.schema'; -import { TaskExecutionSchema } from '@angular-console/schema'; +import { TaskExecutionSchema } from '@nx-console/schema'; declare global { interface Window { diff --git a/nx.json b/nx.json index 715b185d6f..83c2be567b 100644 --- a/nx.json +++ b/nx.json @@ -1,5 +1,5 @@ { - "npmScope": "angular-console", + "npmScope": "nx-console", "implicitDependencies": { "angular.json": "*", "package.json": "*", diff --git a/package-lock.json b/package-lock.json index 4abce77560..f5cea78ae9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "angular-console", + "name": "nx-console", "version": "9.0.0", "lockfileVersion": 1, "requires": true, diff --git a/package-scripts.js b/package-scripts.js index 84960fc366..fa213704b7 100644 --- a/package-scripts.js +++ b/package-scripts.js @@ -34,7 +34,7 @@ module.exports = { vscode: nps.concurrent({ server: 'ng build vscode --noSourceMap', client: - 'ng build angular-console --configuration=vscode --noSourceMap --optimization=false --noCommonChunk --aot=false --buildOptimizer=false' + 'ng build nx-console --configuration=vscode --noSourceMap --optimization=false --noCommonChunk --aot=false --buildOptimizer=false' }) }, dev: { diff --git a/package.json b/package.json index c03148b569..219929d05b 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "angular-console", + "name": "nx-console", "version": "9.0.0", "publisher": "nrwl", "author": { diff --git a/tools/scripts/vscode-vsce.js b/tools/scripts/vscode-vsce.js index 4755a9d8be..cc7bd9abff 100644 --- a/tools/scripts/vscode-vsce.js +++ b/tools/scripts/vscode-vsce.js @@ -3,7 +3,7 @@ const path = require('path'); cp.execSync( `${path.normalize( '../../../node_modules/.bin/vsce' - )} package --yarn --out angular-console.vsix`, + )} package --yarn --out nx-console.vsix`, { stdio: [0, 1, 2], cwd: path.normalize('dist/apps/vscode') diff --git a/tsconfig.json b/tsconfig.json index e190649c40..2930610e05 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -23,15 +23,15 @@ "types": ["node", "jest"], "baseUrl": ".", "paths": { - "@angular-console/schema": ["libs/schema/src/index.ts"], - "@angular-console/server": ["libs/server/src/index.ts"], - "@angular-console/vscode-ui/feature-task-execution-form": [ + "@nx-console/schema": ["libs/schema/src/index.ts"], + "@nx-console/server": ["libs/server/src/index.ts"], + "@nx-console/vscode-ui/feature-task-execution-form": [ "libs/vscode-ui/feature-task-execution-form/src/index.ts" ], - "@angular-console/vscode-ui/components": [ + "@nx-console/vscode-ui/components": [ "libs/vscode-ui/components/src/index.ts" ], - "@angular-console/vscode-ui/styles": [ + "@nx-console/vscode-ui/styles": [ "libs/vscode-ui/styles/src/index.ts" ] },