Skip to content

Commit 798a197

Browse files
committed
Merge remote-tracking branch 'origin/main' into tiling
# Conflicts: # src/app.tsx # src/components/crystal-toolkit/CrystalToolkitScene/CrystalToolkitScene.tsx # src/components/crystal-toolkit/scene/animation-slider.tsx
2 parents 2ff1f3d + 6a683c5 commit 798a197

File tree

160 files changed

+52070
-31274
lines changed

Some content is hidden

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

160 files changed

+52070
-31274
lines changed

.babelrc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"presets": ["@babel/preset-env", "@babel/preset-react", "@babel/preset-typescript"],
3+
"plugins": [
4+
"@babel/transform-runtime",
5+
"@babel/plugin-proposal-nullish-coalescing-operator",
6+
"@babel/plugin-proposal-optional-chaining"
7+
]
8+
}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ storybook-static
2424
# Rollup artifacts
2525
rollup.build.*
2626
index.js
27+
index.js.map
2728
index.less
2829
index.css
2930
index.css.map

.storybook/main.js

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
11
module.exports = {
2-
stories: ['../src/stories/**/**/*.stories.@(ts|tsx|js|jsx|mdx)'],
2+
stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
33
addons: [
4+
'@storybook/addon-links',
45
'@storybook/addon-essentials',
5-
'@storybook/addon-actions'
6-
// '@storybook/addon-knobs/register',
7-
// '@storybook/addon-storysource'
6+
'@storybook/addon-interactions',
7+
'@storybook/addon-knobs'
88
],
9+
framework: '@storybook/react',
910
core: {
10-
builder: 'webpack5'
11+
builder: '@storybook/builder-webpack5'
1112
},
1213
webpackFinal: async (config) => {
13-
config.module.rules.push({
14-
test: /\.(ts|tsx)$/,
15-
use: [
16-
{
17-
loader: require.resolve('ts-loader')
18-
}
19-
]
20-
});
21-
config.resolve.extensions.push('.ts', '.tsx');
2214
config.module.rules.push({
2315
test: /\.less$/,
2416
use: ['style-loader', 'css-loader', 'less-loader']

.storybook/preview.js

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,30 @@ export const parameters = {
1212
['MP React Components', 'Usage with Dash'],
1313
'Search UI',
1414
[
15-
'SearchUI Component',
15+
'Building a Search UI',
16+
'SearchUIContainer',
17+
['Fully Featured', 'With MP Contribs Data', 'Matscholar Alpha'],
18+
'SearchUISearchBar',
19+
'SearchUIFilters',
20+
'SearchUIDataHeader',
21+
'SearchUIDataTable',
22+
'SearchUIDataView',
23+
'SearchUIGrid',
1624
'Columns',
1725
'Filters',
1826
'Conditional Row Styles',
19-
'Allowed Input Types Map'
27+
'Search Bar Input Types'
2028
],
2129
'Data-Entry',
30+
[
31+
'MaterialsInput',
32+
'PeriodicTable',
33+
'RangeSlider',
34+
'DualRangeSlider',
35+
'Select',
36+
'ThreeStateBooleanSelect',
37+
'Switch'
38+
],
2239
'Data-Display',
2340
'Publications',
2441
['BibCard', 'CrossrefCard', 'BibjsonCard', 'PublicationCard', 'BibtexCard', 'BibFilter'],

babel.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = { presets: ['@babel/preset-env'] };

jest.config.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@ module.exports = {
44
preset: 'ts-jest/presets/js-with-ts',
55
testEnvironment: 'jsdom',
66
collectCoverage: true,
7-
transformIgnorePatterns: ['node_modules/(?!(three)/)'], // force JEST to process this module
7+
/**
8+
* Tell jest to ignore transforming most node_modules
9+
* except for the ones that match the module strings listed here.
10+
* This is necessary for node modules that distribute their source code as uncompiled JS.
11+
*/
12+
transformIgnorePatterns: [
13+
'node_modules/(?!(three|unist-.*|hast-.*|rehype-slug|remark-rehype|react-markdown|vfile.*|unified|bail|is-plain-obj|trough|remark-parse|mdast-.*|micromark.*|decode-named-character-reference|unist-.*|character-entities|property-information|space-separated-tokens|comma-separated-tokens)/)'
14+
],
815
modulePaths: ['<rootDir>'],
916
moduleDirectories: ['node_modules', '<rootDir>'],
1017
moduleNameMapper: {

0 commit comments

Comments
 (0)