Skip to content

Commit

Permalink
add integration examples & update env test patterns
Browse files Browse the repository at this point in the history
  • Loading branch information
ocombe committed Sep 3, 2024
1 parent 768c55a commit 9aff6a4
Show file tree
Hide file tree
Showing 126 changed files with 115 additions and 1,062 deletions.
86 changes: 69 additions & 17 deletions .bitmap
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
"angular-env": {
"name": "angular-env",
"scope": "bitdev.angular",
"version": "6.0.2",
"version": "b82d566c26cec2544054e84bb883724986691962",
"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.2",
"version": "6.0.3",
"mainFile": "index.ts",
"rootDir": "angular/app-types/angular-app-type"
},
Expand Down Expand Up @@ -250,101 +250,146 @@
"envs/angular-v13-env": {
"name": "envs/angular-v13-env",
"scope": "bitdev.angular",
"version": "6.0.2",
"version": "48cd2655863d31a4664712f252ad1dbae704976e",
"mainFile": "index.ts",
"rootDir": "angular/envs/angular-v13-env"
},
"envs/angular-v14-env": {
"name": "envs/angular-v14-env",
"scope": "bitdev.angular",
"version": "6.0.2",
"version": "b7ef8ad1cae4245d069e5763075b013959d65a3b",
"mainFile": "index.ts",
"rootDir": "angular/envs/angular-v14-env"
},
"envs/angular-v15-env": {
"name": "envs/angular-v15-env",
"scope": "bitdev.angular",
"version": "6.0.2",
"version": "9eeb2c20c29b6836bf853ee25f98a2c4d913c230",
"mainFile": "index.ts",
"rootDir": "angular/envs/angular-v15-env"
},
"envs/angular-v16-env": {
"name": "envs/angular-v16-env",
"scope": "bitdev.angular",
"version": "6.0.2",
"version": "ca6d375d809b84264aa196728716bedce960117f",
"mainFile": "index.ts",
"rootDir": "angular/envs/angular-v16-env"
},
"envs/angular-v17-env": {
"name": "envs/angular-v17-env",
"scope": "bitdev.angular",
"version": "5.0.2",
"version": "24bed6ff7072f1bc1378c8d722c45e7738024a18",
"mainFile": "index.ts",
"rootDir": "angular/envs/angular-v17-env"
},
"envs/angular-v18-env": {
"name": "envs/angular-v18-env",
"scope": "bitdev.angular",
"version": "1.0.2",
"version": "a764eff839148d06eb1f2e0037255bca5626783a",
"mainFile": "index.ts",
"rootDir": "angular/envs/angular-v18-env"
},
"envs/base-env": {
"name": "envs/base-env",
"scope": "bitdev.angular",
"version": "6.0.2",
"version": "1f85bffa7cab3a5db9891da9b315926f90381381",
"mainFile": "index.ts",
"rootDir": "angular/envs/base-env"
},
"examples/my-angular-env": {
"name": "examples/my-angular-env",
"scope": "bitdev.angular",
"version": "6.0.2",
"version": "859b7a7ef6276d42ac43383608e67eedf937dc64",
"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.2",
"version": "55f0f0e622bffdaf9ab4345c5f68294101a4609b",
"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.2",
"version": "e89f16b83171e24a6a3bc81586cb6b1ef3c92efb",
"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.2",
"version": "4433dcf95dc89c223ee37569da04f4aa100c91e3",
"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.2",
"version": "709ece37b4de6da8b8352be45a3fef44ef4de6ad",
"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.2",
"version": "f0c73d62b7e1e92a26216e1d6e045ae9af977efc",
"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.2",
"version": "ba67b840b87042b4fb6c748df9cc7dab1292fa39",
"mainFile": "index.ts",
"rootDir": "angular/examples/my-angular-v18-env"
},
"integration/demo-lib": {
"name": "integration/demo-lib",
"scope": "bitdev.angular",
"version": "56cf7ba13dff1b0be0d4c04e8b995019b82e0ccf",
"mainFile": "public-api.ts",
"rootDir": "angular/integration/demo-lib",
"onLanesOnly": true,
"isAvailableOnCurrentLane": true
},
"integration/demo-lib-v15": {
"name": "integration/demo-lib-v15",
"scope": "bitdev.angular",
"version": "3e44b7e7a187a24708afefeededa7d62ae722d01",
"mainFile": "public-api.ts",
"rootDir": "angular/integration/demo-lib-v15",
"onLanesOnly": true,
"isAvailableOnCurrentLane": true
},
"integration/demo-lib-v16": {
"name": "integration/demo-lib-v16",
"scope": "bitdev.angular",
"version": "220758d582bbbceb2dd8c6a2baa436cee2d93ac2",
"mainFile": "public-api.ts",
"rootDir": "angular/integration/demo-lib-v16",
"onLanesOnly": true,
"isAvailableOnCurrentLane": true
},
"integration/demo-lib-v17": {
"name": "integration/demo-lib-v17",
"scope": "bitdev.angular",
"version": "7da8a7d418f5e34905a462b08bb013016eddd99c",
"mainFile": "public-api.ts",
"rootDir": "angular/integration/demo-lib-v17",
"onLanesOnly": true,
"isAvailableOnCurrentLane": true
},
"integration/demo-lib-v18": {
"name": "integration/demo-lib-v18",
"scope": "bitdev.angular",
"version": "59088ec1991ecbb1f217271ee0855d9b26169860",
"mainFile": "public-api.ts",
"rootDir": "angular/integration/demo-lib-v18",
"onLanesOnly": true,
"isAvailableOnCurrentLane": true
},
"templates/generators": {
"name": "templates/generators",
"scope": "bitdev.angular",
Expand All @@ -359,5 +404,12 @@
"mainFile": "index.ts",
"rootDir": "angular/templates/starters"
},
"$schema-version": "17.0.0"
"$schema-version": "17.0.0",
"_bit_lane": {
"id": {
"name": "fix-build-ts",
"scope": "bitdev.angular"
},
"exported": true
}
}
1 change: 0 additions & 1 deletion angular/app-types/angular-app-type/application.bundler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ export type BuildApplicationOptions = {

// TODO allow customizing this
const BUILDER_NAME = '@angular-devkit/build-angular:application';
const CACHE_PATH = 'angular/cache';

export async function buildApplication(options: BuildApplicationOptions): Promise<void> {
const { angularOptions: { tsConfig, ssr, define }, envVars } = options;
Expand Down
5 changes: 3 additions & 2 deletions angular/app-types/angular-app-type/application.dev-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { VERSION } from '@angular/cli';
import {
dedupPaths,
getLoggerApi,
loadEsmModule,
normalizePath
} from '@bitdev/angular.dev-services.common';
import {
Expand Down Expand Up @@ -90,7 +89,9 @@ function getAppOptions(options: ServeApplicationOptions, isSsr: boolean): Applic
port,
browserTarget: BUILDER_NAME,
// @ts-ignore Angular 17+
buildTarget: BUILDER_NAME
buildTarget: BUILDER_NAME,
// support for bit.cloud workspaces
host: "0.0.0.0"
};
}

Expand Down
2 changes: 1 addition & 1 deletion angular/app-types/angular-app-type/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"componentId": {
"scope": "bitdev.angular",
"name": "app-types/angular-app-type",
"version": "6.0.2"
"version": "6.0.3"
},
"propagate": false,
"extensions": {
Expand Down
2 changes: 1 addition & 1 deletion angular/envs/angular-env/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"componentId": {
"scope": "bitdev.angular",
"name": "angular-env",
"version": "6.0.2"
"version": "6.0.3"
},
"propagate": false,
"extensions": {
Expand Down
2 changes: 1 addition & 1 deletion angular/envs/angular-env/env.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,6 @@
"patterns": {
"compositions": ["**/*.composition.*", "**/*.preview.*"],
"docs": ["**/*.docs.*"],
"tests": ["**/*.{test,spec,cy}.?(c|m)[jt]s?(x)"]
"tests": ["**/*.spec.*", "**/*.test.*", "**/*.cy.*"]
}
}
2 changes: 1 addition & 1 deletion angular/envs/angular-v13-env/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"componentId": {
"scope": "bitdev.angular",
"name": "envs/angular-v13-env",
"version": "6.0.2"
"version": "6.0.3"
},
"propagate": false,
"extensions": {
Expand Down
2 changes: 1 addition & 1 deletion angular/envs/angular-v13-env/env.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,6 @@
"patterns": {
"compositions": ["**/*.composition.*", "**/*.preview.*"],
"docs": ["**/*.docs.*"],
"tests": ["**/*.{test,spec,cy}.?(c|m)[jt]s?(x)"]
"tests": ["**/*.spec.*", "**/*.test.*", "**/*.cy.*"]
}
}
2 changes: 2 additions & 0 deletions angular/envs/angular-v13-env/webpack/webpack5.serve.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ export function webpack5ServeConfigFactory(

// @ts-ignore until types are updated with new options from webpack-dev-server v4
devServer: {
// support for bit.cloud workspaces
allowedHosts: ['.bit.cloud', 'localhost'],
static: [
{
directory: resolveWorkspacePath(publicDirectory),
Expand Down
2 changes: 1 addition & 1 deletion angular/envs/angular-v14-env/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"componentId": {
"scope": "bitdev.angular",
"name": "envs/angular-v14-env",
"version": "6.0.2"
"version": "6.0.3"
},
"propagate": false,
"extensions": {
Expand Down
2 changes: 1 addition & 1 deletion angular/envs/angular-v14-env/env.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,6 @@
"patterns": {
"compositions": ["**/*.composition.*", "**/*.preview.*"],
"docs": ["**/*.docs.*"],
"tests": ["**/*.{test,spec,cy}.?(c|m)[jt]s?(x)"]
"tests": ["**/*.spec.*", "**/*.test.*", "**/*.cy.*"]
}
}
2 changes: 2 additions & 0 deletions angular/envs/angular-v14-env/webpack/webpack5.serve.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ export function webpack5ServeConfigFactory(

// @ts-ignore until types are updated with new options from webpack-dev-server v4
devServer: {
// support for bit.cloud workspaces
allowedHosts: ['.bit.cloud', 'localhost'],
static: [
{
directory: resolveWorkspacePath(publicDirectory),
Expand Down
2 changes: 1 addition & 1 deletion angular/envs/angular-v15-env/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"componentId": {
"scope": "bitdev.angular",
"name": "envs/angular-v15-env",
"version": "6.0.2"
"version": "6.0.3"
},
"propagate": false,
"extensions": {
Expand Down
2 changes: 1 addition & 1 deletion angular/envs/angular-v15-env/env.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,6 @@
"patterns": {
"compositions": ["**/*.composition.*", "**/*.preview.*"],
"docs": ["**/*.docs.*"],
"tests": ["**/*.{test,spec,cy}.?(c|m)[jt]s?(x)"]
"tests": ["**/*.spec.*", "**/*.test.*", "**/*.cy.*"]
}
}
2 changes: 2 additions & 0 deletions angular/envs/angular-v15-env/webpack/webpack5.serve.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ export function webpack5ServeConfigFactory(

// @ts-ignore until types are updated with new options from webpack-dev-server v4
devServer: {
// support for bit.cloud workspaces
allowedHosts: ['.bit.cloud', 'localhost'],
static: [
{
directory: resolveWorkspacePath(publicDirectory),
Expand Down
2 changes: 1 addition & 1 deletion angular/envs/angular-v16-env/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"componentId": {
"scope": "bitdev.angular",
"name": "envs/angular-v16-env",
"version": "6.0.2"
"version": "6.0.3"
},
"propagate": false,
"extensions": {
Expand Down
2 changes: 1 addition & 1 deletion angular/envs/angular-v16-env/env.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,6 @@
"patterns": {
"compositions": ["**/*.composition.*", "**/*.preview.*"],
"docs": ["**/*.docs.*"],
"tests": ["**/*.{test,spec,cy}.?(c|m)[jt]s?(x)"]
"tests": ["**/*.spec.*", "**/*.test.*", "**/*.cy.*"]
}
}
2 changes: 2 additions & 0 deletions angular/envs/angular-v16-env/webpack/webpack5.serve.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ export function webpack5ServeConfigFactory(

// @ts-ignore until types are updated with new options from webpack-dev-server v4
devServer: {
// support for bit.cloud workspaces
allowedHosts: ['.bit.cloud', 'localhost'],
static: [
{
directory: resolveWorkspacePath(publicDirectory),
Expand Down
2 changes: 1 addition & 1 deletion angular/envs/angular-v17-env/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"componentId": {
"scope": "bitdev.angular",
"name": "envs/angular-v17-env",
"version": "5.0.2"
"version": "5.0.3"
},
"propagate": false,
"extensions": {
Expand Down
2 changes: 1 addition & 1 deletion angular/envs/angular-v17-env/env.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,6 @@
"patterns": {
"compositions": ["**/*.composition.*", "**/*.preview.*"],
"docs": ["**/*.docs.*"],
"tests": ["**/*.{test,spec,cy}.?(c|m)[jt]s?(x)"]
"tests": ["**/*.spec.*", "**/*.test.*", "**/*.cy.*"]
}
}
2 changes: 2 additions & 0 deletions angular/envs/angular-v17-env/webpack/webpack5.serve.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ export function webpack5ServeConfigFactory(

// @ts-ignore until types are updated with new options from webpack-dev-server v4
devServer: {
// support for bit.cloud workspaces
allowedHosts: ['.bit.cloud', 'localhost'],
static: [
{
directory: resolveWorkspacePath(publicDirectory),
Expand Down
2 changes: 1 addition & 1 deletion angular/envs/angular-v18-env/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"componentId": {
"scope": "bitdev.angular",
"name": "envs/angular-v18-env",
"version": "1.0.2"
"version": "1.0.3"
},
"propagate": false,
"extensions": {
Expand Down
2 changes: 1 addition & 1 deletion angular/envs/angular-v18-env/env.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,6 @@
"patterns": {
"compositions": ["**/*.composition.*", "**/*.preview.*"],
"docs": ["**/*.docs.*"],
"tests": ["**/*.{test,spec,cy}.?(c|m)[jt]s?(x)"]
"tests": ["**/*.spec.*", "**/*.test.*", "**/*.cy.*"]
}
}
Loading

0 comments on commit 9aff6a4

Please sign in to comment.