build: make dist paths align with source file paths

.vscode/launch.json

@@ -12,7 +12,7 @@
         "--extensionDevelopmentPath=${workspaceFolder}"
       ],
       "outFiles": [
-        "${workspaceFolder}/dist/client/*.js"
+        "${workspaceFolder}/dist/client/src/*.js"
       ],
       "preLaunchTask": {
         "type": "npm",
@@ -37,7 +37,7 @@
       "port": 6009,
       "restart": true,
       "outFiles": [
-        "${workspaceFolder}/dist/server/*.js"
+        "${workspaceFolder}/dist/server/src/*.js"
       ]
     },
     {

client/src/client.ts

@@ -11,9 +11,9 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 import * as lsp from 'vscode-languageclient/node';
 
-import {OpenOutputChannel, ProjectLoadingFinish, ProjectLoadingStart, SuggestStrictMode, SuggestStrictModeParams} from '../common/notifications';
-import {GetComponentsWithTemplateFile, GetTcbRequest, GetTemplateLocationForComponent, IsInAngularProject, RunNgccRequest} from '../common/requests';
-import {resolve, Version} from '../common/resolver';
+import {OpenOutputChannel, ProjectLoadingFinish, ProjectLoadingStart, SuggestStrictMode, SuggestStrictModeParams} from '../../common/notifications';
+import {GetComponentsWithTemplateFile, GetTcbRequest, GetTemplateLocationForComponent, IsInAngularProject, RunNgccRequest} from '../../common/requests';
+import {resolve, Version} from '../../common/resolver';
 
 import {isInsideComponentDecorator, isInsideInlineTemplateRegion, isInsideStringLiteral} from './embedded_support';
 

client/src/commands.ts

@@ -8,7 +8,7 @@
 
 import * as vscode from 'vscode';
 
-import {ServerOptions} from '../common/initialize';
+import {ServerOptions} from '../../common/initialize';
 
 import {AngularLanguageClient} from './client';
 import {ANGULAR_SCHEME, TcbContentProvider} from './providers';

client/src/tests/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "extends": "../../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../../dist/client/tests"
+    "outDir": "../../../dist/client/src/tests"
   },
   "references": [
     {

client/tsconfig.json

@@ -2,7 +2,7 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "composite": true,
-    "outDir": "../dist/client",
+    "outDir": "../dist/client/src",
     "rootDir": "src",
     "rootDirs": [
       ".",

common/requests.ts

@@ -43,7 +43,7 @@ export const RunNgccRequest =
 export interface GetTcbResponse {
   uri: lsp.DocumentUri;
   content: string;
-  selections: lsp.Range[]
+  selections: lsp.Range[];
 }
 
 export const IsInAngularProject =

esbuild.js

@@ -12,7 +12,7 @@ const defaultOptions = {
 /** @type esbuild.BuildOptions */
 const clientConfig = {
   ...defaultOptions,
-  entryPoints: ['dist/client/extension.js'],
+  entryPoints: ['dist/client/src/extension.js'],
   outfile: 'dist/npm/index.js',
   external: [
     'fs',
@@ -29,8 +29,8 @@ const clientConfig = {
 /** @type esbuild.BuildOptions */
 const bannerConfig = {
   ...defaultOptions,
-  entryPoints: ['dist/banner/banner.js'],
-  outfile: 'dist/banner/banner.esbuild.js',
+  entryPoints: ['dist/server/src/banner.js'],
+  outfile: 'dist/server/src/banner.esbuild.js',
   external: [
     'path',
   ],
@@ -43,7 +43,7 @@ const bannerConfig = {
 /** @type esbuild.BuildOptions */
 const serverConfig = {
   ...defaultOptions,
-  entryPoints: ['dist/server/server.js'],
+  entryPoints: ['dist/server/src/server.js'],
   outfile: 'dist/npm/server/index.js',
   external: [
     'fs',
@@ -61,7 +61,7 @@ async function build() {
     await esbuild.build(bannerConfig);
     await esbuild.build({
       ...serverConfig,
-      banner: {js: fs.readFileSync('dist/banner/banner.esbuild.js', 'utf8')},
+      banner: {js: fs.readFileSync('dist/server/src/banner.esbuild.js', 'utf8')},
     });
   } catch (e) {
     console.error(e);

package.json

@@ -198,10 +198,10 @@
     "onLanguage:html",
     "onLanguage:typescript"
   ],
-  "main": "./dist/client/extension",
+  "main": "./dist/client/src/extension",
   "scripts": {
     "ng-dev": "cross-env TS_NODE_PROJECT=$PWD/.ng-dev/tsconfig.json TS_NODE_TRANSPILE_ONLY=1 node --no-warnings --loader ts-node/esm node_modules/@angular/dev-infra-private/ng-dev/bundles/cli.mjs",
-    "compile": "tsc -b server/banner.tsconfig.json && tsc -b && node esbuild.js",
+    "compile": "tsc -b && node esbuild.js",
     "compile:test": "tsc -b test.tsconfig.json",
     "compile:integration": "tsc -b integration && yarn --cwd integration/project build",
     "compile:syntaxes-test": "tsc -b syntaxes/test",

scripts/build.sh

@@ -68,7 +68,7 @@ pushd dist/npm
 # on peer dependency conflicts (like `tslint@6` not being supported by `tslint-eslint-rules`).
 npm install --production --ignore-scripts --force
 
-sed -i -e 's#./dist/client/extension#./index#' package.json
+sed -i -e 's#./dist/client/src/extension#./index#' package.json
 ../../node_modules/.bin/vsce package
 
 popd

server/src/banner.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
 import {parseCommandLine} from './cmdline_utils';
 import {resolveTsServer} from './version_provider';
 

server/src/ngcc.ts

@@ -9,7 +9,7 @@
 import {fork} from 'child_process';
 import {dirname, resolve} from 'path';
 
-import {Version} from '../common/resolver';
+import {Version} from '../../common/resolver';
 
 import {resolveNgcc} from './version_provider';
 

server/src/session.ts

@@ -11,9 +11,9 @@ import * as ts from 'typescript/lib/tsserverlibrary';
 import {promisify} from 'util';
 import * as lsp from 'vscode-languageserver/node';
 
-import {ServerOptions} from '../common/initialize';
-import {NgccProgressEnd, OpenOutputChannel, ProjectLanguageService, ProjectLoadingFinish, ProjectLoadingStart, SuggestStrictMode} from '../common/notifications';
-import {GetComponentsWithTemplateFile, GetTcbParams, GetTcbRequest, GetTcbResponse, GetTemplateLocationForComponent, GetTemplateLocationForComponentParams, IsInAngularProject, IsInAngularProjectParams, RunNgccParams, RunNgccRequest} from '../common/requests';
+import {ServerOptions} from '../../common/initialize';
+import {NgccProgressEnd, OpenOutputChannel, ProjectLanguageService, ProjectLoadingFinish, ProjectLoadingStart, SuggestStrictMode} from '../../common/notifications';
+import {GetComponentsWithTemplateFile, GetTcbParams, GetTcbRequest, GetTcbResponse, GetTemplateLocationForComponent, GetTemplateLocationForComponentParams, IsInAngularProject, IsInAngularProjectParams, RunNgccParams, RunNgccRequest} from '../../common/requests';
 
 import {readNgCompletionData, tsCompletionEntryToLspCompletionItem} from './completion';
 import {tsDiagnosticToLspDiagnostic} from './diagnostic';

server/src/tests/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "extends": "../../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../../dist/server/tests",
+    "outDir": "../../../dist/server/src/tests",
     "esModuleInterop": false
   },
   "references": [

server/src/version_provider.ts

@@ -10,7 +10,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import url from 'url';
 
-import {NodeModule, resolve, Version} from '../common/resolver';
+import {NodeModule, resolve, Version} from '../../common/resolver';
 
 const MIN_TS_VERSION = '4.3';
 const MIN_NG_VERSION = '13.0';

server/tsconfig.json

@@ -2,7 +2,7 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "composite": true,
-    "outDir": "../dist/server",
+    "outDir": "../dist/server/src",
     "rootDir": "src",
     "rootDirs": [
       ".",
@@ -19,7 +19,6 @@
     "src/*.ts"
   ],
   "exclude": [
-    "src/banner.ts",
     "node_modules"
   ]
 }