From c4f4ad975ea36cf3f230994e2ef80fa7406a2a43 Mon Sep 17 00:00:00 2001 From: Olivier Combe Date: Tue, 1 Oct 2024 16:46:57 +0200 Subject: [PATCH] fix: bit start tsconfig generation --- .bitmap | 205 +++--------------- .../angular-app-type/angular.application.ts | 2 +- .../app-types/angular-app-type/component.json | 2 +- angular/devkit/common/component.json | 2 +- angular/devkit/common/utils.ts | 89 ++++---- .../devkit/compiler/elements/component.json | 2 +- .../compiler/multi-compiler/component.json | 2 +- .../devkit/compiler/ng-packagr/component.json | 2 +- angular/devkit/preview/preview/component.json | 2 +- angular/devkit/webpack/component.json | 2 +- angular/devkit/webpack/ng-webpack-bundler.ts | 2 +- .../devkit/webpack/ng-webpack-dev-server.ts | 2 +- angular/envs/angular-env/component.json | 2 +- angular/envs/angular-v13-env/component.json | 2 +- angular/envs/angular-v14-env/component.json | 2 +- angular/envs/angular-v15-env/component.json | 2 +- angular/envs/angular-v16-env/component.json | 2 +- angular/envs/angular-v17-env/component.json | 2 +- angular/envs/angular-v18-env/component.json | 2 +- angular/envs/base-env/component.json | 2 +- .../examples/my-angular-env/component.json | 2 +- .../my-angular-v13-env/component.json | 2 +- .../my-angular-v14-env/component.json | 2 +- .../my-angular-v15-env/component.json | 2 +- .../my-angular-v16-env/component.json | 2 +- .../my-angular-v17-env/component.json | 2 +- .../my-angular-v18-env/component.json | 2 +- 27 files changed, 106 insertions(+), 238 deletions(-) diff --git a/.bitmap b/.bitmap index 9aab988..579c841 100644 --- a/.bitmap +++ b/.bitmap @@ -12,42 +12,42 @@ "angular-env": { "name": "angular-env", "scope": "bitdev.angular", - "version": "6.0.10", + "version": "6.0.11", "mainFile": "index.ts", "rootDir": "angular/envs/angular-env" }, "app-types/angular-app-type": { "name": "app-types/angular-app-type", "scope": "bitdev.angular", - "version": "6.0.8", + "version": "6.0.9", "mainFile": "index.ts", "rootDir": "angular/app-types/angular-app-type" }, "dev-services/common": { "name": "dev-services/common", "scope": "bitdev.angular", - "version": "6.0.5", + "version": "6.0.6", "mainFile": "index.ts", "rootDir": "angular/devkit/common" }, "dev-services/compiler/elements": { "name": "dev-services/compiler/elements", "scope": "bitdev.angular", - "version": "6.0.5", + "version": "6.0.6", "mainFile": "index.ts", "rootDir": "angular/devkit/compiler/elements" }, "dev-services/compiler/multi-compiler": { "name": "dev-services/compiler/multi-compiler", "scope": "bitdev.angular", - "version": "6.0.6", + "version": "6.0.7", "mainFile": "index.ts", "rootDir": "angular/devkit/compiler/multi-compiler" }, "dev-services/compiler/ng-packagr": { "name": "dev-services/compiler/ng-packagr", "scope": "bitdev.angular", - "version": "6.0.6", + "version": "6.0.7", "mainFile": "index.ts", "rootDir": "angular/devkit/compiler/ng-packagr" }, @@ -75,7 +75,7 @@ "dev-services/preview/preview": { "name": "dev-services/preview/preview", "scope": "bitdev.angular", - "version": "6.0.5", + "version": "6.0.6", "mainFile": "index.ts", "rootDir": "angular/devkit/preview/preview" }, @@ -96,296 +96,149 @@ "dev-services/webpack": { "name": "dev-services/webpack", "scope": "bitdev.angular", - "version": "6.0.5", + "version": "6.0.6", "mainFile": "index.ts", "rootDir": "angular/devkit/webpack" }, - "docs/angular-docs-routes": { - "name": "docs/angular-docs-routes", - "scope": "bitdev.angular", - "version": "1.0.0", - "mainFile": "index.ts", - "rootDir": "angular/docs/angular-docs-routes" - }, - "docs/angular-env-docs-data": { - "name": "docs/angular-env-docs-data", - "scope": "bitdev.angular", - "version": "1.0.0", - "mainFile": "index.ts", - "rootDir": "angular/docs/angular-env-docs-data" - }, - "docs/angular-versions": { - "name": "docs/angular-versions", - "scope": "bitdev.angular", - "version": "1.0.0", - "mainFile": "index.ts", - "rootDir": "angular/docs/angular-versions" - }, - "docs/bit-angular-introduction": { - "name": "docs/bit-angular-introduction", - "scope": "bitdev.angular", - "version": "0.0.4", - "mainFile": "index.ts", - "rootDir": "angular/docs/bit-angular-introduction" - }, - "docs/build-pipelines": { - "name": "docs/build-pipelines", - "scope": "bitdev.angular", - "version": "1.0.0", - "mainFile": "index.ts", - "rootDir": "angular/docs/build-pipelines" - }, - "docs/component-generators": { - "name": "docs/component-generators", - "scope": "bitdev.angular", - "version": "1.0.0", - "mainFile": "index.ts", - "rootDir": "angular/docs/component-generators" - }, - "docs/component-libs": { - "name": "docs/component-libs", - "scope": "bitdev.angular", - "version": "0.0.3", - "mainFile": "index.ts", - "rootDir": "angular/docs/component-libs" - }, - "docs/components-documentation": { - "name": "docs/components-documentation", - "scope": "bitdev.angular", - "version": "0.0.3", - "mainFile": "index.ts", - "rootDir": "angular/docs/components-documentation" - }, - "docs/components-overview": { - "name": "docs/components-overview", - "scope": "bitdev.angular", - "version": "1.0.0", - "mainFile": "index.ts", - "rootDir": "angular/docs/components-overview" - }, - "docs/components-preview": { - "name": "docs/components-preview", - "scope": "bitdev.angular", - "version": "1.0.0", - "mainFile": "index.ts", - "rootDir": "angular/docs/components-preview" - }, - "docs/create-custom-env": { - "name": "docs/create-custom-env", - "scope": "bitdev.angular", - "version": "1.0.0", - "mainFile": "index.ts", - "rootDir": "angular/docs/create-custom-env" - }, - "docs/create-ng-app": { - "name": "docs/create-ng-app", - "scope": "bitdev.angular", - "version": "1.0.0", - "mainFile": "index.ts", - "rootDir": "angular/docs/create-ng-app" - }, - "docs/dependency-policy": { - "name": "docs/dependency-policy", - "scope": "bitdev.angular", - "version": "1.0.0", - "mainFile": "index.ts", - "rootDir": "angular/docs/dependency-policy" - }, - "docs/development-tools": { - "name": "docs/development-tools", - "scope": "bitdev.angular", - "version": "1.0.0", - "mainFile": "index.ts", - "rootDir": "angular/docs/development-tools" - }, - "docs/ng-app-build": { - "name": "docs/ng-app-build", - "scope": "bitdev.angular", - "version": "1.0.0", - "mainFile": "index.ts", - "rootDir": "angular/docs/ng-app-build" - }, - "docs/ng-app-deploy": { - "name": "docs/ng-app-deploy", - "scope": "bitdev.angular", - "version": "1.0.0", - "mainFile": "index.ts", - "rootDir": "angular/docs/ng-app-deploy" - }, - "docs/ng-base-components": { - "name": "docs/ng-base-components", - "scope": "bitdev.angular", - "version": "0.0.3", - "mainFile": "index.ts", - "rootDir": "angular/docs/ng-base-components" - }, - "docs/ng-component-libraries": { - "name": "docs/ng-component-libraries", - "scope": "bitdev.angular", - "version": "1.0.0", - "mainFile": "index.ts", - "rootDir": "angular/docs/ng-component-libraries" - }, - "docs/ng-design-overview": { - "name": "docs/ng-design-overview", - "scope": "bitdev.angular", - "version": "1.0.0", - "mainFile": "index.ts", - "rootDir": "angular/docs/ng-design-overview" - }, - "docs/ng-theming": { - "name": "docs/ng-theming", - "scope": "bitdev.angular", - "version": "1.0.0", - "mainFile": "index.ts", - "rootDir": "angular/docs/ng-theming" - }, - "docs/workspace-starters": { - "name": "docs/workspace-starters", - "scope": "bitdev.angular", - "version": "1.0.0", - "mainFile": "index.ts", - "rootDir": "angular/docs/workspace-starters" - }, "envs/angular-v13-env": { "name": "envs/angular-v13-env", "scope": "bitdev.angular", - "version": "6.0.10", + "version": "6.0.11", "mainFile": "index.ts", "rootDir": "angular/envs/angular-v13-env" }, "envs/angular-v14-env": { "name": "envs/angular-v14-env", "scope": "bitdev.angular", - "version": "6.0.10", + "version": "6.0.11", "mainFile": "index.ts", "rootDir": "angular/envs/angular-v14-env" }, "envs/angular-v15-env": { "name": "envs/angular-v15-env", "scope": "bitdev.angular", - "version": "6.0.10", + "version": "6.0.11", "mainFile": "index.ts", "rootDir": "angular/envs/angular-v15-env" }, "envs/angular-v16-env": { "name": "envs/angular-v16-env", "scope": "bitdev.angular", - "version": "6.0.10", + "version": "6.0.11", "mainFile": "index.ts", "rootDir": "angular/envs/angular-v16-env" }, "envs/angular-v17-env": { "name": "envs/angular-v17-env", "scope": "bitdev.angular", - "version": "5.0.10", + "version": "5.0.11", "mainFile": "index.ts", "rootDir": "angular/envs/angular-v17-env" }, "envs/angular-v18-env": { "name": "envs/angular-v18-env", "scope": "bitdev.angular", - "version": "1.0.10", + "version": "1.0.11", "mainFile": "index.ts", "rootDir": "angular/envs/angular-v18-env" }, "envs/base-env": { "name": "envs/base-env", "scope": "bitdev.angular", - "version": "6.0.8", + "version": "6.0.9", "mainFile": "index.ts", "rootDir": "angular/envs/base-env" }, "examples/my-angular-env": { "name": "examples/my-angular-env", "scope": "bitdev.angular", - "version": "6.0.10", + "version": "6.0.11", "mainFile": "index.ts", "rootDir": "angular/examples/my-angular-env" }, "examples/my-angular-v13-env": { "name": "examples/my-angular-v13-env", "scope": "bitdev.angular", - "version": "5.0.10", + "version": "5.0.11", "mainFile": "index.ts", "rootDir": "angular/examples/my-angular-v13-env" }, "examples/my-angular-v14-env": { "name": "examples/my-angular-v14-env", "scope": "bitdev.angular", - "version": "6.0.10", + "version": "6.0.11", "mainFile": "index.ts", "rootDir": "angular/examples/my-angular-v14-env" }, "examples/my-angular-v15-env": { "name": "examples/my-angular-v15-env", "scope": "bitdev.angular", - "version": "6.0.10", + "version": "6.0.11", "mainFile": "index.ts", "rootDir": "angular/examples/my-angular-v15-env" }, "examples/my-angular-v16-env": { "name": "examples/my-angular-v16-env", "scope": "bitdev.angular", - "version": "5.0.10", + "version": "5.0.11", "mainFile": "index.ts", "rootDir": "angular/examples/my-angular-v16-env" }, "examples/my-angular-v17-env": { "name": "examples/my-angular-v17-env", "scope": "bitdev.angular", - "version": "5.0.10", + "version": "5.0.11", "mainFile": "index.ts", "rootDir": "angular/examples/my-angular-v17-env" }, "examples/my-angular-v18-env": { "name": "examples/my-angular-v18-env", "scope": "bitdev.angular", - "version": "1.0.10", + "version": "1.0.11", "mainFile": "index.ts", "rootDir": "angular/examples/my-angular-v18-env" }, "integration/demo-app": { "name": "integration/demo-app", "scope": "bitdev.angular", - "version": "0.0.2", + "version": "0.0.3", "mainFile": "index.ts", "rootDir": "angular/integration/demo-app" }, "integration/demo-lib": { "name": "integration/demo-lib", "scope": "bitdev.angular", - "version": "0.0.7", + "version": "0.0.8", "mainFile": "public-api.ts", "rootDir": "angular/integration/demo-lib" }, "integration/demo-lib-v15": { "name": "integration/demo-lib-v15", "scope": "bitdev.angular", - "version": "0.0.7", + "version": "0.0.8", "mainFile": "public-api.ts", "rootDir": "angular/integration/demo-lib-v15" }, "integration/demo-lib-v16": { "name": "integration/demo-lib-v16", "scope": "bitdev.angular", - "version": "0.0.7", + "version": "0.0.8", "mainFile": "public-api.ts", "rootDir": "angular/integration/demo-lib-v16" }, "integration/demo-lib-v17": { "name": "integration/demo-lib-v17", "scope": "bitdev.angular", - "version": "0.0.7", + "version": "0.0.8", "mainFile": "public-api.ts", "rootDir": "angular/integration/demo-lib-v17" }, "integration/demo-lib-v18": { "name": "integration/demo-lib-v18", "scope": "bitdev.angular", - "version": "0.0.7", + "version": "0.0.8", "mainFile": "public-api.ts", "rootDir": "angular/integration/demo-lib-v18" }, "$schema-version": "17.0.0" -} +} \ No newline at end of file diff --git a/angular/app-types/angular-app-type/angular.application.ts b/angular/app-types/angular-app-type/angular.application.ts index a9e9d45..fcd4895 100644 --- a/angular/app-types/angular-app-type/angular.application.ts +++ b/angular/app-types/angular-app-type/angular.application.ts @@ -171,7 +171,7 @@ export class AngularApp implements Application { ignoreVersion: true }); const appTsconfigPath = join(appRootPath, this.options.angularServeOptions.tsConfig); - const workspaceCmpsIDs = await workspace.listIds(); + const workspaceCmpsIDs = workspace.listIds(); const bitCmps = await workspace.getMany(workspaceCmpsIDs); const tempFolder = this.getTempFolder(workspace); const tsconfigPath = this.getTsconfigPath(tempFolder); diff --git a/angular/app-types/angular-app-type/component.json b/angular/app-types/angular-app-type/component.json index f1bc5f7..50e2e32 100644 --- a/angular/app-types/angular-app-type/component.json +++ b/angular/app-types/angular-app-type/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "app-types/angular-app-type", - "version": "6.0.8" + "version": "6.0.9" }, "propagate": false, "extensions": { diff --git a/angular/devkit/common/component.json b/angular/devkit/common/component.json index 64de178..68eefbc 100644 --- a/angular/devkit/common/component.json +++ b/angular/devkit/common/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "dev-services/common", - "version": "6.0.5" + "version": "6.0.6" }, "propagate": false, "extensions": { diff --git a/angular/devkit/common/utils.ts b/angular/devkit/common/utils.ts index b00ab8d..5eb49b1 100644 --- a/angular/devkit/common/utils.ts +++ b/angular/devkit/common/utils.ts @@ -17,7 +17,7 @@ import objectHash from 'object-hash'; import { dirname, join, posix, resolve } from 'path'; export const NG_APP_NAME = 'bit-app'; -export const NG_APP_PATTERN = `*.${ NG_APP_NAME }.*`; +export const NG_APP_PATTERN = `*.${NG_APP_NAME}.*`; export enum BundlerSetup { Serve = 'serve', @@ -100,10 +100,14 @@ export function getNodeModulesPaths(build: boolean, isolator: IsolatorMain, envI } else { // ripple, bit sign, ... const baseDir = scope.getAspectCapsulePath(); // check dated-dirs (ripple only) - const capsulesDatedDir = isolator.getCapsulesRootDir({ baseDir, useDatedDirs: true, datedDirId: aspectsOpts.datedDirId }); + const capsulesDatedDir = isolator.getCapsulesRootDir({ + baseDir, + useDatedDirs: true, + datedDirId: aspectsOpts.datedDirId + }); nodeModulesPaths.push(resolve(capsulesDatedDir, 'node_modules')); - const capsulesDefaultDir = isolator.getCapsulesRootDir({ baseDir }); + const capsulesDefaultDir = isolator.getCapsulesRootDir({ baseDir }); nodeModulesPaths.push(resolve(capsulesDefaultDir, 'node_modules')); } @@ -147,7 +151,7 @@ export function cmpIdToPkgName(componentId: ComponentID) { const name = componentId.fullName.replace(allSlashes, '.'); const scope = componentId.scope.split('.').join('/'); const partsToJoin = scope ? [scope, name] : [name]; - return `@${ partsToJoin.join('.') }`; + return `@${partsToJoin.join('.')}`; } export function isBuildContext(context: any): context is BundlerContext { @@ -203,7 +207,7 @@ export function generateTsConfig( /** * Generates the tsconfig to load the preview app with compositions dynamically. */ -export function writeTsconfig( +export async function writeTsconfig( context: DevServerContext | BundlerContext | AppContext | AppBuildContext, rootPath: string, tempFolder: string, @@ -212,51 +216,62 @@ export function writeTsconfig( devFilesMain: DevFilesMain, tsConfigPath?: string, workspace?: Workspace -): string { +): Promise { const tsPaths: { [key: string]: string[] } = {}; const includePaths = new Set(); const excludePaths = new Set(); const dirPath = join(tempFolder, context.id); - // get the list of files for existing component compositions to include in the compilation - context.components.forEach((component: Component) => { - let outputPath: string; + let components: Component[]; + if (workspace) { + const workspaceCmpsIDs = workspace.listIds(); + components = await workspace.getMany(workspaceCmpsIDs); + } else { + components = context.components; + } - const isApp = componentIsApp(component, application); - if (isApp) { - return; - } - if (isBuildContext(context)) { - const capsules = context.capsuleNetwork.graphCapsules; - const capsule = capsules.getCapsule(component.id); - if (!capsule) { - throw new Error(`No capsule found for ${ component.id } in network graph`); + // get the list of files for existing component compositions to include in the compilation + components.forEach((component: Component) => { + // we only want angular components + if (component.config.main === 'public-api.ts') { + let outputPath: string; + + const isApp = componentIsApp(component, application); + if (isApp) { + return; + } + if (isBuildContext(context)) { + const capsules = context.capsuleNetwork.graphCapsules; + const capsule = capsules.getCapsule(component.id); + if (!capsule) { + throw new Error(`No capsule found for ${component.id} in network graph`); + } + outputPath = normalizePath(capsule.path); + } else { + outputPath = normalizePath(workspace?.componentDir(component.id, { + ignoreVersion: true + }) || ''); } - outputPath = normalizePath(capsule.path); - } else { - outputPath = normalizePath(workspace?.componentDir(component.id, { - ignoreVersion: true - }) || ''); + // map the package names to the workspace component paths for typescript in case a package references another local package + const pkgName = pkg.getPackageName(component); + tsPaths[pkgName] = [`${outputPath}/public-api.ts`]; + tsPaths[`${pkgName}/*`] = [`${outputPath}/*`]; + + includePaths.add(outputPath); + + // get the list of spec patterns + const devPatterns: string[] = devFilesMain.getDevPatterns(component, TesterAspect.id); + devPatterns.forEach(specPattern => { + excludePaths.add(posix.join(outputPath, specPattern)); + }); } - // map the package names to the workspace component paths for typescript in case a package references another local package - const pkgName = pkg.getPackageName(component); - tsPaths[pkgName] = [`${ outputPath }/public-api.ts`]; - tsPaths[`${ pkgName }/*`] = [`${ outputPath }/*`]; - - includePaths.add(outputPath); - - // get the list of spec patterns - const devPatterns: string[] = devFilesMain.getDevPatterns(component, TesterAspect.id); - devPatterns.forEach(specPattern => { - excludePaths.add(posix.join(outputPath, specPattern)); - }); }); const pAppPath = normalizePath(rootPath); const tsConfigAppPath = tsConfigPath ?? join(rootPath, 'tsconfig.app.json'); const content = generateTsConfig(pAppPath, tsConfigAppPath, Array.from(includePaths), Array.from(excludePaths), tsPaths); const hash = objectHash(content); - const targetPath = join(dirPath, `tsconfig/tsconfig-${ timestamp }.json`); + const targetPath = join(dirPath, `tsconfig/tsconfig-${timestamp}.json`); // write only if the link has changed (prevents triggering fs watches) if (writeHash.get(targetPath) !== hash) { @@ -279,7 +294,7 @@ export function dedupPaths(paths: (string | any)[]): string[] { * @return {string} - The absolute path to the specified file or directory. */ export function packagePath(packageName: string, path = ''): string { - return join(dirname(require.resolve(`${ packageName }/package.json`)), path); + return join(dirname(require.resolve(`${packageName}/package.json`)), path); } export function getLoggerApi(logger: Logger) { diff --git a/angular/devkit/compiler/elements/component.json b/angular/devkit/compiler/elements/component.json index 474a2ea..ccd0b2a 100644 --- a/angular/devkit/compiler/elements/component.json +++ b/angular/devkit/compiler/elements/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "dev-services/compiler/elements", - "version": "6.0.5" + "version": "6.0.6" }, "propagate": false, "extensions": { diff --git a/angular/devkit/compiler/multi-compiler/component.json b/angular/devkit/compiler/multi-compiler/component.json index 247b116..1763990 100644 --- a/angular/devkit/compiler/multi-compiler/component.json +++ b/angular/devkit/compiler/multi-compiler/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "dev-services/compiler/multi-compiler", - "version": "6.0.6" + "version": "6.0.7" }, "propagate": false, "extensions": { diff --git a/angular/devkit/compiler/ng-packagr/component.json b/angular/devkit/compiler/ng-packagr/component.json index dfb1922..9255ac6 100644 --- a/angular/devkit/compiler/ng-packagr/component.json +++ b/angular/devkit/compiler/ng-packagr/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "dev-services/compiler/ng-packagr", - "version": "6.0.6" + "version": "6.0.7" }, "propagate": false, "extensions": { diff --git a/angular/devkit/preview/preview/component.json b/angular/devkit/preview/preview/component.json index be9e80a..8ed7f4d 100644 --- a/angular/devkit/preview/preview/component.json +++ b/angular/devkit/preview/preview/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "dev-services/preview/preview", - "version": "6.0.5" + "version": "6.0.6" }, "propagate": false, "extensions": { diff --git a/angular/devkit/webpack/component.json b/angular/devkit/webpack/component.json index 3f359a9..ffee999 100644 --- a/angular/devkit/webpack/component.json +++ b/angular/devkit/webpack/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "dev-services/webpack", - "version": "6.0.5" + "version": "6.0.6" }, "propagate": false, "extensions": { diff --git a/angular/devkit/webpack/ng-webpack-bundler.ts b/angular/devkit/webpack/ng-webpack-bundler.ts index 1e9a016..311c3f6 100644 --- a/angular/devkit/webpack/ng-webpack-bundler.ts +++ b/angular/devkit/webpack/ng-webpack-bundler.ts @@ -99,7 +99,7 @@ export class NgWebpackBundler { tsconfigPath = options?.angularOptions?.tsConfig ?? posix.join(options.appRootPath, 'tsconfig.app.json'); plugins = [new StatsLoggerPlugin()]; } else { // When you use `bit build` for the preview app - tsconfigPath = writeTsconfig(bundlerContext, options.appRootPath, tempFolder, application, pkg, devFilesMain, options?.angularOptions?.tsConfig, workspace); + tsconfigPath = await writeTsconfig(bundlerContext, options.appRootPath, tempFolder, application, pkg, devFilesMain, options?.angularOptions?.tsConfig, workspace); if (options?.angularOptions?.tsConfig) { // eslint-disable-next-line no-param-reassign options.angularOptions.tsConfig = tsconfigPath; diff --git a/angular/devkit/webpack/ng-webpack-dev-server.ts b/angular/devkit/webpack/ng-webpack-dev-server.ts index 9cbf326..c6d7960 100644 --- a/angular/devkit/webpack/ng-webpack-dev-server.ts +++ b/angular/devkit/webpack/ng-webpack-dev-server.ts @@ -99,7 +99,7 @@ export class NgWebpackDevServer { tsconfigPath = options?.angularOptions?.tsConfig ?? posix.join(options.appRootPath, 'tsconfig.app.json'); isApp = true; } else { // When you use `bit start` - tsconfigPath = writeTsconfig(devServerContext, options.appRootPath, tempFolder, application, pkg, devFilesMain, options?.angularOptions?.tsConfig, workspace); + tsconfigPath = await writeTsconfig(devServerContext, options.appRootPath, tempFolder, application, pkg, devFilesMain, options?.angularOptions?.tsConfig, workspace); // eslint-disable-next-line no-param-reassign options.angularOptions = options.angularOptions || {}; if (options?.angularOptions?.tsConfig) { diff --git a/angular/envs/angular-env/component.json b/angular/envs/angular-env/component.json index 571118a..ccfd86a 100644 --- a/angular/envs/angular-env/component.json +++ b/angular/envs/angular-env/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "angular-env", - "version": "6.0.10" + "version": "6.0.11" }, "propagate": false, "extensions": { diff --git a/angular/envs/angular-v13-env/component.json b/angular/envs/angular-v13-env/component.json index 034f3d2..c53b278 100644 --- a/angular/envs/angular-v13-env/component.json +++ b/angular/envs/angular-v13-env/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "envs/angular-v13-env", - "version": "6.0.10" + "version": "6.0.11" }, "propagate": false, "extensions": { diff --git a/angular/envs/angular-v14-env/component.json b/angular/envs/angular-v14-env/component.json index 44abd24..91fe380 100644 --- a/angular/envs/angular-v14-env/component.json +++ b/angular/envs/angular-v14-env/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "envs/angular-v14-env", - "version": "6.0.10" + "version": "6.0.11" }, "propagate": false, "extensions": { diff --git a/angular/envs/angular-v15-env/component.json b/angular/envs/angular-v15-env/component.json index da49c7d..3fbaa30 100644 --- a/angular/envs/angular-v15-env/component.json +++ b/angular/envs/angular-v15-env/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "envs/angular-v15-env", - "version": "6.0.10" + "version": "6.0.11" }, "propagate": false, "extensions": { diff --git a/angular/envs/angular-v16-env/component.json b/angular/envs/angular-v16-env/component.json index e17569f..86cc6b7 100644 --- a/angular/envs/angular-v16-env/component.json +++ b/angular/envs/angular-v16-env/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "envs/angular-v16-env", - "version": "6.0.10" + "version": "6.0.11" }, "propagate": false, "extensions": { diff --git a/angular/envs/angular-v17-env/component.json b/angular/envs/angular-v17-env/component.json index 4d06d9a..c5c1cb7 100644 --- a/angular/envs/angular-v17-env/component.json +++ b/angular/envs/angular-v17-env/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "envs/angular-v17-env", - "version": "5.0.10" + "version": "5.0.11" }, "propagate": false, "extensions": { diff --git a/angular/envs/angular-v18-env/component.json b/angular/envs/angular-v18-env/component.json index 107c246..79692fe 100644 --- a/angular/envs/angular-v18-env/component.json +++ b/angular/envs/angular-v18-env/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "envs/angular-v18-env", - "version": "1.0.10" + "version": "1.0.11" }, "propagate": false, "extensions": { diff --git a/angular/envs/base-env/component.json b/angular/envs/base-env/component.json index ccd70ac..b9176fe 100644 --- a/angular/envs/base-env/component.json +++ b/angular/envs/base-env/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "envs/base-env", - "version": "6.0.8" + "version": "6.0.9" }, "propagate": false, "extensions": { diff --git a/angular/examples/my-angular-env/component.json b/angular/examples/my-angular-env/component.json index e6d597f..581ef1f 100644 --- a/angular/examples/my-angular-env/component.json +++ b/angular/examples/my-angular-env/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "examples/my-angular-env", - "version": "6.0.10" + "version": "6.0.11" }, "propagate": false, "extensions": { diff --git a/angular/examples/my-angular-v13-env/component.json b/angular/examples/my-angular-v13-env/component.json index 346f64e..b386055 100644 --- a/angular/examples/my-angular-v13-env/component.json +++ b/angular/examples/my-angular-v13-env/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "examples/my-angular-v13-env", - "version": "5.0.10" + "version": "5.0.11" }, "propagate": false, "extensions": { diff --git a/angular/examples/my-angular-v14-env/component.json b/angular/examples/my-angular-v14-env/component.json index 5538b76..14030a7 100644 --- a/angular/examples/my-angular-v14-env/component.json +++ b/angular/examples/my-angular-v14-env/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "examples/my-angular-v14-env", - "version": "6.0.10" + "version": "6.0.11" }, "propagate": false, "extensions": { diff --git a/angular/examples/my-angular-v15-env/component.json b/angular/examples/my-angular-v15-env/component.json index 600a7ee..d0b2445 100644 --- a/angular/examples/my-angular-v15-env/component.json +++ b/angular/examples/my-angular-v15-env/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "examples/my-angular-v15-env", - "version": "6.0.10" + "version": "6.0.11" }, "propagate": false, "extensions": { diff --git a/angular/examples/my-angular-v16-env/component.json b/angular/examples/my-angular-v16-env/component.json index c09e3e8..51ce552 100644 --- a/angular/examples/my-angular-v16-env/component.json +++ b/angular/examples/my-angular-v16-env/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "examples/my-angular-v16-env", - "version": "5.0.10" + "version": "5.0.11" }, "propagate": false, "extensions": { diff --git a/angular/examples/my-angular-v17-env/component.json b/angular/examples/my-angular-v17-env/component.json index f2cd66c..2365c39 100644 --- a/angular/examples/my-angular-v17-env/component.json +++ b/angular/examples/my-angular-v17-env/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "examples/my-angular-v17-env", - "version": "5.0.10" + "version": "5.0.11" }, "propagate": false, "extensions": { diff --git a/angular/examples/my-angular-v18-env/component.json b/angular/examples/my-angular-v18-env/component.json index df8ac6b..06fbc8c 100644 --- a/angular/examples/my-angular-v18-env/component.json +++ b/angular/examples/my-angular-v18-env/component.json @@ -2,7 +2,7 @@ "componentId": { "scope": "bitdev.angular", "name": "examples/my-angular-v18-env", - "version": "1.0.10" + "version": "1.0.11" }, "propagate": false, "extensions": {