Skip to content

Commit 680a9b0

Browse files
authored
Merge pull request #2299 from plotly/master-2.7.0
Master 2.7.0
2 parents 1f18e39 + 5c3eede commit 680a9b0

File tree

110 files changed

+102361
-143718
lines changed

Some content is hidden

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

110 files changed

+102361
-143718
lines changed

@plotly/dash-component-plugins/package-lock.json

Lines changed: 2656 additions & 8954 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

@plotly/dash-component-plugins/package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@
1717
"author": "Marc-André Rivet",
1818
"license": "MIT",
1919
"devDependencies": {
20-
"@babel/core": "^7.17.9",
21-
"@babel/preset-env": "^7.16.11",
22-
"@babel/preset-react": "^7.16.7",
23-
"babel-loader": "^8.2.4",
20+
"@babel/core": "^7.19.6",
21+
"@babel/preset-env": "^7.19.4",
22+
"@babel/preset-react": "^7.18.6",
23+
"babel-loader": "^8.2.5",
2424
"react": "^16.8.6",
25-
"webpack": "^4.44.2",
26-
"webpack-cli": "^4.9.2"
25+
"webpack": "^5.74.0",
26+
"webpack-cli": "^4.10.0"
2727
},
2828
"files": [
29-
"dist/index.js"
29+
"dist/index.js",
30+
"dist/index.js.LICENSE.txt"
3031
]
3132
}

@plotly/dash-generator-test-component-nested/package-lock.json

Lines changed: 3330 additions & 9188 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

@plotly/dash-generator-test-component-nested/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
"license": "MIT",
1818
"dependencies": {
1919
"prop-types": "^15.8.1",
20-
"react-docgen": "^5.4.0"
20+
"react-docgen": "^5.4.3"
2121
},
2222
"devDependencies": {
23-
"@babel/cli": "^7.17.10",
24-
"@babel/core": "^7.17.10",
25-
"@babel/preset-env": "^7.17.10",
26-
"@babel/preset-react": "^7.16.7",
23+
"@babel/cli": "^7.19.3",
24+
"@babel/core": "^7.19.6",
25+
"@babel/preset-env": "^7.19.4",
26+
"@babel/preset-react": "^7.18.6",
2727
"babel-loader": "^8.2.5",
2828
"npm-run-all": "^4.1.5",
2929
"react": "16.13.0",
3030
"react-dom": "16.13.0",
3131
"react-jsx-parser": "1.28.1",
32-
"webpack": "^4.44.2",
33-
"webpack-cli": "^4.9.2"
32+
"webpack": "^5.74.0",
33+
"webpack-cli": "^4.10.0"
3434
},
3535
"peerDependencies": {
3636
"react": "^16.13.0",

@plotly/dash-generator-test-component-standard/package-lock.json

Lines changed: 2129 additions & 7987 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

@plotly/dash-generator-test-component-standard/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
"license": "MIT",
1818
"dependencies": {
1919
"prop-types": "^15.8.1",
20-
"react-docgen": "^5.4.0"
20+
"react-docgen": "^5.4.3"
2121
},
2222
"devDependencies": {
23-
"@babel/cli": "^7.17.10",
24-
"@babel/core": "^7.17.10",
25-
"@babel/preset-env": "^7.17.10",
26-
"@babel/preset-react": "^7.16.7",
23+
"@babel/cli": "^7.19.3",
24+
"@babel/core": "^7.19.6",
25+
"@babel/preset-env": "^7.19.4",
26+
"@babel/preset-react": "^7.18.6",
2727
"babel-loader": "^8.2.5",
2828
"npm-run-all": "^4.1.5",
2929
"react": "16.13.0",
3030
"react-dom": "16.13.0",
3131
"react-jsx-parser": "1.28.1",
32-
"webpack": "^4.44.2",
33-
"webpack-cli": "^4.9.2"
32+
"webpack": "^5.74.0",
33+
"webpack-cli": "^4.10.0"
3434
},
3535
"peerDependencies": {
3636
"react": "^16.13.0",

@plotly/dash-generator-test-component-typescript/generator.test.ts

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function getMetadata() {
99
[
1010
path.resolve(__dirname, '..', '..', 'dash', 'extract-meta.js'),
1111
'""', // ignore pattern
12-
'""', // reserved keywords
12+
'^_.*$', // reserved keywords
1313
path.join(__dirname, 'src', 'components')
1414
],
1515
{
@@ -103,6 +103,10 @@ describe('Test Typescript component metadata generation', () => {
103103
`${componentName} setProps func`,
104104
testTypeFactory('setProps', 'func')
105105
);
106+
test(
107+
`${componentName} tuple tuple`,
108+
testTypeFactory('a_tuple', 'tuple')
109+
)
106110
});
107111

108112
describe('Test prop attributes', () => {
@@ -230,6 +234,24 @@ describe('Test Typescript component metadata generation', () => {
230234
'name'
231235
], metadata)).toBe('any')
232236
}
237+
);
238+
239+
test(
240+
'Tuple elements', () => {
241+
const tuplePath: (string|number)[] = [
242+
'TypeScriptComponent',
243+
'props',
244+
'a_tuple',
245+
'type',
246+
'elements'
247+
]
248+
expect(
249+
R.path(tuplePath.concat(0, 'name'), metadata)
250+
).toBe('number');
251+
expect(
252+
R.path(tuplePath.concat(1, 'name'), metadata)
253+
).toBe('string');
254+
}
233255
)
234256
});
235257

0 commit comments

Comments
 (0)