diff --git a/.circleci/config.yml b/.circleci/config.yml index b285ed197c..2b7e871c2c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ version: 2 defaults: &defaults working_directory: ~/repo docker: - - image: circleci/node:12.2.0-stretch-browsers + - image: circleci/node:12.6.0-stretch-browsers jobs: build: @@ -16,13 +16,13 @@ jobs: - checkout - restore_cache: keys: - - yarn-dependencies-12.2.0-{{ .Branch }}-{{ checksum "yarn.lock" }} - - yarn-dependencies-12.2.0-{{ .Branch }}- + - yarn-dependencies-12.6.0-{{ .Branch }}-{{ checksum "yarn.lock" }} + - yarn-dependencies-12.6.0-{{ .Branch }}- # fallback to using the latest cache if no exact match is found - - yarn-dependencies-12.2.0- + - yarn-dependencies-12.6.0- - run: yarn install --frozen-lockfile --non-interactive - save_cache: - key: yarn-dependencies-12.2.0-{{ .Branch }}-{{ checksum "yarn.lock" }} + key: yarn-dependencies-12.6.0-{{ .Branch }}-{{ checksum "yarn.lock" }} paths: - ~/.cache - run: yarn start format.and.lint.check @@ -40,10 +40,10 @@ jobs: - checkout - restore_cache: keys: - - yarn-dependencies-12.2.0-{{ .Branch }}-{{ checksum "yarn.lock" }} - - yarn-dependencies-12.2.0-{{ .Branch }}- + - yarn-dependencies-12.6.0-{{ .Branch }}-{{ checksum "yarn.lock" }} + - yarn-dependencies-12.6.0-{{ .Branch }}- # fallback to using the latest cache if no exact match is found - - yarn-dependencies-12.2.0- + - yarn-dependencies-12.6.0- - run: yarn install --frozen-lockfile --non-interactive - run: yarn start prepare.e2e - run: diff --git a/angular.json b/angular.json index 4c332e0dfb..8cf649e702 100644 --- a/angular.json +++ b/angular.json @@ -170,7 +170,7 @@ }, "configurations": { "production": { - "externalDependencies": ["vscode", "source-map-explorer"], + "externalDependencies": ["vscode"], "sourceMap": false, "optimization": true, "extractLicenses": true, @@ -216,12 +216,7 @@ }, "configurations": { "production": { - "externalDependencies": [ - "electron", - "source-map-explorer", - "tmp", - "node-pty" - ], + "externalDependencies": ["electron", "tmp", "node-pty"], "sourceMap": false, "optimization": true, "extractLicenses": true, @@ -267,7 +262,7 @@ "optimization": true, "extractLicenses": true, "sourceMap": false, - "externalDependencies": ["source-map-explorer", "ij-rpc-client"], + "externalDependencies": ["ij-rpc-client"], "fileReplacements": [ { "replace": "apps/intellij/src/environments/environment.ts", diff --git a/apps/angular-console/src/assets/angular_logo.svg b/apps/angular-console/src/assets/angular_logo.svg deleted file mode 100644 index bf081acb12..0000000000 --- a/apps/angular-console/src/assets/angular_logo.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - diff --git a/apps/angular-console/src/assets/baseline-toggle_off-24px.svg b/apps/angular-console/src/assets/baseline-toggle_off-24px.svg deleted file mode 100644 index 346e5f93ac..0000000000 --- a/apps/angular-console/src/assets/baseline-toggle_off-24px.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/apps/angular-console/src/assets/explorer.png b/apps/angular-console/src/assets/external-programs/explorer.png similarity index 100% rename from apps/angular-console/src/assets/explorer.png rename to apps/angular-console/src/assets/external-programs/explorer.png diff --git a/apps/angular-console/src/assets/finder.png b/apps/angular-console/src/assets/external-programs/finder.png similarity index 100% rename from apps/angular-console/src/assets/finder.png rename to apps/angular-console/src/assets/external-programs/finder.png diff --git a/apps/angular-console/src/assets/intellij.png b/apps/angular-console/src/assets/external-programs/intellij.png similarity index 100% rename from apps/angular-console/src/assets/intellij.png rename to apps/angular-console/src/assets/external-programs/intellij.png diff --git a/apps/angular-console/src/assets/nautilus.png b/apps/angular-console/src/assets/external-programs/nautilus.png similarity index 100% rename from apps/angular-console/src/assets/nautilus.png rename to apps/angular-console/src/assets/external-programs/nautilus.png diff --git a/apps/angular-console/src/assets/terminal.png b/apps/angular-console/src/assets/external-programs/terminal.png similarity index 100% rename from apps/angular-console/src/assets/terminal.png rename to apps/angular-console/src/assets/external-programs/terminal.png diff --git a/apps/angular-console/src/assets/vscode-insiders.png b/apps/angular-console/src/assets/external-programs/vscode-insiders.png similarity index 100% rename from apps/angular-console/src/assets/vscode-insiders.png rename to apps/angular-console/src/assets/external-programs/vscode-insiders.png diff --git a/apps/angular-console/src/assets/vscode.png b/apps/angular-console/src/assets/external-programs/vscode.png similarity index 100% rename from apps/angular-console/src/assets/vscode.png rename to apps/angular-console/src/assets/external-programs/vscode.png diff --git a/apps/angular-console/src/assets/webstorm.png b/apps/angular-console/src/assets/external-programs/webstorm.png similarity index 100% rename from apps/angular-console/src/assets/webstorm.png rename to apps/angular-console/src/assets/external-programs/webstorm.png diff --git a/apps/angular-console/src/assets/nrwl_background.svg b/apps/angular-console/src/assets/nrwl_background.svg deleted file mode 100644 index bb8fbef067..0000000000 --- a/apps/angular-console/src/assets/nrwl_background.svg +++ /dev/null @@ -1,49 +0,0 @@ - - - - bgArt_footerPattern - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/apps/angular-console/src/assets/nrwl_logo.png b/apps/angular-console/src/assets/nrwl_logo.png deleted file mode 100644 index 4d4e2bc7a0..0000000000 Binary files a/apps/angular-console/src/assets/nrwl_logo.png and /dev/null differ diff --git a/apps/angular-console/src/assets/xterm.css b/apps/angular-console/src/assets/xterm.css deleted file mode 100644 index 9fd675010c..0000000000 --- a/apps/angular-console/src/assets/xterm.css +++ /dev/null @@ -1,162 +0,0 @@ -/** - * Copyright (c) 2014 The xterm.js authors. All rights reserved. - * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License) - * https://github.com/chjj/term.js - * @license MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - * - * Originally forked from (with the author's permission): - * Fabrice Bellard's javascript vt100 for jslinux: - * http://bellard.org/jslinux/ - * Copyright (c) 2011 Fabrice Bellard - * The original design remains. The terminal itself - * has been extended to include xterm CSI codes, among - * other features. - */ - -/** - * Default styles for xterm.js - */ - -.xterm { - font-family: SFMono-Regular, Consolas, Liberation Mono, Menlo, 'Roboto Mono', - Courier, monospace; - font-feature-settings: 'liga' 0; - position: relative; - user-select: none; - -ms-user-select: none; - -webkit-user-select: none; -} - -.xterm.focus, -.xterm:focus { - outline: none; -} - -.xterm .xterm-helpers { - position: absolute; - top: 0; - /** - * The z-index of the helpers must be higher than the canvases in order for - * IMEs to appear on top. - */ - z-index: 10; -} - -.xterm .xterm-helper-textarea { - /* - * HACK: to fix IE's blinking cursor - * Move textarea out of the screen to the far left, so that the cursor is not visible. - */ - position: absolute; - opacity: 0; - left: -9999em; - top: 0; - width: 0; - height: 0; - z-index: -10; - /** Prevent wrapping so the IME appears against the textarea at the correct position */ - white-space: nowrap; - overflow: hidden; - resize: none; -} - -.xterm .composition-view { - /* TODO: Composition position got messed up somewhere */ - background: #000; - color: #fff; - display: none; - position: absolute; - white-space: nowrap; - z-index: 1; -} - -.xterm .composition-view.active { - display: block; -} - -.xterm .xterm-viewport { - /* On OS X this is required in order for the scroll bar to appear fully opaque */ - background-color: #000; - overflow-y: scroll; - cursor: default; - position: absolute; - right: 0; - left: 0; - top: 0; - bottom: 0; -} - -.xterm .xterm-screen { - position: relative; - - padding-left: 12px; -} - -.xterm .xterm-screen canvas { - position: absolute; - left: 0; - top: 0; -} - -.xterm .xterm-scroll-area { - visibility: hidden; -} - -.xterm-char-measure-element { - display: inline-block; - visibility: hidden; - position: absolute; - top: 0; - left: -9999em; - line-height: normal; -} - -.xterm { - cursor: text; -} - -.xterm.enable-mouse-events { - /* When mouse events are enabled (eg. tmux), revert to the standard pointer cursor */ - cursor: default; -} - -.xterm.xterm-cursor-pointer { - cursor: pointer; -} - -.xterm .xterm-accessibility, -.xterm .xterm-message { - position: absolute; - left: 0; - top: 0; - bottom: 0; - right: 0; - z-index: 100; - color: transparent; -} - -.xterm .live-region { - position: absolute; - left: -9999px; - width: 1px; - height: 1px; - overflow: hidden; -} diff --git a/apps/angular-console/src/index.html b/apps/angular-console/src/index.html index d16b5e5f5f..ebe8222806 100644 --- a/apps/angular-console/src/index.html +++ b/apps/angular-console/src/index.html @@ -6,7 +6,6 @@ - diff --git a/apps/angular-console/tsconfig.app.json b/apps/angular-console/tsconfig.app.json index 0dc7a25abd..ef761d0bfa 100644 --- a/apps/angular-console/tsconfig.app.json +++ b/apps/angular-console/tsconfig.app.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "module": "es2015", + "module": "esnext", "types": [] }, "exclude": ["src/test.ts", "**/*.spec.ts"], diff --git a/apps/electron/src/package.json b/apps/electron/src/package.json index e00755aac5..3dafa820e3 100644 --- a/apps/electron/src/package.json +++ b/apps/electron/src/package.json @@ -10,7 +10,6 @@ "license": "MIT", "dependencies": { "tmp": "0.1.0", - "node-pty": "0.8.1", - "source-map-explorer": "1.8.0" + "node-pty": "0.8.1" } } diff --git a/apps/electron/tsconfig.app.json b/apps/electron/tsconfig.app.json index 54ffbe8e37..c637474e12 100644 --- a/apps/electron/tsconfig.app.json +++ b/apps/electron/tsconfig.app.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "module": "commonjs", + "module": "esnext", "types": ["node"], "sourceMap": false, "declaration": false, diff --git a/apps/intellij/tsconfig.app.json b/apps/intellij/tsconfig.app.json index 5b202ca164..d192cc40fe 100644 --- a/apps/intellij/tsconfig.app.json +++ b/apps/intellij/tsconfig.app.json @@ -2,9 +2,9 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../../dist/out-tsc", - "module": "commonjs", + "module": "esnext", "moduleResolution": "node", - "target": "es2015", + "target": "es2019", "removeComments": true, "stripInternal": true, "importHelpers": true, diff --git a/apps/vscode/src/app/get-store-for-context.ts b/apps/vscode/src/app/get-store-for-context.ts new file mode 100644 index 0000000000..934bbb7655 --- /dev/null +++ b/apps/vscode/src/app/get-store-for-context.ts @@ -0,0 +1,10 @@ +import { ExtensionContext } from 'vscode'; + +export function getStoreForContext(context: ExtensionContext) { + return { + get: (key: string, defaultValue: any) => + context.globalState.get(key) || defaultValue, + set: (key: string, value: any) => context.globalState.update(key, value), + delete: (key: string) => context.globalState.update(key, undefined) + }; +} diff --git a/apps/vscode/src/app/pseudo-terminal.factory.ts b/apps/vscode/src/app/pseudo-terminal.factory.ts index cacd090aa7..5a85c1cc7f 100644 --- a/apps/vscode/src/app/pseudo-terminal.factory.ts +++ b/apps/vscode/src/app/pseudo-terminal.factory.ts @@ -7,7 +7,7 @@ import { import { platform } from 'os'; import { ExtensionContext, Terminal, window } from 'vscode'; -import { getStoreForContext } from './start-server'; +import { getStoreForContext } from './get-store-for-context'; export function getPseudoTerminalFactory( context: ExtensionContext diff --git a/apps/vscode/src/app/start-server.ts b/apps/vscode/src/app/start-server.ts index 23573b314c..840219544d 100644 --- a/apps/vscode/src/app/start-server.ts +++ b/apps/vscode/src/app/start-server.ts @@ -1,23 +1,16 @@ -import { commands, ExtensionContext, window } from 'vscode'; import { createServerModule, - SelectDirectory, - QueryResolver + QueryResolver, + SelectDirectory } from '@angular-console/server'; -import { getPseudoTerminalFactory } from './pseudo-terminal.factory'; import { NestFactory } from '@nestjs/core'; import * as path from 'path'; +import { commands, ExtensionContext, window } from 'vscode'; -const getPort = require('get-port'); // tslint:disable-line +import { getStoreForContext } from './get-store-for-context'; +import { getPseudoTerminalFactory } from './pseudo-terminal.factory'; -export function getStoreForContext(context: ExtensionContext) { - return { - get: (key: string, defaultValue: any) => - context.globalState.get(key) || defaultValue, - set: (key: string, value: any) => context.globalState.update(key, value), - delete: (key: string) => context.globalState.update(key, undefined) - }; -} +const getPort = require('get-port'); // tslint:disable-line export async function startServer( context: ExtensionContext, @@ -104,7 +97,7 @@ export async function startServer( const app = await NestFactory.create(createServerModule(exports, providers), { cors: true }); - app.useStaticAssets(assetsPath); + (app as any).useStaticAssets(assetsPath); return await app.listen(port, () => { console.log(`Listening on port ${port}`); diff --git a/apps/vscode/src/app/webview.factory.ts b/apps/vscode/src/app/webview.factory.ts index dd39a09d00..ef3aacaa22 100644 --- a/apps/vscode/src/app/webview.factory.ts +++ b/apps/vscode/src/app/webview.factory.ts @@ -1,10 +1,7 @@ import { WorkspaceDefinition } from '@angular-console/schema'; import { ExtensionContext, ViewColumn, WebviewPanel, window } from 'vscode'; -import { - WorkspaceRoute, - WorkspaceRouteTitle -} from './tree-item/workspace-route'; +import { WorkspaceRoute, WorkspaceRouteTitle } from './tree-item/workspace-route'; let webviewPanel: WebviewPanel | undefined; @@ -61,7 +58,6 @@ export function getIframeHtml(serverUrl: string, routePath: string) { -