From b81802135406740c06911269bcb0e88400bfb8a4 Mon Sep 17 00:00:00 2001 From: Olivier Combe Date: Fri, 13 Oct 2023 17:17:00 +0200 Subject: [PATCH] fix: various fixes for all versions & cleanup left over configs --- .github/workflows/main.yml | 2 +- angular/devkit/common/component.json | 3 +-- angular/devkit/compiler/elements/component.json | 3 +-- .../devkit/compiler/multi-compiler/component.json | 3 +-- angular/devkit/compiler/ng-packagr/component.json | 3 +-- angular/devkit/linter/eslint/component.json | 3 +-- angular/devkit/linter/eslint/config/tsconfig.json | 10 ++++++++-- angular/devkit/ng-compat/component.json | 3 +-- angular/devkit/ngcc/component.json | 3 +-- angular/devkit/preview/mounter/component.json | 3 +-- angular/devkit/preview/preview/component.json | 3 +-- angular/devkit/preview/runtime/component.json | 3 +-- angular/devkit/webpack/component.json | 3 +-- angular/envs/angular-v12-env/component.json | 14 +++++++------- .../envs/angular-v17-env/webpack-config.factory.ts | 1 - angular/envs/base-env/component.json | 3 +-- workspace.jsonc | 2 +- 17 files changed, 29 insertions(+), 36 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f5041e82..c33b7f0a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -264,7 +264,7 @@ jobs: run: bit test --log - name: Bit build - run: bit build --log + run: NODE_OPTIONS=--openssl-legacy-provider bit build --log - uses: actions/upload-artifact@v3 with: diff --git a/angular/devkit/common/component.json b/angular/devkit/common/component.json index ac99f3e6..c3fb7ede 100644 --- a/angular/devkit/common/component.json +++ b/angular/devkit/common/component.json @@ -16,7 +16,6 @@ "typescript": ">= 3.5.3" } } - }, - "teambit.node/node@1.0.16": {} + } } } diff --git a/angular/devkit/compiler/elements/component.json b/angular/devkit/compiler/elements/component.json index 085cc8e3..798d7f68 100644 --- a/angular/devkit/compiler/elements/component.json +++ b/angular/devkit/compiler/elements/component.json @@ -46,7 +46,6 @@ "@babel/runtime": "7.22.15" } } - }, - "teambit.node/node@1.0.16": {} + } } } diff --git a/angular/devkit/compiler/multi-compiler/component.json b/angular/devkit/compiler/multi-compiler/component.json index ba62dfa2..bbf650d1 100644 --- a/angular/devkit/compiler/multi-compiler/component.json +++ b/angular/devkit/compiler/multi-compiler/component.json @@ -21,7 +21,6 @@ "@angular/compiler-cli": ">= 8.0.0" } } - }, - "teambit.node/node@1.0.16": {} + } } } diff --git a/angular/devkit/compiler/ng-packagr/component.json b/angular/devkit/compiler/ng-packagr/component.json index 03df1cab..23d919c0 100644 --- a/angular/devkit/compiler/ng-packagr/component.json +++ b/angular/devkit/compiler/ng-packagr/component.json @@ -17,7 +17,6 @@ "ng-packagr": ">=5.0.0" } } - }, - "teambit.node/node@1.0.16": {} + } } } diff --git a/angular/devkit/linter/eslint/component.json b/angular/devkit/linter/eslint/component.json index a83eef91..bf3a758e 100644 --- a/angular/devkit/linter/eslint/component.json +++ b/angular/devkit/linter/eslint/component.json @@ -20,7 +20,6 @@ "eslint": ">= 7.0.0" } } - }, - "teambit.node/node@1.0.16": {} + } } } diff --git a/angular/devkit/linter/eslint/config/tsconfig.json b/angular/devkit/linter/eslint/config/tsconfig.json index 13cca2c4..34e3e1eb 100644 --- a/angular/devkit/linter/eslint/config/tsconfig.json +++ b/angular/devkit/linter/eslint/config/tsconfig.json @@ -1,14 +1,18 @@ { "compilerOptions": { + "allowJs": true, "baseUrl": "./", "declaration": false, "downlevelIteration": true, + "emitDecoratorMetadata": true, + "esModuleInterop": true, "experimentalDecorators": true, "forceConsistentCasingInFileNames": true, "importHelpers": true, "jsx": "react-jsx", "lib": [ "es2018", + "ESNext", "dom" ], "module": "esnext", @@ -16,12 +20,14 @@ "noFallthroughCasesInSwitch": true, "noImplicitReturns": true, "outDir": "./dist/out-tsc", + "preserveSymlinks": true, + "skipLibCheck": true, "sourceMap": true, "strict": true, - "target": "es2015", - "allowJs": true + "target": "es2015" }, "exclude": ["artifacts", "public", "dist", "node_modules", "package.json"], + "include": ["**/*", "**/*.json"], "angularCompilerOptions": { "enableI18nLegacyMessageIdFormat": false, "strictInjectionParameters": true, diff --git a/angular/devkit/ng-compat/component.json b/angular/devkit/ng-compat/component.json index 6704c50e..2557877f 100644 --- a/angular/devkit/ng-compat/component.json +++ b/angular/devkit/ng-compat/component.json @@ -15,7 +15,6 @@ "webpack": ">= 4.44.2" } } - }, - "teambit.node/node@1.0.16": {} + } } } diff --git a/angular/devkit/ngcc/component.json b/angular/devkit/ngcc/component.json index adf7034e..5328c641 100644 --- a/angular/devkit/ngcc/component.json +++ b/angular/devkit/ngcc/component.json @@ -14,7 +14,6 @@ "@angular/compiler-cli": ">= 8.0.0" } } - }, - "teambit.node/node@1.0.16": {} + } } } diff --git a/angular/devkit/preview/mounter/component.json b/angular/devkit/preview/mounter/component.json index f7a5e580..eb30ac38 100644 --- a/angular/devkit/preview/mounter/component.json +++ b/angular/devkit/preview/mounter/component.json @@ -19,7 +19,6 @@ "zone.js": ">= 0.9.1" } } - }, - "teambit.node/node@1.0.16": {} + } } } diff --git a/angular/devkit/preview/preview/component.json b/angular/devkit/preview/preview/component.json index 3db3ba78..1431659e 100644 --- a/angular/devkit/preview/preview/component.json +++ b/angular/devkit/preview/preview/component.json @@ -26,7 +26,6 @@ "zone.js": ">= 0.9.1" } } - }, - "teambit.node/node@1.0.16": {} + } } } diff --git a/angular/devkit/preview/runtime/component.json b/angular/devkit/preview/runtime/component.json index 6013e589..83aabea6 100644 --- a/angular/devkit/preview/runtime/component.json +++ b/angular/devkit/preview/runtime/component.json @@ -18,7 +18,6 @@ "zone.js": ">= 0.9.1" } } - }, - "teambit.node/node@1.0.16": {} + } } } diff --git a/angular/devkit/webpack/component.json b/angular/devkit/webpack/component.json index fff91795..f6c57011 100644 --- a/angular/devkit/webpack/component.json +++ b/angular/devkit/webpack/component.json @@ -19,7 +19,6 @@ "@babel/runtime": "7.22.15" } } - }, - "teambit.node/node@1.0.16": {} + } } } diff --git a/angular/envs/angular-v12-env/component.json b/angular/envs/angular-v12-env/component.json index ffc9949b..957847f9 100644 --- a/angular/envs/angular-v12-env/component.json +++ b/angular/envs/angular-v12-env/component.json @@ -14,9 +14,9 @@ "@angular-devkit/build-webpack": "~0.1202.16", "@angular-devkit/core": "^12.2.16", "@angular-devkit/schematics": "^12.2.16", - "@angular-eslint/eslint-plugin": "^12.1.0", - "@angular-eslint/eslint-plugin-template": "^12.1.0", - "@angular-eslint/template-parser": "^12.1.0", + "@angular-eslint/eslint-plugin": "~13.0.1", + "@angular-eslint/eslint-plugin-template": "~13.0.1", + "@angular-eslint/template-parser": "~13.0.1", "@angular/animations": "^12.2.16", "@angular/cli": "~12.2.16", "@angular/common": "^12.2.16", @@ -27,15 +27,15 @@ "@angular/platform-browser": "^12.2.16", "@angular/platform-browser-dynamic": "^12.2.16", "@ngtools/webpack": "^12.2.16", - "@types/eslint": "^7.28.0", + "@types/eslint": "^8.2.0", "@types/jest": "~27.0.1", "@types/react-dev-utils": "~9.0.8", "@types/remark-prism": "~1.3.0", "@types/webpack-dev-server": "4.3.1", "@types/webpack-dev-middleware": "5.0.2", - "@typescript-eslint/eslint-plugin": "^4.26.0", - "@typescript-eslint/parser": "^4.26.0", - "eslint": "7.26.0", + "@typescript-eslint/eslint-plugin": "^5.3.0", + "@typescript-eslint/parser": "^5.3.0", + "eslint": "8.2.0", "events": "^3.2.0", "html-loader": "~2.1.2", "jest": "~27.0.4", diff --git a/angular/envs/angular-v17-env/webpack-config.factory.ts b/angular/envs/angular-v17-env/webpack-config.factory.ts index 2e3c50be..c332991f 100644 --- a/angular/envs/angular-v17-env/webpack-config.factory.ts +++ b/angular/envs/angular-v17-env/webpack-config.factory.ts @@ -132,7 +132,6 @@ async function getWebpackConfig( ...logger, log: logger.console } as any as logging.LoggerApi; - console.log(browserOptions); const normalizedOptions = normalizeBrowserSchema( normalizedWorkspaceRoot, projectRoot, diff --git a/angular/envs/base-env/component.json b/angular/envs/base-env/component.json index f648c425..c0612def 100644 --- a/angular/envs/base-env/component.json +++ b/angular/envs/base-env/component.json @@ -52,7 +52,6 @@ "zone.js": ">= 0.9.1" } } - }, - "teambit.node/node@1.0.16": {} + } } } diff --git a/workspace.jsonc b/workspace.jsonc index 2dfeeb1e..aedae15b 100644 --- a/workspace.jsonc +++ b/workspace.jsonc @@ -22,7 +22,7 @@ /** * default scope for all components in workspace. **/ - "defaultScope": "bitdev.angular", + "defaultScope": "integration.examples", "resolveEnvsFromRoots": true }, /**