Merge pull request #3223 from plotly/master-3.0.0

Master 3.0.0

Author: T4rk1n

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 orbs:
  win: circleci/windows@5.0.0
  percy: percy/agent@0.1.3
- browser-tools: circleci/browser-tools@1.4.8
+ browser-tools: circleci/browser-tools@1.5.1
 
 
 jobs:
@@ -99,7 +99,11 @@ jobs:
 
  steps:
  - checkout
- - run: sudo apt-get update
+ - run:
+ name: Add chrome keys & update.
+ command: |
+ wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+ sudo apt-get update
  - run: echo $PYVERSION > ver.txt
  - run: cat requirements/*.txt > requirements-all.txt
  - restore_cache:
@@ -189,7 +193,11 @@ jobs:
  steps:
  - checkout:
  path: ~/dash
- - run: sudo apt-get update
+ - run:
+ name: Add chrome keys & update.
+ command: |
+ wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+ sudo apt-get update
  - run: echo $PYVERSION > ver.txt
  - run: cat requirements/*.txt > requirements-all.txt
  - restore_cache:
@@ -219,24 +227,6 @@ jobs:
  - store_artifacts:
  path: /tmp/dash_artifacts
 
- test-312-react-18:
- <<: *test
- docker:
- - image: cimg/python:3.12.1-browsers
- auth:
- username: dashautomation
- password: $DASH_PAT_DOCKERHUB
- environment:
- PERCY_ENABLE: 0
- PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: True
- PYVERSION: python312
- REDIS_URL: redis://localhost:6379
- REACT_VERSION: "18.2.0"
- - image: cimg/redis:6.2.6
- auth:
- username: dashautomation
- password: $DASH_PAT_DOCKERHUB
-
  test-38:
  <<: *test
  docker:
@@ -306,7 +296,11 @@ jobs:
  steps:
  - checkout:
  path: ~/dash
- - run: sudo apt-get update
+ - run:
+ name: Add chrome keys & update.
+ command: |
+ wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+ sudo apt-get update
  - run: echo $PYVERSION > ver.txt
  - run: cat requirements/*.txt > requirements-all.txt
  - restore_cache:
@@ -337,18 +331,6 @@ jobs:
  - store_artifacts:
  path: /tmp/dash_artifacts
 
- dcc-312-react-18:
- <<: *dcc-test
- docker:
- - image: cimg/python:3.12.1-browsers
- auth:
- username: dashautomation
- password: $DASH_PAT_DOCKERHUB
- environment:
- PYVERSION: python312
- PERCY_ENABLE: 0
- REACT_VERSION: "18.2.0"
-
  dcc-38:
  <<: *dcc-test
  docker:
@@ -375,7 +357,11 @@ jobs:
  steps:
  - checkout:
  path: ~/dash
- - run: sudo apt-get update
+ - run:
+ name: Add chrome keys & update.
+ command: |
+ wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+ sudo apt-get update
  - run: echo $PYVERSION > ver.txt
  - run: cat requirements/*.txt > requirements-all.txt
  - restore_cache:
@@ -414,18 +400,6 @@ jobs:
  - store_artifacts:
  path: /tmp/dash_artifacts
 
- html-312-react-18:
- <<: *html-test
- docker:
- - image: cimg/python:3.12.1-browsers
- auth:
- username: dashautomation
- password: $DASH_PAT_DOCKERHUB
- environment:
- PYVERSION: python312
- PERCY_ENABLE: 0
- REACT_VERSION: "18.2.0"
-
  html-38:
  <<: *html-test
  docker:
@@ -451,7 +425,11 @@ jobs:
  steps:
  - checkout:
  path: ~/dash
- - run: sudo apt-get update
+ - run:
+ name: Add chrome keys & update.
+ command: |
+ wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+ sudo apt-get update
  - run: echo $PYVERSION > ver.txt
  - run: cat requirements/*.txt > requirements-all.txt
  - restore_cache:
@@ -486,15 +464,6 @@ jobs:
  - store_artifacts:
  path: /tmp/dash_artifacts
 
- table-server-react-18:
- <<: *table-server
- docker:
- - image: cimg/python:3.12.1-browsers
- environment:
- PYVERSION: python312
- PERCY_ENABLE: 0
- REACT_VERSION: "18.2.0"
-
  table-unit-test:
  working_directory: ~/dash
  docker:
@@ -505,7 +474,11 @@ jobs:
  steps:
  - checkout:
  path: ~/dash
- - run: sudo apt-get update
+ - run:
+ name: Add chrome keys & update.
+ command: |
+ wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+ sudo apt-get update
  - run: echo $PYVERSION > ver.txt
  - run: cat requirements/*.txt > requirements-all.txt
  - restore_cache:
@@ -540,18 +513,21 @@ jobs:
  table-visual-test:
  working_directory: ~/dash/components/dash-table
  docker:
- - image: cimg/node:16.13-browsers
+ - image: cimg/node:lts-browsers
  environment:
  PERCY_TOKEN: $PERCY_TOKEN_TABLE
 
  steps:
  - checkout:
  path: ~/dash
- - run: sudo apt-get update
+ - run:
+ name: Add chrome keys & update.
+ command: |
+ wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+ sudo apt-get update
  - restore_cache:
  key: dep-{{ .Branch }}-{{ checksum "package-lock.json" }}-{{ checksum "package.json" }}
  - browser-tools/install-browser-tools:
- chrome-version: 120.0.6099.71
  install-firefox: false
  install-geckodriver: false
  - run:
@@ -628,9 +604,6 @@ workflows:
  - test-312:
  requires:
  - install-dependencies-312
- - test-312-react-18:
- requires:
- - install-dependencies-312
  - test-38:
  requires:
  - install-dependencies-38
@@ -645,19 +618,13 @@ workflows:
  - dcc-312:
  requires:
  - install-dependencies-312
- - dcc-312-react-18:
- requires:
- - install-dependencies-312
  - dcc-38:
  requires:
  - install-dependencies-38
 
  - html-312:
  requires:
  - install-dependencies-312
- - html-312-react-18:
- requires:
- - install-dependencies-312
  - html-38:
  requires:
  - install-dependencies-38
@@ -672,9 +639,6 @@ workflows:
  - table-server:
  requires:
  - install-dependencies-312
- - table-server-react-18:
- requires:
- - install-dependencies-312
 
  - percy/finalize_all:
  requires:

.editorconfig

@@ -12,7 +12,8 @@ charset = utf-8
 indent_style = space
 indent_size = 4
 
-# Matches the exact files either package.json or .travis.yml
+# Matches the exact files either package.json or .circleci/config.yml
 [{package.json,.circleci/config.yml}]
 indent_style = space
 indent_size = 2
+

.pylintrc

@@ -75,6 +75,7 @@ disable=fixme,
  unnecessary-lambda-assignment,
  broad-exception-raised,
  consider-using-generator,
+ too-many-ancestors
 
 
 # Enable the message, report, category or checker with the given id(s). You can

@plotly/dash-generator-test-component-nested/src/components/MyNestedComponent.js

@@ -4,7 +4,7 @@ import React from 'react';
 /**
  * MyNestedComponent description
  */
-const MyNestedComponent = ({ id, value }) => (<div id={id}>{value}</div>);
+const MyNestedComponent = ({ id, value = '' }) => (<div id={id}>{value}</div>);
 
 MyNestedComponent.propTypes = {
  /**
@@ -18,8 +18,4 @@ MyNestedComponent.propTypes = {
  value: PropTypes.string
 };
 
-MyNestedComponent.defaultProps = {
- value: ''
-};
-
 export default MyNestedComponent;

@plotly/dash-generator-test-component-standard/src/components/MyStandardComponent.js

@@ -4,7 +4,7 @@ import React from 'react';
 /**
  * MyComponent description
  */
-const MyStandardComponent = ({ id, style, value }) => (<div id={id} style={style}>{value}</div>);
+const MyStandardComponent = ({ id, style, value = '' }) => (<div id={id} style={style}>{value}</div>);
 
 MyStandardComponent.propTypes = {
  /**
@@ -23,8 +23,4 @@ MyStandardComponent.propTypes = {
  value: PropTypes.string
 };
 
-MyStandardComponent.defaultProps = {
- value: ''
-};
-
-export default MyStandardComponent;
+export default MyStandardComponent;

@plotly/dash-generator-test-component-typescript/base/__init__.py

@@ -16,7 +16,12 @@
  dict(
  relative_package_path='dash_generator_test_component_typescript.js',
  namespace='dash_generator_test_component_typescript'
- )
+ ),
+ {
+ "dev_package_path": "proptypes.js",
+ "dev_only": True,
+ "namespace": 'dash_generator_test_component_typescript'
+ }
 ]
 
 for _component in __all__:

tests/integration/long_callback/__init__.py renamed to @plotly/dash-generator-test-component-typescript/base/py.typed

@@ -0,0 +1 @@
+ignore_props = ['ignored_prop']

@plotly/dash-generator-test-component-typescript/dash_prop_typing.py

@@ -271,6 +271,23 @@ describe('Test Typescript component metadata generation', () => {
  );
  expect(objectOfComponents).toBe("node");
  }
+ );
+
+ test(
+ 'union and literal values', () => {
+ const propType = R.path(
+ propPath('TypeScriptComponent', 'union_enum').concat(
+ 'type'
+ ),
+ metadata
+ );
+ expect(propType.name).toBe('union');
+ expect(propType.value.length).toBe(3);
+ expect(propType.value[0].name).toBe('number');
+ expect(propType.value[1].name).toBe('literal');
+ expect(propType.value[2].name).toBe('literal');
+ expect(propType.value[1].value).toBe('small');
+ }
  )
  });
 

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

@@ -25,6 +25,7 @@ export type TypescriptComponentProps = {
  array_obj?: {a: string}[];
  array_any?: any[];
  enum_string?: 'one' | 'two';
+ enum_number?: 2 | 3 | 4 | 5 | 6;
  union?: number | string;
  union_shape?: {a: string} | string;
  array_union_shape?: ({a: string} | string)[];
@@ -46,6 +47,8 @@ export type TypescriptComponentProps = {
 
  object_of_string?: {[k: string]: string};
  object_of_components?: {[k: string]: JSX.Element};
+ ignored_prop?: {ignore: {me: string}};
+ union_enum?: number | 'small' | 'large'
 };
 
 export type WrappedHTMLProps = {