Skip to content

Commit 6eb66b1

Browse files
committed
Merge branch 'develop' into bvandercar/segmentedcontrol-value-types
2 parents 92d2661 + 69b7ff6 commit 6eb66b1

File tree

303 files changed

+4239
-3317
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

303 files changed

+4239
-3317
lines changed

.eslintrc.js

Lines changed: 0 additions & 80 deletions
This file was deleted.

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"editor.defaultFormatter": "esbenp.prettier-vscode",
2626
"editor.formatOnSave": true
2727
},
28+
"eslint.useFlatConfig": true,
2829
"eslint.format.enable": false,
2930
"eslint.workingDirectories": [
3031
{
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/lib/rules/header.js b/lib/rules/header.js
2+
index 3504b6fc59b780674e652ad1ca944cb3577b8fed..1c78246d17b1a21c28fd0740da12a8ab383dcd7d 100644
3+
--- a/lib/rules/header.js
4+
+++ b/lib/rules/header.js
5+
@@ -121,7 +121,8 @@ function matchesLineEndings(src, num) {
6+
module.exports = {
7+
meta: {
8+
type: "layout",
9+
- fixable: "whitespace"
10+
+ fixable: "whitespace",
11+
+ schema: false
12+
},
13+
create: function(context) {
14+
var options = context.options;

eslint.config.js

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
/*
2+
* Copyright 2025 Palantir Technologies, Inc. All rights reserved.
3+
* Licensed under the Apache License, Version 2.0 (the "License");
4+
* you may not use this file except in compliance with the License.
5+
* You may obtain a copy of the License at
6+
*
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*
9+
* Unless required by applicable law or agreed to in writing, software
10+
* distributed under the License is distributed on an "AS IS" BASIS,
11+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* See the License for the specific language governing permissions and
13+
* limitations under the License.
14+
*/
15+
16+
const globals = require("globals");
17+
const tseslint = require("typescript-eslint");
18+
const config = require("./packages/eslint-config/index.js");
19+
20+
module.exports = tseslint.config([
21+
config,
22+
{
23+
settings: {
24+
react: {
25+
version: "detect",
26+
},
27+
},
28+
rules: {
29+
"no-console": "error",
30+
// we have these across the codebase, it's not useful for this repo
31+
"@blueprintjs/no-deprecated-type-references": "off",
32+
// TODO(adahiya): remove this import restriction in Blueprint v6 after dropping CommonJS support
33+
"no-restricted-imports": [
34+
"error",
35+
{
36+
name: "lodash-es",
37+
message: "lodash-es cannot be imported in CommonJS, use lodash submodules instead",
38+
},
39+
],
40+
// Run import/no-cycle only in CI because it is slow.
41+
"import/no-cycle": process.env.LINT_SCRIPT ? "error" : "off",
42+
},
43+
},
44+
{
45+
files: ["**/test/**/*.{ts,tsx,js,mjs}", "**/test/isotest.mjs"],
46+
languageOptions: {
47+
globals: {
48+
...globals.browser,
49+
...globals.mocha,
50+
},
51+
},
52+
rules: {
53+
// HACKHACK: many test assertions are written with this syntax
54+
"@typescript-eslint/no-unused-expressions": "off",
55+
// HACKHACK: test dependencies are only declared at root but used in all packages.
56+
"import/no-extraneous-dependencies": "off",
57+
},
58+
},
59+
{
60+
files: ["**/webpack.config.{js,mjs}", "**/scripts/*.{js,mjs}"],
61+
languageOptions: {
62+
globals: { ...globals.node },
63+
},
64+
rules: {
65+
"prefer-object-spread": "off",
66+
"import/no-default-export": "off",
67+
"import/no-extraneous-dependencies": [
68+
"error",
69+
{
70+
devDependencies: true,
71+
},
72+
],
73+
},
74+
},
75+
{
76+
ignores: [
77+
"**/node_modules",
78+
"**/dist",
79+
"**/lib",
80+
"**/fixtures",
81+
"**/coverage",
82+
"**/__snapshots__",
83+
"**/generated",
84+
],
85+
},
86+
]);

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@
4949
"@yarnpkg/types": "^4.0.0",
5050
"chai": "^5.0.0",
5151
"dedent": "^1.5.1",
52-
"eslint": "^8.56.0",
52+
"eslint": "^9.20.0",
5353
"gh-pages": "^6.1.1",
54+
"globals": "^15.14.0",
5455
"http-server": "^14.1.1",
5556
"npm-run-all": "^4.1.5",
5657
"nx": "^17.2.8",
@@ -61,6 +62,7 @@
6162
"stylelint-config-palantir": "^7.4.0",
6263
"stylelint-scss": "^6.8.1",
6364
"typescript": "~5.3.3",
65+
"typescript-eslint": "^8.23.0",
6466
"yargs": "^17.7.2",
6567
"yarn-deduplicate": "^6.0.2"
6668
},

packages/colors/.eslintrc.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

packages/colors/eslint.config.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
const config = require("../../eslint.config.js");
2+
const tseslint = require("typescript-eslint");
3+
4+
module.exports = tseslint.config([
5+
config,
6+
{
7+
ignores: ["node_modules", "dist", "lib", "fixtures", "coverage", "__snapshots__", "generated"],
8+
},
9+
]);

packages/colors/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@blueprintjs/colors",
3-
"version": "5.1.5",
3+
"version": "5.1.7",
44
"description": "Blueprint color definitions",
55
"main": "lib/cjs/index.js",
66
"module": "lib/esm/index.js",

packages/colors/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@
1515
*/
1616

1717
export { Colors } from "./colors";
18-
// eslint-disable-next-line deprecation/deprecation
1918
export { LegacyColors } from "./legacyColors";

packages/core/karma.conf.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ module.exports = async function (config) {
2020
"src/accessibility/*",
2121
"src/common/abstractComponent*",
2222
"src/common/abstractPureComponent*",
23+
"src/common/alignment.ts",
24+
"src/common/errors.ts",
2325
"src/components/html/html.tsx",
2426
// focus mangement is difficult to test, and this function may no longer be required
2527
// if we use the react-focus-lock library in Overlay2.

0 commit comments

Comments
 (0)