Skip to content

Commit 0ab7cd1

Browse files
camdecostercamdecoster
committed
Merge remote-tracking branch 'origin/master' into cam/7523/switch-color-library
2 parents e314022 + b1e1157 commit 0ab7cd1

File tree

16 files changed

+290
-219
lines changed

16 files changed

+290
-219
lines changed

‎biome.json‎

Lines changed: 137 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -1,140 +1,139 @@
11
{
2-
"$schema": "https://biomejs.dev/schemas/1.8.3/schema.json",
3-
"organizeImports": { "enabled": true },
4-
"files": {
5-
"maxSize": 10000000,
6-
"include": [
7-
"src",
8-
"lib",
9-
"test",
10-
"tasks",
11-
"devtools"
12-
],
13-
"ignore": [
14-
"test/plot-schema.json",
15-
"dist",
16-
"stackgl_modules",
17-
"node_modules",
18-
"build",
19-
"tasks/test_amdefine.js",
20-
"tasks/test_requirejs.js",
21-
"test/jasmine/assets/jquery-1.8.3.min.js"
22-
]
23-
},
24-
"linter": {
25-
"enabled": true,
26-
"rules": {
27-
"recommended": false,
28-
"complexity": {
29-
"noExtraBooleanCast": "error",
30-
"noMultipleSpacesInRegularExpressionLiterals": "error",
31-
"noUselessCatch": "error",
32-
"noWith": "error",
33-
"useLiteralKeys": "error"
34-
},
35-
"correctness": {
36-
"noConstAssign": "error",
37-
"noConstantCondition": "error",
38-
"noEmptyCharacterClassInRegex": "error",
39-
"noEmptyPattern": "error",
40-
"noGlobalObjectCalls": "error",
41-
"noInnerDeclarations": "off",
42-
"noInvalidConstructorSuper": "error",
43-
"noInvalidUseBeforeDeclaration": "error",
44-
"noNewSymbol": "error",
45-
"noNonoctalDecimalEscape": "error",
46-
"noPrecisionLoss": "error",
47-
"noSelfAssign": "error",
48-
"noSetterReturn": "error",
49-
"noSwitchDeclarations": "off",
50-
"noUndeclaredVariables": "off",
51-
"noUnreachable": "error",
52-
"noUnreachableSuper": "error",
53-
"noUnsafeFinally": "error",
54-
"noUnsafeOptionalChaining": "error",
55-
"noUnusedLabels": "error",
56-
"noUnusedVariables": "off",
57-
"useIsNan": "error",
58-
"useValidForDirection": "error",
59-
"useYield": "error"
60-
},
61-
"style": {
62-
"useBlockStatements": "off",
63-
"useSingleVarDeclarator": "off",
64-
"noVar": "off"
65-
},
66-
"suspicious": {
67-
"noAssignInExpressions": "off",
68-
"noAsyncPromiseExecutor": "error",
69-
"noCatchAssign": "error",
70-
"noClassAssign": "error",
71-
"noCompareNegZero": "error",
72-
"noConsoleLog": "off",
73-
"noControlCharactersInRegex": "error",
74-
"noDebugger": "error",
75-
"noDoubleEquals": "off",
76-
"noDuplicateCase": "error",
77-
"noDuplicateClassMembers": "error",
78-
"noDuplicateObjectKeys": "error",
79-
"noDuplicateParameters": "error",
80-
"noEmptyBlockStatements": "off",
81-
"noFallthroughSwitchClause": "off",
82-
"noFunctionAssign": "error",
83-
"noGlobalAssign": "error",
84-
"noImportAssign": "error",
85-
"noMisleadingCharacterClass": "error",
86-
"noPrototypeBuiltins": "off",
87-
"noRedeclare": "off",
88-
"noShadowRestrictedNames": "off",
89-
"noUnsafeNegation": "error",
90-
"useGetterReturn": "error",
91-
"useValidTypeof": "error"
92-
}
93-
},
94-
"ignore": [
95-
"**/stackgl_modules",
96-
"**/node_modules",
97-
"**/dist",
98-
"**/build",
99-
"tasks/test_amdefine.js",
100-
"tasks/test_requirejs.js",
101-
"test/jasmine/assets/jquery-1.8.3.min.js"
102-
]
103-
},
104-
"javascript": {
105-
"globals": [
106-
"Promise",
107-
"Float32Array",
108-
"Uint8ClampedArray",
109-
"Int32Array",
110-
"ArrayBuffer",
111-
"Uint16Array",
112-
"DataView",
113-
"Float64Array",
114-
"Int16Array",
115-
"Uint8Array",
116-
"Int8Array",
117-
"Uint32Array"
118-
],
119-
"formatter": {
120-
"quoteStyle": "single",
121-
"trailingCommas": "none",
122-
"indentStyle": "space",
123-
"indentWidth": 4,
124-
"lineEnding": "lf",
125-
"lineWidth": 120
126-
}
127-
},
128-
"json": {
129-
"linter": {
130-
"enabled": true
131-
},
132-
"formatter": {
133-
"enabled": true,
134-
"indentStyle": "space",
135-
"indentWidth": 1,
136-
"lineEnding": "lf",
137-
"lineWidth": 80
138-
}
139-
}
2+
"$schema": "https://biomejs.dev/schemas/2.2.0/schema.json",
3+
"assist": { "actions": { "source": { "organizeImports": "on" } } },
4+
"files": {
5+
"maxSize": 10000000,
6+
"includes": [
7+
"**/src/**",
8+
"**/lib/**",
9+
"**/test/**",
10+
"**/tasks/**",
11+
"**/devtools/**",
12+
"!**/test/plot-schema.json",
13+
"!**/dist",
14+
"!**/stackgl_modules",
15+
"!**/node_modules",
16+
"!**/build",
17+
"!**/tasks/test_amdefine.js",
18+
"!**/tasks/test_requirejs.js",
19+
"!**/test/jasmine/assets/jquery-1.8.3.min.js"
20+
]
21+
},
22+
"linter": {
23+
"enabled": true,
24+
"rules": {
25+
"recommended": false,
26+
"complexity": {
27+
"noExtraBooleanCast": "error",
28+
"noUselessCatch": "error",
29+
"useLiteralKeys": "error",
30+
"noAdjacentSpacesInRegex": "error"
31+
},
32+
"correctness": {
33+
"noConstAssign": "error",
34+
"noConstantCondition": "error",
35+
"noEmptyCharacterClassInRegex": "error",
36+
"noEmptyPattern": "error",
37+
"noGlobalObjectCalls": "error",
38+
"noInnerDeclarations": "off",
39+
"noInvalidConstructorSuper": "error",
40+
"noInvalidUseBeforeDeclaration": "error",
41+
"noNonoctalDecimalEscape": "error",
42+
"noPrecisionLoss": "error",
43+
"noSelfAssign": "error",
44+
"noSetterReturn": "error",
45+
"noSwitchDeclarations": "off",
46+
"noUndeclaredVariables": "off",
47+
"noUnreachable": "error",
48+
"noUnreachableSuper": "error",
49+
"noUnsafeFinally": "error",
50+
"noUnsafeOptionalChaining": "error",
51+
"noUnusedLabels": "error",
52+
"noUnusedVariables": "off",
53+
"useIsNan": "error",
54+
"useValidForDirection": "error",
55+
"useYield": "error",
56+
"noInvalidBuiltinInstantiation": "error",
57+
"useValidTypeof": "error"
58+
},
59+
"style": {
60+
"useBlockStatements": "off",
61+
"useSingleVarDeclarator": "off"
62+
},
63+
"suspicious": {
64+
"noAssignInExpressions": "off",
65+
"noAsyncPromiseExecutor": "error",
66+
"noCatchAssign": "error",
67+
"noClassAssign": "error",
68+
"noCompareNegZero": "error",
69+
"noControlCharactersInRegex": "error",
70+
"noDebugger": "error",
71+
"noDoubleEquals": "off",
72+
"noDuplicateCase": "error",
73+
"noDuplicateClassMembers": "error",
74+
"noDuplicateObjectKeys": "error",
75+
"noDuplicateParameters": "error",
76+
"noEmptyBlockStatements": "off",
77+
"noFallthroughSwitchClause": "off",
78+
"noFunctionAssign": "error",
79+
"noGlobalAssign": "error",
80+
"noImportAssign": "error",
81+
"noMisleadingCharacterClass": "error",
82+
"noPrototypeBuiltins": "off",
83+
"noRedeclare": "off",
84+
"noShadowRestrictedNames": "off",
85+
"noUnsafeNegation": "error",
86+
"useGetterReturn": "error",
87+
"noWith": "error",
88+
"noVar": "off",
89+
"noConsole": { "level": "off", "options": { "allow": ["log"] } }
90+
}
91+
},
92+
"includes": [
93+
"**",
94+
"!**/stackgl_modules",
95+
"!**/node_modules",
96+
"!**/dist",
97+
"!**/build",
98+
"!**/tasks/test_amdefine.js",
99+
"!**/tasks/test_requirejs.js",
100+
"!**/test/jasmine/assets/jquery-1.8.3.min.js"
101+
]
102+
},
103+
"javascript": {
104+
"globals": [
105+
"Promise",
106+
"Float32Array",
107+
"Uint8ClampedArray",
108+
"Int32Array",
109+
"ArrayBuffer",
110+
"Uint16Array",
111+
"DataView",
112+
"Float64Array",
113+
"Int16Array",
114+
"Uint8Array",
115+
"Int8Array",
116+
"Uint32Array"
117+
],
118+
"formatter": {
119+
"quoteStyle": "single",
120+
"trailingCommas": "none",
121+
"indentStyle": "space",
122+
"indentWidth": 4,
123+
"lineEnding": "lf",
124+
"lineWidth": 120
125+
}
126+
},
127+
"json": {
128+
"linter": {
129+
"enabled": true
130+
},
131+
"formatter": {
132+
"enabled": true,
133+
"indentStyle": "space",
134+
"indentWidth": 1,
135+
"lineEnding": "lf",
136+
"lineWidth": 80
137+
}
138+
}
140139
}

‎devtools/test_dashboard/index-strict.html‎

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

‎devtools/test_dashboard/index.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
</div>
2222
<div id="snapshot"></div>
2323

24+
<!-- Update UI elements if strict mode is enabled -->
25+
<script src="./strict.js"></script>
26+
2427
<script src="../../node_modules/@plotly/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG"></script>
2528
<script charset="utf-8" id="source" src="../../build/plotly.js"></script>
2629
<script charset="utf-8" src="../../build/test_dashboard-bundle.js"></script>

‎devtools/test_dashboard/server.mjs‎

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,22 +62,45 @@ console.log('watching esbuild...');
6262
await ctx.watch();
6363

6464
function devServer() {
65-
var server = http.createServer(ecstatic({
65+
const staticFilesHandler = ecstatic({
6666
root: constants.pathToRoot,
6767
cache: 0,
6868
gzip: true,
6969
cors: true
70-
}));
70+
});
71+
72+
const server = http.createServer((req, res) => {
73+
if(strict) {
74+
res.setHeader(
75+
'Content-Security-Policy',
76+
// Comment/uncomment for testing CSP. Changes require a server restart.
77+
[
78+
// "default-src 'self'",
79+
"script-src 'self'",
80+
"style-src 'self' 'unsafe-inline'",
81+
// "img-src 'self' data: blob:",
82+
// "font-src 'self' data:",
83+
// "connect-src 'self'",
84+
// "object-src 'none'",
85+
// "base-uri 'self';",
86+
"worker-src blob:",
87+
].join("; ")
88+
)
89+
}
90+
91+
staticFilesHandler(req, res)
92+
})
7193

7294
// Start the server up!
7395
server.listen(PORT);
7496

97+
let indexName = 'index';
98+
if(mathjax3) indexName += '-mathjax3'
99+
else if(mathjax3chtml) indexName += '-mathjax3chtml'
100+
indexName += '.html'
101+
75102
// open up browser window
76-
open('http://localhost:' + PORT + '/devtools/test_dashboard/index' + (
77-
strict ? '-strict' :
78-
mathjax3 ? '-mathjax3' :
79-
mathjax3chtml ? '-mathjax3chtml' : ''
80-
) + '.html');
103+
open(`http://localhost:${PORT}/devtools/test_dashboard/${indexName}${strict ? '?strict=true' : ''}`);
81104
}
82105

83106
function getMockFiles() {

‎devtools/test_dashboard/strict.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
if ((new URLSearchParams(location.search)).get("strict")) {
2+
const strictDiv = document.createElement("div");
3+
strictDiv.id = "strict-div";
4+
strictDiv.textContent = "STRICT MODE";
5+
document.querySelector("#reload-time").insertAdjacentElement('afterend', strictDiv);
6+
document.querySelector("title").innerText = "Plotly.js 'strict' Devtools";
7+
}

‎devtools/test_dashboard/style.css‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ header span{
3333
font-size: 10px;
3434
line-height: 40px;
3535
}
36+
#strict-div{
37+
color: #F00;
38+
font-weight: 600;
39+
display: inline-block;
40+
}
3641
#mocks-list{
3742
position: fixed;
3843
right: 0px;

‎draftlogs/7522_fix.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Refactor `drawMainTitle` to use context-specific selections for title and subtitle, avoiding conflicts when multiple plots are present on the same page [[#7522](https://github.com/plotly/plotly.js/pull/7522)]

‎draftlogs/7534_fix.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Calculate colorscale properly for histogram when marker `cmin`/`cmax`/`cmid` values are undefined [[#7534](https://github.com/plotly/plotly.js/pull/7534)]

0 commit comments

Comments
 (0)