Skip to content

Commit 5d576e4

Browse files
authored
Merge branch 'master' into fix/107166-value-aggregation-none-persist
2 parents a525dc9 + 69ce27f commit 5d576e4

23 files changed

Lines changed: 6189 additions & 7051 deletions

File tree

.github/dependabot.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ updates:
1010

1111
- package-ecosystem: "npm"
1212
ignore:
13-
- dependency-name: "react-error-boundary"
1413
- dependency-name: "@rjsf/*"
15-
# remark-gfm v4+ requires react-markdown v9+, which needs React 18
16-
- dependency-name: "remark-gfm"
17-
- dependency-name: "react-markdown"
1814
# TODO: remove below entries until React >= 19.0.0
1915
- dependency-name: "react-icons"
2016
# JSDOM v30 doesn't play well with Jest v30
@@ -78,8 +74,6 @@ updates:
7874

7975
- package-ecosystem: "npm"
8076
directory: "/docs/"
81-
ignore:
82-
- dependency-name: "react-error-boundary"
8377
schedule:
8478
interval: "daily"
8579
open-pull-requests-limit: 10
@@ -376,11 +370,6 @@ updates:
376370

377371
- package-ecosystem: "npm"
378372
directory: "/superset-frontend/packages/superset-ui-core/"
379-
ignore:
380-
# not until React >= 18.0.0
381-
- dependency-name: "react-markdown"
382-
- dependency-name: "remark-gfm"
383-
- dependency-name: "react-error-boundary"
384373
schedule:
385374
interval: "daily"
386375
labels:

docs/admin_docs/configuration/aws-iam.mdx

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,7 @@
1-
{/*
2-
Licensed to the Apache Software Foundation (ASF) under one
3-
or more contributor license agreements. See the NOTICE file
4-
distributed with this work for additional information
5-
regarding copyright ownership. The ASF licenses this file
6-
to you under the Apache License, Version 2.0 (the
7-
"License"); you may not use this file except in compliance
8-
with the License. You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing,
13-
software distributed under the License is distributed on an
14-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
KIND, either express or implied. See the License for the
16-
specific language governing permissions and limitations
17-
under the License.
18-
*/}
19-
201
---
212
title: AWS IAM Authentication
223
sidebar_label: AWS IAM Authentication
4+
version: 1
235
sidebar_position: 15
246
---
257

docs/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
"docusaurus-plugin-openapi-docs": "^5.1.0",
6868
"docusaurus-theme-openapi-docs": "^5.1.0",
6969
"js-yaml": "^5.2.0",
70-
"js-yaml-loader": "^1.2.2",
7170
"json-bigint": "^1.0.0",
7271
"prism-react-renderer": "^2.4.1",
7372
"react": "^18.3.1",
@@ -118,14 +117,16 @@
118117
"react-redux": "^9.2.0",
119118
"@reduxjs/toolkit": "^2.5.0",
120119
"baseline-browser-mapping": "^2.9.19",
121-
"swagger-client": "3.37.3",
122120
"lodash": "4.18.1",
123121
"lodash-es": "4.18.1",
124122
"yaml": "1.10.3",
125123
"uuid": "11.1.1",
126124
"serialize-javascript": "7.0.5",
127125
"d3-color": "3.1.0",
128-
"ws": "^8.21.0"
126+
"ws": "^8.21.0",
127+
"@docusaurus/core/@docusaurus/utils/gray-matter/js-yaml": "^3.15.0",
128+
"@docusaurus/core/**/js-yaml": "^4.3.0",
129+
"docusaurus-plugin-openapi-docs/**/js-yaml": "^4.3.0"
129130
},
130131
"packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
131132
}

docs/src/components/databases/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ export interface DatabaseInfo {
176176
expressions_in_orderby?: boolean;
177177

178178
// Platform features
179-
limit_method?: string;
179+
limit_method?: number;
180180
limit_clause?: boolean;
181181
max_column_name?: number;
182182
supports_file_upload?: boolean;

docs/src/pages/inTheWild.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import Layout from '@theme/Layout';
2121
import { Avatar, Card, Col, Collapse, Row, Typography } from 'antd';
22+
import { load } from 'js-yaml';
2223
import BlurredSection from '../components/BlurredSection';
2324
import SectionHeader from '../components/SectionHeader';
2425
import DataSet from '../../../RESOURCES/INTHEWILD.yaml';
@@ -36,7 +37,7 @@ interface DataSetType {
3637
categories: Record<string, Organization[]>;
3738
}
3839

39-
const typedDataSet = DataSet as DataSetType;
40+
const typedDataSet = load(DataSet) as DataSetType;
4041

4142
const ContributorAvatars = ({ contributors }: { contributors?: string[] }) => {
4243
if (!contributors?.length) return null;

docs/src/pages/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import Link from '@docusaurus/Link';
2222
import { Card, Carousel, Flex } from 'antd';
2323
import styled from '@emotion/styled';
2424
import GitHubButton from 'react-github-btn';
25+
import { load } from 'js-yaml';
2526
import { mq } from '../utils';
2627
import SectionHeader from '../components/SectionHeader';
2728
import databaseData from '../data/databases.json';
@@ -60,7 +61,7 @@ interface DataSetType {
6061
categories: Record<string, Organization[]>;
6162
}
6263

63-
const typedDataSet = DataSet as DataSetType;
64+
const typedDataSet = load(DataSet) as DataSetType;
6465

6566
// Extract all organizations with logos for the carousel
6667
const companiesWithLogos = Object.values(typedDataSet.categories)

docs/src/types/yaml.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
*/
1919

2020
declare module '*.yaml' {
21-
const content: unknown;
21+
const content: string;
2222
export default content;
2323
}
2424

2525
declare module '*.yml' {
26-
const content: unknown;
26+
const content: string;
2727
export default content;
2828
}

docs/src/webpack.extend.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ export default function webpackExtendPlugin(): Plugin<void> {
6161
);
6262
});
6363

64-
// Add YAML loader rule directly to existing rules
64+
// Load YAML file as raw text string
6565
config.module?.rules?.push({
6666
test: /\.ya?ml$/,
67-
use: 'js-yaml-loader',
67+
type: 'asset/source',
6868
});
6969

7070
// Add swc-loader rule for superset-frontend files

docs/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"exclude": [
3131
"node_modules",
3232
"../superset-frontend/**/*",
33-
"src/webpack.extend.ts",
3433
"src/shims/**"
3534
]
3635
}

0 commit comments

Comments
 (0)