Skip to content

Commit b818021

Browse files
committed
fix: various fixes for all versions & cleanup left over configs
1 parent cb2ddfa commit b818021

File tree

17 files changed

+29
-36
lines changed

17 files changed

+29
-36
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ jobs:
264264
run: bit test --log
265265

266266
- name: Bit build
267-
run: bit build --log
267+
run: NODE_OPTIONS=--openssl-legacy-provider bit build --log
268268

269269
- uses: actions/upload-artifact@v3
270270
with:

angular/devkit/common/component.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"typescript": ">= 3.5.3"
1717
}
1818
}
19-
},
20-
"teambit.node/[email protected]": {}
19+
}
2120
}
2221
}

angular/devkit/compiler/elements/component.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
"@babel/runtime": "7.22.15"
4747
}
4848
}
49-
},
50-
"teambit.node/[email protected]": {}
49+
}
5150
}
5251
}

angular/devkit/compiler/multi-compiler/component.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"@angular/compiler-cli": ">= 8.0.0"
2222
}
2323
}
24-
},
25-
"teambit.node/[email protected]": {}
24+
}
2625
}
2726
}

angular/devkit/compiler/ng-packagr/component.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"ng-packagr": ">=5.0.0"
1818
}
1919
}
20-
},
21-
"teambit.node/[email protected]": {}
20+
}
2221
}
2322
}

angular/devkit/linter/eslint/component.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"eslint": ">= 7.0.0"
2121
}
2222
}
23-
},
24-
"teambit.node/[email protected]": {}
23+
}
2524
}
2625
}

angular/devkit/linter/eslint/config/tsconfig.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,33 @@
11
{
22
"compilerOptions": {
3+
"allowJs": true,
34
"baseUrl": "./",
45
"declaration": false,
56
"downlevelIteration": true,
7+
"emitDecoratorMetadata": true,
8+
"esModuleInterop": true,
69
"experimentalDecorators": true,
710
"forceConsistentCasingInFileNames": true,
811
"importHelpers": true,
912
"jsx": "react-jsx",
1013
"lib": [
1114
"es2018",
15+
"ESNext",
1216
"dom"
1317
],
1418
"module": "esnext",
1519
"moduleResolution": "node",
1620
"noFallthroughCasesInSwitch": true,
1721
"noImplicitReturns": true,
1822
"outDir": "./dist/out-tsc",
23+
"preserveSymlinks": true,
24+
"skipLibCheck": true,
1925
"sourceMap": true,
2026
"strict": true,
21-
"target": "es2015",
22-
"allowJs": true
27+
"target": "es2015"
2328
},
2429
"exclude": ["artifacts", "public", "dist", "node_modules", "package.json"],
30+
"include": ["**/*", "**/*.json"],
2531
"angularCompilerOptions": {
2632
"enableI18nLegacyMessageIdFormat": false,
2733
"strictInjectionParameters": true,

angular/devkit/ng-compat/component.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"webpack": ">= 4.44.2"
1616
}
1717
}
18-
},
19-
"teambit.node/[email protected]": {}
18+
}
2019
}
2120
}

angular/devkit/ngcc/component.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"@angular/compiler-cli": ">= 8.0.0"
1515
}
1616
}
17-
},
18-
"teambit.node/[email protected]": {}
17+
}
1918
}
2019
}

angular/devkit/preview/mounter/component.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
"zone.js": ">= 0.9.1"
2020
}
2121
}
22-
},
23-
"teambit.node/[email protected]": {}
22+
}
2423
}
2524
}

angular/devkit/preview/preview/component.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"zone.js": ">= 0.9.1"
2727
}
2828
}
29-
},
30-
"teambit.node/[email protected]": {}
29+
}
3130
}
3231
}

angular/devkit/preview/runtime/component.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
"zone.js": ">= 0.9.1"
1919
}
2020
}
21-
},
22-
"teambit.node/[email protected]": {}
21+
}
2322
}
2423
}

angular/devkit/webpack/component.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
"@babel/runtime": "7.22.15"
2020
}
2121
}
22-
},
23-
"teambit.node/[email protected]": {}
22+
}
2423
}
2524
}

angular/envs/angular-v12-env/component.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
"@angular-devkit/build-webpack": "~0.1202.16",
1515
"@angular-devkit/core": "^12.2.16",
1616
"@angular-devkit/schematics": "^12.2.16",
17-
"@angular-eslint/eslint-plugin": "^12.1.0",
18-
"@angular-eslint/eslint-plugin-template": "^12.1.0",
19-
"@angular-eslint/template-parser": "^12.1.0",
17+
"@angular-eslint/eslint-plugin": "~13.0.1",
18+
"@angular-eslint/eslint-plugin-template": "~13.0.1",
19+
"@angular-eslint/template-parser": "~13.0.1",
2020
"@angular/animations": "^12.2.16",
2121
"@angular/cli": "~12.2.16",
2222
"@angular/common": "^12.2.16",
@@ -27,15 +27,15 @@
2727
"@angular/platform-browser": "^12.2.16",
2828
"@angular/platform-browser-dynamic": "^12.2.16",
2929
"@ngtools/webpack": "^12.2.16",
30-
"@types/eslint": "^7.28.0",
30+
"@types/eslint": "^8.2.0",
3131
"@types/jest": "~27.0.1",
3232
"@types/react-dev-utils": "~9.0.8",
3333
"@types/remark-prism": "~1.3.0",
3434
"@types/webpack-dev-server": "4.3.1",
3535
"@types/webpack-dev-middleware": "5.0.2",
36-
"@typescript-eslint/eslint-plugin": "^4.26.0",
37-
"@typescript-eslint/parser": "^4.26.0",
38-
"eslint": "7.26.0",
36+
"@typescript-eslint/eslint-plugin": "^5.3.0",
37+
"@typescript-eslint/parser": "^5.3.0",
38+
"eslint": "8.2.0",
3939
"events": "^3.2.0",
4040
"html-loader": "~2.1.2",
4141
"jest": "~27.0.4",

angular/envs/angular-v17-env/webpack-config.factory.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ async function getWebpackConfig(
132132
...logger,
133133
log: logger.console
134134
} as any as logging.LoggerApi;
135-
console.log(browserOptions);
136135
const normalizedOptions = normalizeBrowserSchema(
137136
normalizedWorkspaceRoot,
138137
projectRoot,

angular/envs/base-env/component.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
"zone.js": ">= 0.9.1"
5353
}
5454
}
55-
},
56-
"teambit.node/[email protected]": {}
55+
}
5756
}
5857
}

workspace.jsonc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/**
2323
* default scope for all components in workspace.
2424
**/
25-
"defaultScope": "bitdev.angular",
25+
"defaultScope": "integration.examples",
2626
"resolveEnvsFromRoots": true
2727
},
2828
/**

0 commit comments

Comments
 (0)