diff --git a/angular/devkit/common/component.json b/angular/devkit/common/component.json index 32603cbb..4baecdbc 100644 --- a/angular/devkit/common/component.json +++ b/angular/devkit/common/component.json @@ -17,6 +17,7 @@ "typescript": ">= 3.5.3" } } - } + }, + "teambit.node/node@1.0.54": {} } } diff --git a/angular/devkit/compiler/elements/component.json b/angular/devkit/compiler/elements/component.json index c1ac233c..d13edb27 100644 --- a/angular/devkit/compiler/elements/component.json +++ b/angular/devkit/compiler/elements/component.json @@ -46,6 +46,7 @@ "@babel/runtime": "7.22.15" } } - } + }, + "teambit.node/node@1.0.54": {} } } diff --git a/angular/devkit/linter/eslint/component.json b/angular/devkit/linter/eslint/component.json index bf3a758e..2683ee9d 100644 --- a/angular/devkit/linter/eslint/component.json +++ b/angular/devkit/linter/eslint/component.json @@ -20,6 +20,10 @@ "eslint": ">= 7.0.0" } } + }, + "teambit.node/node@1.0.54": {}, + "teambit.envs/envs": { + "env": "teambit.node/node" } } } diff --git a/angular/devkit/linter/eslint/index.js b/angular/devkit/linter/eslint/index.js index 5542dc7e..1cc2d61a 100644 --- a/angular/devkit/linter/eslint/index.js +++ b/angular/devkit/linter/eslint/index.js @@ -1 +1 @@ -module.exports = require('./eslintrc.js'); +module.exports = require('./eslintrc'); diff --git a/angular/devkit/ng-compat/component.json b/angular/devkit/ng-compat/component.json index be0ee10e..64c32b8d 100644 --- a/angular/devkit/ng-compat/component.json +++ b/angular/devkit/ng-compat/component.json @@ -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", @@ -20,6 +19,7 @@ "webpack": ">= 4.44.2" } } - } + }, + "teambit.node/node@1.0.54": {} } } diff --git a/angular/devkit/webpack/component.json b/angular/devkit/webpack/component.json index f6c57011..f9b768d0 100644 --- a/angular/devkit/webpack/component.json +++ b/angular/devkit/webpack/component.json @@ -19,6 +19,7 @@ "@babel/runtime": "7.22.15" } } - } + }, + "teambit.node/node@1.0.54": {} } } diff --git a/angular/envs/angular-env/component.json b/angular/envs/angular-env/component.json index cb5d1e88..85d87be3 100644 --- a/angular/envs/angular-env/component.json +++ b/angular/envs/angular-env/component.json @@ -1,7 +1,7 @@ { "componentId": { - "name": "envs/angular-env", - "scope": "bitdev.angular" + "scope": "bitdev.angular", + "name": "envs/angular-env" }, "propagate": true, "extensions": { @@ -66,6 +66,10 @@ "rxjs": "~7.8.0" } } + }, + "bitdev.general/envs/bit-env@1.0.1": {}, + "teambit.envs/envs": { + "env": "bitdev.general/envs/bit-env" } } } diff --git a/angular/envs/angular-env/index.ts b/angular/envs/angular-env/index.ts index d4379c32..7b68ad03 100644 --- a/angular/envs/angular-env/index.ts +++ b/angular/envs/angular-env/index.ts @@ -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'; diff --git a/angular/envs/angular-v13-env/component.json b/angular/envs/angular-v13-env/component.json index 1fb5cadb..4dc35f2d 100644 --- a/angular/envs/angular-v13-env/component.json +++ b/angular/envs/angular-v13-env/component.json @@ -1,7 +1,7 @@ { "componentId": { - "name": "envs/angular-v13-env", - "scope": "bitdev.angular" + "scope": "bitdev.angular", + "name": "envs/angular-v13-env" }, "propagate": true, "extensions": { @@ -53,6 +53,7 @@ "zone.js": "~0.14.0" } } - } + }, + "bitdev.general/envs/bit-env@1.0.1": {} } } diff --git a/angular/envs/angular-v13-env/index.ts b/angular/envs/angular-v13-env/index.ts index b8bb166a..c301298d 100644 --- a/angular/envs/angular-v13-env/index.ts +++ b/angular/envs/angular-v13-env/index.ts @@ -1 +1,3 @@ -export { AngularV13Env, ngEnvOptions } from './angular-v13-env.bit-env.js'; \ No newline at end of file +export { AngularV13Env, ngEnvOptions } from './angular-v13-env.bit-env.js'; +// @ts-ignore +export { default as jestConfig } from './jest/jest.config.cjs'; diff --git a/angular/envs/angular-v14-env/component.json b/angular/envs/angular-v14-env/component.json index 6ba4c330..0044acac 100644 --- a/angular/envs/angular-v14-env/component.json +++ b/angular/envs/angular-v14-env/component.json @@ -1,7 +1,7 @@ { "componentId": { - "name": "envs/angular-v14-env", - "scope": "bitdev.angular" + "scope": "bitdev.angular", + "name": "envs/angular-v14-env" }, "propagate": true, "extensions": { @@ -61,6 +61,10 @@ "zone.js": "~0.14.0" } } + }, + "bitdev.general/envs/bit-env@1.0.1": {}, + "teambit.envs/envs": { + "env": "bitdev.general/envs/bit-env" } } } diff --git a/angular/envs/angular-v14-env/index.ts b/angular/envs/angular-v14-env/index.ts index 91f7746b..e4020983 100644 --- a/angular/envs/angular-v14-env/index.ts +++ b/angular/envs/angular-v14-env/index.ts @@ -1 +1,3 @@ -export { AngularV14Env, ngEnvOptions } from './angular-v14-env.bit-env.js'; \ No newline at end of file +export { AngularV14Env, ngEnvOptions } from './angular-v14-env.bit-env.js'; +// @ts-ignore +export { default as jestConfig } from './jest/jest.config.cjs'; diff --git a/angular/envs/angular-v15-env/component.json b/angular/envs/angular-v15-env/component.json index 4ce60e4f..687b5880 100644 --- a/angular/envs/angular-v15-env/component.json +++ b/angular/envs/angular-v15-env/component.json @@ -1,7 +1,7 @@ { "componentId": { - "name": "envs/angular-v15-env", - "scope": "bitdev.angular" + "scope": "bitdev.angular", + "name": "envs/angular-v15-env" }, "propagate": true, "extensions": { @@ -61,6 +61,10 @@ "zone.js": "~0.14.0" } } + }, + "bitdev.general/envs/bit-env@1.0.1": {}, + "teambit.envs/envs": { + "env": "bitdev.general/envs/bit-env" } } } diff --git a/angular/envs/angular-v15-env/index.ts b/angular/envs/angular-v15-env/index.ts index f99a83dc..66a9c36c 100644 --- a/angular/envs/angular-v15-env/index.ts +++ b/angular/envs/angular-v15-env/index.ts @@ -1 +1,3 @@ -export { AngularV15Env, ngEnvOptions } from './angular-v15-env.bit-env.js'; \ No newline at end of file +export { AngularV15Env, ngEnvOptions } from './angular-v15-env.bit-env.js'; +// @ts-ignore +export { default as jestConfig } from './jest/jest.config.cjs'; diff --git a/angular/envs/angular-v16-env/component.json b/angular/envs/angular-v16-env/component.json index fc95fe93..75bc61a7 100644 --- a/angular/envs/angular-v16-env/component.json +++ b/angular/envs/angular-v16-env/component.json @@ -1,7 +1,7 @@ { "componentId": { - "name": "envs/angular-v16-env", - "scope": "bitdev.angular" + "scope": "bitdev.angular", + "name": "envs/angular-v16-env" }, "propagate": true, "extensions": { @@ -65,6 +65,10 @@ "rxjs": "^6.5.5 || ^7.4.0" } } + }, + "bitdev.general/envs/bit-env@1.0.1": {}, + "teambit.envs/envs": { + "env": "bitdev.general/envs/bit-env" } } } diff --git a/angular/envs/angular-v16-env/index.ts b/angular/envs/angular-v16-env/index.ts index 9fe7dfa5..84c8f74f 100644 --- a/angular/envs/angular-v16-env/index.ts +++ b/angular/envs/angular-v16-env/index.ts @@ -1 +1,3 @@ -export { AngularV16Env, ngEnvOptions } from './angular-v16-env.bit-env.js'; \ No newline at end of file +export { AngularV16Env, ngEnvOptions } from './angular-v16-env.bit-env.js'; +// @ts-ignore +export { default as jestConfig } from './jest/jest.config.cjs'; diff --git a/angular/envs/angular-v17-env/component.json b/angular/envs/angular-v17-env/component.json index 0fefd6c0..5ef275fa 100644 --- a/angular/envs/angular-v17-env/component.json +++ b/angular/envs/angular-v17-env/component.json @@ -1,7 +1,7 @@ { "componentId": { - "name": "envs/angular-v17-env", - "scope": "bitdev.angular" + "scope": "bitdev.angular", + "name": "envs/angular-v17-env" }, "propagate": true, "extensions": { @@ -66,6 +66,10 @@ "rxjs": "~7.8.0" } } + }, + "bitdev.general/envs/bit-env@1.0.1": {}, + "teambit.envs/envs": { + "env": "bitdev.general/envs/bit-env" } } } diff --git a/angular/envs/angular-v17-env/index.ts b/angular/envs/angular-v17-env/index.ts index 14890023..ac37e154 100644 --- a/angular/envs/angular-v17-env/index.ts +++ b/angular/envs/angular-v17-env/index.ts @@ -1 +1,3 @@ -export { AngularV17Env, ngEnvOptions } from './angular-v17-env.bit-env.js'; \ No newline at end of file +export { AngularV17Env, ngEnvOptions } from './angular-v17-env.bit-env.js'; +// @ts-ignore +export { default as jestConfig } from './jest/jest.config.cjs'; diff --git a/angular/envs/base-env/component.json b/angular/envs/base-env/component.json index 13bf4353..5cf2c462 100644 --- a/angular/envs/base-env/component.json +++ b/angular/envs/base-env/component.json @@ -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", @@ -52,6 +52,10 @@ "zone.js": ">= 0.9.1" } } + }, + "bitdev.node/node-env@1.0.26": {}, + "teambit.envs/envs": { + "env": "bitdev.node/node-env" } } } diff --git a/angular/examples/my-angular-env/component.json b/angular/examples/my-angular-env/component.json index 0d2e7acb..90d29868 100644 --- a/angular/examples/my-angular-env/component.json +++ b/angular/examples/my-angular-env/component.json @@ -1,7 +1,7 @@ { "componentId": { - "name": "examples/my-angular-env", - "scope": "bitdev.angular" + "scope": "bitdev.angular", + "name": "examples/my-angular-env" }, "propagate": true, "extensions": { @@ -15,6 +15,10 @@ "jest-preset-angular": "~13.1.3" } } + }, + "bitdev.general/envs/bit-env@1.0.1": {}, + "teambit.envs/envs": { + "env": "bitdev.general/envs/bit-env" } } } diff --git a/angular/examples/my-angular-v13-env/component.json b/angular/examples/my-angular-v13-env/component.json index fa6368fb..511a523a 100644 --- a/angular/examples/my-angular-v13-env/component.json +++ b/angular/examples/my-angular-v13-env/component.json @@ -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": { @@ -14,6 +14,10 @@ "jest-preset-angular": "~11.0.1" } } + }, + "bitdev.general/envs/bit-env@1.0.1": {}, + "teambit.envs/envs": { + "env": "bitdev.general/envs/bit-env" } } } diff --git a/angular/examples/my-angular-v13-env/config/jest.config.cjs b/angular/examples/my-angular-v13-env/config/jest.config.cjs index d19a0e08..abb9e4d3 100644 --- a/angular/examples/my-angular-v13-env/config/jest.config.cjs +++ b/angular/examples/my-angular-v13-env/config/jest.config.cjs @@ -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']; diff --git a/angular/examples/my-angular-v14-env/component.json b/angular/examples/my-angular-v14-env/component.json index 890449de..fbd536f2 100644 --- a/angular/examples/my-angular-v14-env/component.json +++ b/angular/examples/my-angular-v14-env/component.json @@ -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": { @@ -15,6 +15,10 @@ "jest-preset-angular": "~12.1.0" } } + }, + "bitdev.general/envs/bit-env@1.0.1": {}, + "teambit.envs/envs": { + "env": "bitdev.general/envs/bit-env" } } } diff --git a/angular/examples/my-angular-v14-env/config/jest.config.cjs b/angular/examples/my-angular-v14-env/config/jest.config.cjs index 83017ba4..11cf8dd4 100644 --- a/angular/examples/my-angular-v14-env/config/jest.config.cjs +++ b/angular/examples/my-angular-v14-env/config/jest.config.cjs @@ -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']; diff --git a/angular/examples/my-angular-v15-env/component.json b/angular/examples/my-angular-v15-env/component.json index 5b58ab04..37b09705 100644 --- a/angular/examples/my-angular-v15-env/component.json +++ b/angular/examples/my-angular-v15-env/component.json @@ -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": { @@ -15,6 +15,10 @@ "jest-preset-angular": "~12.2.3" } } + }, + "bitdev.general/envs/bit-env@1.0.1": {}, + "teambit.envs/envs": { + "env": "bitdev.general/envs/bit-env" } } } diff --git a/angular/examples/my-angular-v15-env/config/jest.config.cjs b/angular/examples/my-angular-v15-env/config/jest.config.cjs index cbf703c6..cea6d0e9 100644 --- a/angular/examples/my-angular-v15-env/config/jest.config.cjs +++ b/angular/examples/my-angular-v15-env/config/jest.config.cjs @@ -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']; diff --git a/angular/examples/my-angular-v16-env/component.json b/angular/examples/my-angular-v16-env/component.json index c7d58cdd..273e92b5 100644 --- a/angular/examples/my-angular-v16-env/component.json +++ b/angular/examples/my-angular-v16-env/component.json @@ -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": { @@ -15,6 +15,10 @@ "jest-preset-angular": "~13.1.0" } } + }, + "bitdev.general/envs/bit-env@1.0.1": {}, + "teambit.envs/envs": { + "env": "bitdev.general/envs/bit-env" } } } diff --git a/angular/examples/my-angular-v16-env/config/jest.config.cjs b/angular/examples/my-angular-v16-env/config/jest.config.cjs index 6b801eb5..893d04bd 100644 --- a/angular/examples/my-angular-v16-env/config/jest.config.cjs +++ b/angular/examples/my-angular-v16-env/config/jest.config.cjs @@ -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'); diff --git a/angular/examples/my-angular-v17-env/component.json b/angular/examples/my-angular-v17-env/component.json index 39500eee..0e7c655e 100644 --- a/angular/examples/my-angular-v17-env/component.json +++ b/angular/examples/my-angular-v17-env/component.json @@ -1,7 +1,7 @@ { "componentId": { - "name": "examples/my-angular-v17-env", - "scope": "bitdev.angular" + "scope": "bitdev.angular", + "name": "examples/my-angular-v17-env" }, "propagate": true, "extensions": { @@ -15,6 +15,10 @@ "jest-preset-angular": "~13.1.3" } } + }, + "bitdev.general/envs/bit-env@1.0.1": {}, + "teambit.envs/envs": { + "env": "bitdev.general/envs/bit-env" } } } diff --git a/angular/examples/my-angular-v17-env/config/jest.config.cjs b/angular/examples/my-angular-v17-env/config/jest.config.cjs index 5e5ed7de..5dbcf9bb 100644 --- a/angular/examples/my-angular-v17-env/config/jest.config.cjs +++ b/angular/examples/my-angular-v17-env/config/jest.config.cjs @@ -1,7 +1,7 @@ /** * @see https://bit.dev/reference/jest/jest-config */ -const jestConfig = require('@bitdev/angular.envs.angular-v17-env/jest/jest.config.cjs'); +const { jestConfig } = require('@bitdev/angular.envs.angular-v17-env'); const { generateNodeModulesPattern } = require('@teambit/dependencies.modules.packages-excluder'); const { defaultTransformerOptions } = require('jest-preset-angular/presets'); diff --git a/angular/templates/generators/ng-env/files/config/jest.config.ts b/angular/templates/generators/ng-env/files/config/jest.config.ts index 429809c6..48b6047e 100644 --- a/angular/templates/generators/ng-env/files/config/jest.config.ts +++ b/angular/templates/generators/ng-env/files/config/jest.config.ts @@ -4,7 +4,7 @@ export const jestConfigFile = (angularVersion: number, envPkgName: string) => { content: `/** * @see https://bit.dev/reference/jest/jest-config */ -const jestConfig = require('${envPkgName}/jest/jest.config.cjs'); +const { jestConfig } = require('${envPkgName}'); const { generateNodeModulesPattern } = require('@teambit/dependencies.modules.packages-excluder'); ${angularVersion >= 16 ? ` const { defaultTransformerOptions } = require('jest-preset-angular/presets'); diff --git a/workspace.jsonc b/workspace.jsonc index 654b6f0b..8f528f52 100644 --- a/workspace.jsonc +++ b/workspace.jsonc @@ -36,24 +36,9 @@ "policy": { "dependencies": { "@clack/prompts": "^0.7.0", - "@teambit/compilation.compiler-task": "1.0.7", - "@teambit/defender.eslint-linter": "1.0.22", - "@teambit/defender.jest-tester": "2.0.0", - "@teambit/defender.prettier-formatter": "1.0.11", - "@teambit/dependencies.modules.packages-excluder": "1.0.8", - "@teambit/envs.docs.env-overview-template": "0.0.2", - "@teambit/graph.cleargraph": "^0.0.8", - "@teambit/node.deps-detectors.detective-es6": "0.0.5", - "@teambit/react.ui.docs-app": "1.0.18", - "@teambit/toolbox.network.get-port": "1.0.6", - "@teambit/toolbox.performance.v8-cache": "0.0.33", - "@teambit/typescript.typescript-compiler": "2.0.28", - "@teambit/ui-foundation.ui.constants.z-indexes": "0.0.504", - "@teambit/webpack.modules.generate-style-loaders": "1.0.11", - "@teambit/webpack.modules.style-regexps": "1.0.6", - "@teambit/webpack.webpack-bundler": "1.0.7", "@types/fs-extra": "~9.0.7", "@types/lodash": "4.14.165", + "@types/node": "20.12.7", "@types/object-hash": "~2.1.0", "events": "^3.3.0", "fs-extra": "^11.2.0",