From e94ecec1add84bf3efd89f67d53e1c4b36f3d67d Mon Sep 17 00:00:00 2001 From: Olivier Combe Date: Thu, 28 Sep 2023 15:59:39 +0200 Subject: [PATCH] update github workflow for bitdev --- .bitmap | 6 +- .eslintrc.json | 6 - .github/workflows/main.yml | 190 +++++++++++++-------------- .gitignore | 1 + .prettierrc.cjs | 4 - angular/envs/.eslintrc.json | 6 - angular/envs/base-env/.eslintrc.json | 6 - angular/envs/tsconfig.json | 5 - angular/examples/.eslintrc.json | 6 - angular/examples/tsconfig.json | 5 - integration/.eslintrc.json | 6 - integration/tsconfig.json | 5 - scripts/keep-env.js | 6 +- tsconfig.json | 55 +++++++- workspace.jsonc | 28 ++-- 15 files changed, 165 insertions(+), 170 deletions(-) delete mode 100644 .eslintrc.json delete mode 100644 .prettierrc.cjs delete mode 100644 angular/envs/.eslintrc.json delete mode 100644 angular/envs/base-env/.eslintrc.json delete mode 100644 angular/envs/tsconfig.json delete mode 100644 angular/examples/.eslintrc.json delete mode 100644 angular/examples/tsconfig.json delete mode 100644 integration/.eslintrc.json delete mode 100644 integration/tsconfig.json diff --git a/.bitmap b/.bitmap index eddc6336..16f9b3c0 100644 --- a/.bitmap +++ b/.bitmap @@ -153,12 +153,12 @@ "mainFile": "index.ts", "rootDir": "angular/examples/my-angular-v16-env" }, - "readme": { + /*"readme": { "scope": "bitdev.angular", "version": "1.0.1", "mainFile": "index.ts", "rootDir": "angular/readme" - }, + },*/ "templates/generators": { "scope": "bitdev.angular", "version": "1.0.0", @@ -172,4 +172,4 @@ "rootDir": "angular/templates/starters" }, "$schema-version": "16.0.0" -} \ No newline at end of file +} diff --git a/.eslintrc.json b/.eslintrc.json deleted file mode 100644 index 6bf1abb4..00000000 --- a/.eslintrc.json +++ /dev/null @@ -1,6 +0,0 @@ -// bit-generated-eslint-config -{ - "extends": [ - "./node_modules/.cache/.eslintrc.bit.8865293c0e0bd0932b8a2aefcc803073814e705f.json" - ] -} \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e87df8be..1004c45b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,7 @@ jobs: - uses: actions/checkout@v3 - name: Keep default - run: npm i replace-in-file && node scripts/keep-env.js --version=16 --default + run: npm i replace-in-file@6.3.5 && node scripts/keep-env.js --version=16 --default - name: Cleanup node modules run: rm -rf node_modules @@ -36,48 +36,48 @@ jobs: run: bit install --log - name: Remove v15 - run: bit remove versions/angular-v15 -s -f --log + run: bit remove envs/angular-v15-env -s -f --log - name: Remove v15 fork - run: bit remove forks/angular-env-v15 -s -f --log + run: bit remove examples/my-angular-v15-env -s -f --log - name: Remove v14 - run: bit remove versions/angular-v14 -s -f --log + run: bit remove envs/angular-v14-env -s -f --log - name: Remove v14 fork - run: bit remove forks/angular-env-v14 -s -f --log + run: bit remove examples/my-angular-v14-env -s -f --log - name: Remove v13 - run: bit remove versions/angular-v13 -s -f --log + run: bit remove envs/angular-v13-env -s -f --log - name: Remove v13 fork - run: bit remove forks/angular-env-v13 -s -f --log + run: bit remove examples/my-angular-v13-env -s -f --log - name: Remove v12 - run: bit remove versions/angular-v12 -s -f --log + run: bit remove envs/angular-v12-env -s -f --log - name: Remove v12 fork - run: bit remove forks/angular-env-v12 -s -f --log + run: bit remove examples/my-angular-v12-env -s -f --log - name: Add example component - run: bit add examples/demo-lib --log + run: bit add integration/demo-lib --log - name: Add example app - run: bit add examples/demo-app --log + run: bit add integration/demo-app --log - - name: Cleanup node modules + - name: Bit cc run: bit cc - - name: Cleanup node modules + - name: Cleanup capsules run: bit capsule delete --all - name: Cleanup node modules run: rm -rf node_modules - - name: Cleanup node modules + - name: Cleanup package-lock.json run: rm -rf package-lock.json - - name: Cleanup node modules + - name: Cleanup .git/bit run: rm -rf .git/bit - name: Install dependencies @@ -113,7 +113,7 @@ jobs: - uses: actions/checkout@v3 - name: Keep v16 - run: npm i replace-in-file && node scripts/keep-env.js --version=16 + run: npm i replace-in-file@6.3.5 && node scripts/keep-env.js --version=16 - name: Cleanup node modules run: rm -rf node_modules @@ -122,51 +122,51 @@ jobs: run: bit install --log - name: Remove default - run: bit remove angular -s -f --log + run: bit remove angular-env -s -f --log - name: Remove default fork - run: bit remove forks/angular-env-default -s -f --log + run: bit remove examples/my-angular-env -s -f --log - name: Remove v15 - run: bit remove versions/angular-v15 -s -f --log + run: bit remove envs/angular-v15-env -s -f --log - name: Remove v15 fork - run: bit remove forks/angular-env-v15 -s -f --log + run: bit remove examples/my-angular-v15-env -s -f --log - name: Remove v14 - run: bit remove versions/angular-v14 -s -f --log + run: bit remove envs/angular-v14-env -s -f --log - name: Remove v14 fork - run: bit remove forks/angular-env-v14 -s -f --log + run: bit remove examples/my-angular-v14-env -s -f --log - name: Remove v13 - run: bit remove versions/angular-v13 -s -f --log + run: bit remove envs/angular-v13-env -s -f --log - name: Remove v13 fork - run: bit remove forks/angular-env-v13 -s -f --log + run: bit remove examples/my-angular-v13-env -s -f --log - name: Remove v12 - run: bit remove versions/angular-v12 -s -f --log + run: bit remove envs/angular-v12-env -s -f --log - name: Remove v12 fork - run: bit remove forks/angular-env-v12 -s -f --log + run: bit remove examples/my-angular-v12-env -s -f --log - name: Add example component - run: bit add examples/demo-lib-v16 --log + run: bit add integration/demo-lib-v16 --log - - name: Cleanup node modules + - name: Bit cc run: bit cc - - name: Cleanup node modules + - name: Cleanup capsules run: bit capsule delete --all - name: Cleanup node modules run: rm -rf node_modules - - name: Cleanup node modules + - name: Cleanup package-lock.json run: rm -rf package-lock.json - - name: Cleanup node modules + - name: Cleanup .git/bit run: rm -rf .git/bit - name: Install dependencies @@ -199,7 +199,7 @@ jobs: - uses: actions/checkout@v3 - name: Keep v15 - run: npm i replace-in-file && node scripts/keep-env.js --version=15 + run: npm i replace-in-file@6.3.5 && node scripts/keep-env.js --version=15 - name: Cleanup node modules run: rm -rf node_modules @@ -208,51 +208,51 @@ jobs: run: bit install --log - name: Remove default - run: bit remove angular -s -f --log + run: bit remove angular-env -s -f --log - name: Remove default fork - run: bit remove forks/angular-env-default -s -f --log + run: bit remove examples/my-angular-env -s -f --log - name: Remove v16 - run: bit remove versions/angular-v16 -s -f --log + run: bit remove envs/angular-v16-env -s -f --log - name: Remove v16 fork - run: bit remove forks/angular-env-v16 -s -f --log + run: bit remove examples/my-angular-v16-env -s -f --log - name: Remove v14 - run: bit remove versions/angular-v14 -s -f --log + run: bit remove envs/angular-v14-env -s -f --log - name: Remove v14 fork - run: bit remove forks/angular-env-v14 -s -f --log + run: bit remove examples/my-angular-v14-env -s -f --log - name: Remove v13 - run: bit remove versions/angular-v13 -s -f --log + run: bit remove envs/angular-v13-env -s -f --log - name: Remove v13 fork - run: bit remove forks/angular-env-v13 -s -f --log + run: bit remove examples/my-angular-v13-env -s -f --log - name: Remove v12 - run: bit remove versions/angular-v12 -s -f --log + run: bit remove envs/angular-v12-env -s -f --log - name: Remove v12 fork - run: bit remove forks/angular-env-v12 -s -f --log + run: bit remove examples/my-angular-v12-env -s -f --log - name: Add example component - run: bit add examples/demo-lib-v15 --log + run: bit add integration/demo-lib-v15 --log - - name: Cleanup node modules + - name: Bit cc run: bit cc - - name: Cleanup node modules + - name: Cleanup capsules run: bit capsule delete --all - name: Cleanup node modules run: rm -rf node_modules - - name: Cleanup node modules + - name: Cleanup package-lock.json run: rm -rf package-lock.json - - name: Cleanup node modules + - name: Cleanup .git/bit run: rm -rf .git/bit - name: Install dependencies @@ -284,7 +284,7 @@ jobs: - uses: actions/checkout@v3 - name: Keep v14 - run: npm i replace-in-file && node scripts/keep-env.js --version=14 + run: npm i replace-in-file@6.3.5 && node scripts/keep-env.js --version=14 - name: Cleanup node modules run: rm -rf node_modules @@ -293,51 +293,51 @@ jobs: run: bit install --log - name: Remove default - run: bit remove angular -s -f --log + run: bit remove angular-env -s -f --log - name: Remove default fork - run: bit remove forks/angular-env-default -s -f --log + run: bit remove examples/my-angular-env -s -f --log - name: Remove v16 - run: bit remove versions/angular-v16 -s -f --log + run: bit remove envs/angular-v16-env -s -f --log - name: Remove v16 fork - run: bit remove forks/angular-env-v16 -s -f --log + run: bit remove examples/my-angular-v16-env -s -f --log - name: Remove v15 - run: bit remove versions/angular-v15 -s -f --log + run: bit remove envs/angular-v15-env -s -f --log - name: Remove v15 fork - run: bit remove forks/angular-env-v15 -s -f --log + run: bit remove examples/my-angular-v15-env -s -f --log - name: Remove v13 - run: bit remove versions/angular-v13 -s -f --log + run: bit remove envs/angular-v13-env -s -f --log - name: Remove v13 fork - run: bit remove forks/angular-env-v13 -s -f --log + run: bit remove examples/my-angular-v13-env -s -f --log - name: Remove v12 - run: bit remove versions/angular-v12 -s -f --log + run: bit remove envs/angular-v12-env -s -f --log - name: Remove v12 fork - run: bit remove forks/angular-env-v12 -s -f --log + run: bit remove examples/my-angular-v12-env -s -f --log - name: Add example component - run: bit add examples/demo-lib-v14 --log + run: bit add integration/demo-lib-v14 --log - - name: Cleanup node modules + - name: Bit cc run: bit cc - - name: Cleanup node modules + - name: Cleanup capsules run: bit capsule delete --all - name: Cleanup node modules run: rm -rf node_modules - - name: Cleanup node modules + - name: Cleanup package-lock.json run: rm -rf package-lock.json - - name: Cleanup node modules + - name: Cleanup .git/bit run: rm -rf .git/bit - name: Install dependencies @@ -369,7 +369,7 @@ jobs: - uses: actions/checkout@v3 - name: Keep v13 - run: npm i replace-in-file && node scripts/keep-env.js --version=13 + run: npm i replace-in-file@6.3.5 && node scripts/keep-env.js --version=13 - name: Cleanup node modules run: rm -rf node_modules @@ -378,51 +378,51 @@ jobs: run: bit install --log - name: Remove default - run: bit remove angular -s -f --log + run: bit remove angular-env -s -f --log - name: Remove default fork - run: bit remove forks/angular-env-default -s -f --log + run: bit remove examples/my-angular-env -s -f --log - name: Remove v16 - run: bit remove versions/angular-v16 -s -f --log + run: bit remove envs/angular-v16-env -s -f --log - name: Remove v16 fork - run: bit remove forks/angular-env-v16 -s -f --log + run: bit remove examples/my-angular-v16-env -s -f --log - name: Remove v15 - run: bit remove versions/angular-v15 -s -f --log + run: bit remove envs/angular-v15-env -s -f --log - name: Remove v15 fork - run: bit remove forks/angular-env-v15 -s -f --log + run: bit remove examples/my-angular-v15-env -s -f --log - name: Remove v14 - run: bit remove versions/angular-v14 -s -f --log + run: bit remove envs/angular-v14-env -s -f --log - name: Remove v14 fork - run: bit remove forks/angular-env-v14 -s -f --log + run: bit remove examples/my-angular-v14-env -s -f --log - name: Remove v12 - run: bit remove versions/angular-v12 -s -f --log + run: bit remove envs/angular-v12-env -s -f --log - name: Remove v12 fork - run: bit remove forks/angular-env-v12 -s -f --log + run: bit remove examples/my-angular-v12-env -s -f --log - name: Add example component - run: bit add examples/demo-lib-v13 --log + run: bit add integration/demo-lib-v13 --log - - name: Cleanup node modules + - name: Bit cc run: bit cc - - name: Cleanup node modules + - name: Cleanup capsules run: bit capsule delete --all - name: Cleanup node modules run: rm -rf node_modules - - name: Cleanup node modules + - name: Cleanup package-lock.json run: rm -rf package-lock.json - - name: Cleanup node modules + - name: Cleanup .git/bit run: rm -rf .git/bit - name: Install dependencies @@ -455,7 +455,7 @@ jobs: - uses: actions/checkout@v3 - name: Keep v12 - run: npm i replace-in-file && node scripts/keep-env.js --version=12 + run: npm i replace-in-file@6.3.5 && node scripts/keep-env.js --version=12 - name: Cleanup node modules run: rm -rf node_modules @@ -464,51 +464,51 @@ jobs: run: bit install --log - name: Remove default - run: bit remove angular -s -f --log + run: bit remove angular-env -s -f --log - name: Remove default fork - run: bit remove forks/angular-env-default -s -f --log + run: bit remove examples/my-angular-env -s -f --log - name: Remove v16 - run: bit remove versions/angular-v16 -s -f --log + run: bit remove envs/angular-v16-env -s -f --log - name: Remove v16 fork - run: bit remove forks/angular-env-v16 -s -f --log + run: bit remove examples/my-angular-v16-env -s -f --log - name: Remove v15 - run: bit remove versions/angular-v15 -s -f --log + run: bit remove envs/angular-v15-env -s -f --log - name: Remove v15 fork - run: bit remove forks/angular-env-v15 -s -f --log + run: bit remove examples/my-angular-v15-env -s -f --log - name: Remove v14 - run: bit remove versions/angular-v14 -s -f --log + run: bit remove envs/angular-v14-env -s -f --log - name: Remove v14 fork - run: bit remove forks/angular-env-v14 -s -f --log + run: bit remove examples/my-angular-v14-env -s -f --log - name: Remove v13 - run: bit remove versions/angular-v13 -s -f --log + run: bit remove envs/angular-v13-env -s -f --log - name: Remove v13 fork - run: bit remove forks/angular-env-v13 -s -f --log + run: bit remove examples/my-angular-v13-env -s -f --log - name: Add example component - run: bit add examples/demo-lib-v12 --log + run: bit add integration/demo-lib-v12 --log - - name: Cleanup node modules + - name: Bit cc run: bit cc - - name: Cleanup node modules + - name: Cleanup capsules run: bit capsule delete --all - name: Cleanup node modules run: rm -rf node_modules - - name: Cleanup node modules + - name: Cleanup package-lock.json run: rm -rf package-lock.json - - name: Cleanup node modules + - name: Cleanup .git/bit run: rm -rf .git/bit - name: Install dependencies diff --git a/.gitignore b/.gitignore index bf90e2e9..016df259 100644 --- a/.gitignore +++ b/.gitignore @@ -73,6 +73,7 @@ nodeBin # bit directories .bit +**/*.eslintrc.json # DS_Store .DS_Store diff --git a/.prettierrc.cjs b/.prettierrc.cjs deleted file mode 100644 index 426b3883..00000000 --- a/.prettierrc.cjs +++ /dev/null @@ -1,4 +0,0 @@ -// bit-generated-prettier-config -module.exports = { - ...require('./node_modules/.cache/.prettierrc.bit.e4882af8861bcf5b0147891d8b70b40a10428881.cjs') -} \ No newline at end of file diff --git a/angular/envs/.eslintrc.json b/angular/envs/.eslintrc.json deleted file mode 100644 index 1e74992d..00000000 --- a/angular/envs/.eslintrc.json +++ /dev/null @@ -1,6 +0,0 @@ -// bit-generated-eslint-config -{ - "extends": [ - "./../../node_modules/.cache/.eslintrc.bit.27fd94347a9113ba5e391c8f8c9355f1307b4854.json" - ] -} \ No newline at end of file diff --git a/angular/envs/base-env/.eslintrc.json b/angular/envs/base-env/.eslintrc.json deleted file mode 100644 index 6149e572..00000000 --- a/angular/envs/base-env/.eslintrc.json +++ /dev/null @@ -1,6 +0,0 @@ -// bit-generated-eslint-config -{ - "extends": [ - "./../../../node_modules/.cache/.eslintrc.bit.8865293c0e0bd0932b8a2aefcc803073814e705f.json" - ] -} \ No newline at end of file diff --git a/angular/envs/tsconfig.json b/angular/envs/tsconfig.json deleted file mode 100644 index 687db92f..00000000 --- a/angular/envs/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -// bit-generated-typescript-config - -{ - "extends": "./../../node_modules/.cache/tsconfig.bit.f3b87b1c18fb9e87952d48c4888ed71964a4999d.json" -} \ No newline at end of file diff --git a/angular/examples/.eslintrc.json b/angular/examples/.eslintrc.json deleted file mode 100644 index 1e74992d..00000000 --- a/angular/examples/.eslintrc.json +++ /dev/null @@ -1,6 +0,0 @@ -// bit-generated-eslint-config -{ - "extends": [ - "./../../node_modules/.cache/.eslintrc.bit.27fd94347a9113ba5e391c8f8c9355f1307b4854.json" - ] -} \ No newline at end of file diff --git a/angular/examples/tsconfig.json b/angular/examples/tsconfig.json deleted file mode 100644 index 687db92f..00000000 --- a/angular/examples/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -// bit-generated-typescript-config - -{ - "extends": "./../../node_modules/.cache/tsconfig.bit.f3b87b1c18fb9e87952d48c4888ed71964a4999d.json" -} \ No newline at end of file diff --git a/integration/.eslintrc.json b/integration/.eslintrc.json deleted file mode 100644 index 97a7d5e5..00000000 --- a/integration/.eslintrc.json +++ /dev/null @@ -1,6 +0,0 @@ -// bit-generated-eslint-config -{ - "extends": [ - "./../node_modules/.cache/.eslintrc.bit.c6e5f65d29035ab6c25c07fb10bbd5e4ff3416ab.json" - ] -} \ No newline at end of file diff --git a/integration/tsconfig.json b/integration/tsconfig.json deleted file mode 100644 index aac077cb..00000000 --- a/integration/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -// bit-generated-typescript-config - -{ - "extends": "./../node_modules/.cache/tsconfig.bit.97419b053b01c53685848de90d78fc38da395744.json" -} \ No newline at end of file diff --git a/scripts/keep-env.js b/scripts/keep-env.js index 03b6c3cc..321f7bcc 100644 --- a/scripts/keep-env.js +++ b/scripts/keep-env.js @@ -19,13 +19,13 @@ const argv = key => { const regexp = []; // Remove all versions but this one const version = parseInt(argv('version')); -regexp.push(new RegExp(`\\s\\s"teambit\\.angular\\/versions\\/angular\\-v(?!${version})\\d\\d?":\\s\\{\\},\\n`, "g")); +regexp.push(new RegExp(`\\s\\s"bitdev\\.angular\\/envs\\/angular\\-v(?!${version})\\d\\d?\\-env":\\s\\{\\},\\n`, "g")); const defaultEnv = argv('default'); // Remove default env & app if needed if(!defaultEnv) { - regexp.push(new RegExp(`\\s\\s"teambit\\.angular\\/angular":\\s\\{\\},\\n`, "g")); - regexp.push(new RegExp(`\\s\\s"examples\\/demo-app":\\s\\{\\},\\n`, "g")); + regexp.push(new RegExp(`\\s\\s"bitdev\\.angular\\/angular\\-env":\\s\\{\\},\\n`, "g")); + regexp.push(new RegExp(`\\s\\s"integration\\/demo-app":\\s\\{\\},\\n`, "g")); } try { diff --git a/tsconfig.json b/tsconfig.json index d6742fbd..7b821aaa 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,10 +1,51 @@ -// bit-generated-typescript-config { - "extends": "./node_modules/.cache/tsconfig.bit.d3d4e4a560ca9ced8c4fb46e8e65bb230e5e21ef.json", "compilerOptions": { - "typeRoots": [ - "./node_modules/.cache/global-types", - "./node_modules/@types" - ] + /* Visit https://aka.ms/tsconfig.json to read more about this file */ + + /* Basic Options */ + "target": "esnext", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */ + "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */ + "lib": ["ESNext", "dom"], /* Specify library files to be included in the compilation. */ + "allowJs": true, /* Allow javascript files to be compiled. */ + + /* Strict Type-Checking Options */ + "strict": true, /* Enable all strict type-checking options. */ + // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* Enable strict null checks. */ + // "strictFunctionTypes": true, /* Enable strict checking of function types. */ + // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ + // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */ + // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ + // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ + + /* Additional Checks */ + // "noUnusedLocals": true, /* Report errors on unused locals. */ + // "noUnusedParameters": true, /* Report errors on unused parameters. */ + // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ + // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ + // "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */ + // "noPropertyAccessFromIndexSignature": true, /* Require undeclared properties from index signatures to use element accesses. */ + + /* Module Resolution Options */ + "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ + // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ + // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ + // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ + // "typeRoots": [], /* List of folders to include type definitions from. */ + // "types": [], /* Type declaration files to be included in compilation. */ + // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ + "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ + "preserveSymlinks": false, /* Do not resolve the real path of symlinks. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + + /* Experimental Options */ + "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */ + "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ + + /* Advanced Options */ + "skipLibCheck": true, /* Skip type checking of declaration files. */ + "forceConsistentCasingInFileNames": true, + /* Disallow inconsistently-cased references to the same file. */ + "jsx": "react-jsx" } -} \ No newline at end of file +} diff --git a/workspace.jsonc b/workspace.jsonc index 7fed5ce1..126fcd67 100644 --- a/workspace.jsonc +++ b/workspace.jsonc @@ -23,7 +23,7 @@ * default scope for all components in workspace. **/ "defaultScope": "bitdev.angular", - "resolveEnvsFromRoots": false + "resolveEnvsFromRoots": true }, /** * main configuration for component dependency resolution. @@ -65,7 +65,7 @@ "peerDependencies": {} }, "linkCoreAspects": true, - "rootComponents": false, + "rootComponents": true, "packageImportMethod": "copy", "packageManagerArgs": [], "devFilePatterns": [ @@ -77,20 +77,22 @@ }, "teambit.generator/generator": { "envs": [ - // "bitdev.angular/angular-env", - "bitdev.angular/envs/angular-v16-env" - // "bitdev.angular/envs/angular-v15-env", - // "bitdev.angular/envs/angular-v14-env", - // "bitdev.angular/envs/angular-v13-env", - // "bitdev.angular/envs/angular-v12-env", + "bitdev.angular/angular-env", + "bitdev.angular/envs/angular-v16-env", + "bitdev.angular/envs/angular-v15-env", + "bitdev.angular/envs/angular-v14-env", + "bitdev.angular/envs/angular-v13-env", + "bitdev.angular/envs/angular-v12-env", ] }, - // "bitdev.angular/envs/angular-v15-env": {}, - // "bitdev.angular/envs/angular-v14-env": {}, - // "bitdev.angular/envs/angular-v13-env": {}, - // "bitdev.angular/envs/angular-v12-env": {}, + "bitdev.angular/angular-env": {}, + "bitdev.angular/envs/angular-v16-env": {}, + "bitdev.angular/envs/angular-v15-env": {}, + "bitdev.angular/envs/angular-v14-env": {}, + "bitdev.angular/envs/angular-v13-env": {}, + "bitdev.angular/envs/angular-v12-env": {}, // Add angular apps (until this is no longer necessary) -// "integration/demo-app": {}, + "integration/demo-app": {}, /** * workspace variants allow you to set different subsets of configuration for components in your workspace. * this is extremely useful for upgrading, aligning and building components with a