Skip to content

Commit

Permalink
fix envs
Browse files Browse the repository at this point in the history
  • Loading branch information
ocombe committed Apr 15, 2024
1 parent ae9ef97 commit b474f14
Show file tree
Hide file tree
Showing 32 changed files with 112 additions and 63 deletions.
3 changes: 2 additions & 1 deletion angular/devkit/common/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"typescript": ">= 3.5.3"
}
}
}
},
"teambit.node/[email protected]": {}
}
}
3 changes: 2 additions & 1 deletion angular/devkit/compiler/elements/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"@babel/runtime": "7.22.15"
}
}
}
},
"teambit.node/[email protected]": {}
}
}
4 changes: 4 additions & 0 deletions angular/devkit/linter/eslint/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
"eslint": ">= 7.0.0"
}
}
},
"teambit.node/[email protected]": {},
"teambit.envs/envs": {
"env": "teambit.node/node"
}
}
}
2 changes: 1 addition & 1 deletion angular/devkit/linter/eslint/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = require('./eslintrc.js');
module.exports = require('./eslintrc');
6 changes: 3 additions & 3 deletions angular/devkit/ng-compat/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"extensions": {
"teambit.dependencies/dependency-resolver": {
"policy": {
"dependencies": {
},
"dependencies": {},
"peerDependencies": {
"@angular-devkit/core": ">= 13.0.0",
"@angular-devkit/build-webpack": ">= 0.0.1",
Expand All @@ -20,6 +19,7 @@
"webpack": ">= 4.44.2"
}
}
}
},
"teambit.node/[email protected]": {}
}
}
3 changes: 2 additions & 1 deletion angular/devkit/webpack/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"@babel/runtime": "7.22.15"
}
}
}
},
"teambit.node/[email protected]": {}
}
}
8 changes: 6 additions & 2 deletions angular/envs/angular-env/component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentId": {
"name": "envs/angular-env",
"scope": "bitdev.angular"
"scope": "bitdev.angular",
"name": "envs/angular-env"
},
"propagate": true,
"extensions": {
Expand Down Expand Up @@ -66,6 +66,10 @@
"rxjs": "~7.8.0"
}
}
},
"bitdev.general/envs/[email protected]": {},
"teambit.envs/envs": {
"env": "bitdev.general/envs/bit-env"
}
}
}
4 changes: 1 addition & 3 deletions angular/envs/angular-env/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
export { AngularEnv } from './angular.bit-env.js';
// @ts-ignore
export { default as jestConfig } from '@bitdev/angular.envs.angular-v17-env/jest/jest.config.cjs';
export { ngEnvOptions } from '@bitdev/angular.envs.angular-v17-env';
export { jestConfig, ngEnvOptions } from '@bitdev/angular.envs.angular-v17-env';
7 changes: 4 additions & 3 deletions angular/envs/angular-v13-env/component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentId": {
"name": "envs/angular-v13-env",
"scope": "bitdev.angular"
"scope": "bitdev.angular",
"name": "envs/angular-v13-env"
},
"propagate": true,
"extensions": {
Expand Down Expand Up @@ -53,6 +53,7 @@
"zone.js": "~0.14.0"
}
}
}
},
"bitdev.general/envs/[email protected]": {}
}
}
4 changes: 3 additions & 1 deletion angular/envs/angular-v13-env/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
export { AngularV13Env, ngEnvOptions } from './angular-v13-env.bit-env.js';
export { AngularV13Env, ngEnvOptions } from './angular-v13-env.bit-env.js';
// @ts-ignore
export { default as jestConfig } from './jest/jest.config.cjs';
8 changes: 6 additions & 2 deletions angular/envs/angular-v14-env/component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentId": {
"name": "envs/angular-v14-env",
"scope": "bitdev.angular"
"scope": "bitdev.angular",
"name": "envs/angular-v14-env"
},
"propagate": true,
"extensions": {
Expand Down Expand Up @@ -61,6 +61,10 @@
"zone.js": "~0.14.0"
}
}
},
"bitdev.general/envs/[email protected]": {},
"teambit.envs/envs": {
"env": "bitdev.general/envs/bit-env"
}
}
}
4 changes: 3 additions & 1 deletion angular/envs/angular-v14-env/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
export { AngularV14Env, ngEnvOptions } from './angular-v14-env.bit-env.js';
export { AngularV14Env, ngEnvOptions } from './angular-v14-env.bit-env.js';
// @ts-ignore
export { default as jestConfig } from './jest/jest.config.cjs';
8 changes: 6 additions & 2 deletions angular/envs/angular-v15-env/component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentId": {
"name": "envs/angular-v15-env",
"scope": "bitdev.angular"
"scope": "bitdev.angular",
"name": "envs/angular-v15-env"
},
"propagate": true,
"extensions": {
Expand Down Expand Up @@ -61,6 +61,10 @@
"zone.js": "~0.14.0"
}
}
},
"bitdev.general/envs/[email protected]": {},
"teambit.envs/envs": {
"env": "bitdev.general/envs/bit-env"
}
}
}
4 changes: 3 additions & 1 deletion angular/envs/angular-v15-env/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
export { AngularV15Env, ngEnvOptions } from './angular-v15-env.bit-env.js';
export { AngularV15Env, ngEnvOptions } from './angular-v15-env.bit-env.js';
// @ts-ignore
export { default as jestConfig } from './jest/jest.config.cjs';
8 changes: 6 additions & 2 deletions angular/envs/angular-v16-env/component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentId": {
"name": "envs/angular-v16-env",
"scope": "bitdev.angular"
"scope": "bitdev.angular",
"name": "envs/angular-v16-env"
},
"propagate": true,
"extensions": {
Expand Down Expand Up @@ -65,6 +65,10 @@
"rxjs": "^6.5.5 || ^7.4.0"
}
}
},
"bitdev.general/envs/[email protected]": {},
"teambit.envs/envs": {
"env": "bitdev.general/envs/bit-env"
}
}
}
4 changes: 3 additions & 1 deletion angular/envs/angular-v16-env/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
export { AngularV16Env, ngEnvOptions } from './angular-v16-env.bit-env.js';
export { AngularV16Env, ngEnvOptions } from './angular-v16-env.bit-env.js';
// @ts-ignore
export { default as jestConfig } from './jest/jest.config.cjs';
8 changes: 6 additions & 2 deletions angular/envs/angular-v17-env/component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentId": {
"name": "envs/angular-v17-env",
"scope": "bitdev.angular"
"scope": "bitdev.angular",
"name": "envs/angular-v17-env"
},
"propagate": true,
"extensions": {
Expand Down Expand Up @@ -66,6 +66,10 @@
"rxjs": "~7.8.0"
}
}
},
"bitdev.general/envs/[email protected]": {},
"teambit.envs/envs": {
"env": "bitdev.general/envs/bit-env"
}
}
}
4 changes: 3 additions & 1 deletion angular/envs/angular-v17-env/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
export { AngularV17Env, ngEnvOptions } from './angular-v17-env.bit-env.js';
export { AngularV17Env, ngEnvOptions } from './angular-v17-env.bit-env.js';
// @ts-ignore
export { default as jestConfig } from './jest/jest.config.cjs';
6 changes: 5 additions & 1 deletion angular/envs/base-env/component.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@babel/preset-typescript": "7.22.15",
"@babel/runtime": "^7.12.18",
"@types/enhanced-resolve": "~3.0.7",
"@types/node": "^12.11.1",
"@types/node": "^20.12.7",
"@types/trusted-types": "~2.0.1",
"enhanced-resolve": "5.8.3",
"eslint": ">= 7.0.0",
Expand Down Expand Up @@ -52,6 +52,10 @@
"zone.js": ">= 0.9.1"
}
}
},
"bitdev.node/[email protected]": {},
"teambit.envs/envs": {
"env": "bitdev.node/node-env"
}
}
}
8 changes: 6 additions & 2 deletions angular/examples/my-angular-env/component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentId": {
"name": "examples/my-angular-env",
"scope": "bitdev.angular"
"scope": "bitdev.angular",
"name": "examples/my-angular-env"
},
"propagate": true,
"extensions": {
Expand All @@ -15,6 +15,10 @@
"jest-preset-angular": "~13.1.3"
}
}
},
"bitdev.general/envs/[email protected]": {},
"teambit.envs/envs": {
"env": "bitdev.general/envs/bit-env"
}
}
}
8 changes: 6 additions & 2 deletions angular/examples/my-angular-v13-env/component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentId": {
"name": "examples/my-angular-v13-env",
"scope": "bitdev.angular"
"scope": "bitdev.angular",
"name": "examples/my-angular-v13-env"
},
"propagate": true,
"extensions": {
Expand All @@ -14,6 +14,10 @@
"jest-preset-angular": "~11.0.1"
}
}
},
"bitdev.general/envs/[email protected]": {},
"teambit.envs/envs": {
"env": "bitdev.general/envs/bit-env"
}
}
}
2 changes: 1 addition & 1 deletion angular/examples/my-angular-v13-env/config/jest.config.cjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @see https://bit.dev/reference/jest/jest-config
*/
const jestConfig = require('@bitdev/angular.envs.angular-v13-env/jest/jest.config.cjs');
const { jestConfig } = require('@bitdev/angular.envs.angular-v13-env');
const { generateNodeModulesPattern } = require('@teambit/dependencies.modules.packages-excluder');

const packagesToExclude = ['@angular', '@ngrx', 'apollo-angular'];
Expand Down
8 changes: 6 additions & 2 deletions angular/examples/my-angular-v14-env/component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentId": {
"name": "examples/my-angular-v14-env",
"scope": "bitdev.angular"
"scope": "bitdev.angular",
"name": "examples/my-angular-v14-env"
},
"propagate": true,
"extensions": {
Expand All @@ -15,6 +15,10 @@
"jest-preset-angular": "~12.1.0"
}
}
},
"bitdev.general/envs/[email protected]": {},
"teambit.envs/envs": {
"env": "bitdev.general/envs/bit-env"
}
}
}
2 changes: 1 addition & 1 deletion angular/examples/my-angular-v14-env/config/jest.config.cjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @see https://bit.dev/reference/jest/jest-config
*/
const jestConfig = require('@bitdev/angular.envs.angular-v14-env/jest/jest.config.cjs');
const { jestConfig } = require('@bitdev/angular.envs.angular-v14-env');
const { generateNodeModulesPattern } = require('@teambit/dependencies.modules.packages-excluder');

const packagesToExclude = ['@angular', '@ngrx', 'apollo-angular'];
Expand Down
8 changes: 6 additions & 2 deletions angular/examples/my-angular-v15-env/component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentId": {
"name": "examples/my-angular-v15-env",
"scope": "bitdev.angular"
"scope": "bitdev.angular",
"name": "examples/my-angular-v15-env"
},
"propagate": true,
"extensions": {
Expand All @@ -15,6 +15,10 @@
"jest-preset-angular": "~12.2.3"
}
}
},
"bitdev.general/envs/[email protected]": {},
"teambit.envs/envs": {
"env": "bitdev.general/envs/bit-env"
}
}
}
2 changes: 1 addition & 1 deletion angular/examples/my-angular-v15-env/config/jest.config.cjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @see https://bit.dev/reference/jest/jest-config
*/
const jestConfig = require('@bitdev/angular.envs.angular-v15-env/jest/jest.config.cjs');
const { jestConfig } = require('@bitdev/angular.envs.angular-v15-env');
const { generateNodeModulesPattern } = require('@teambit/dependencies.modules.packages-excluder');

const packagesToExclude = ['@angular', '@ngrx', 'apollo-angular'];
Expand Down
8 changes: 6 additions & 2 deletions angular/examples/my-angular-v16-env/component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"componentId": {
"name": "examples/my-angular-v16-env",
"scope": "bitdev.angular"
"scope": "bitdev.angular",
"name": "examples/my-angular-v16-env"
},
"propagate": true,
"extensions": {
Expand All @@ -15,6 +15,10 @@
"jest-preset-angular": "~13.1.0"
}
}
},
"bitdev.general/envs/[email protected]": {},
"teambit.envs/envs": {
"env": "bitdev.general/envs/bit-env"
}
}
}
2 changes: 1 addition & 1 deletion angular/examples/my-angular-v16-env/config/jest.config.cjs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @see https://bit.dev/reference/jest/jest-config
*/
const jestConfig = require('@bitdev/angular.envs.angular-v16-env/jest/jest.config.cjs');
const { jestConfig } = require('@bitdev/angular.envs.angular-v16-env');
const { generateNodeModulesPattern } = require('@teambit/dependencies.modules.packages-excluder');
const { defaultTransformerOptions } = require('jest-preset-angular/presets');

Expand Down
Loading

0 comments on commit b474f14

Please sign in to comment.