Merge branch 'plotly:dev' into expose-setprops

Author: BSd3v

.circleci/config.yml

@@ -5,6 +5,7 @@ orbs:
   percy: percy/[email protected]
   browser-tools: circleci/[email protected]
 
+
 jobs:
   artifacts:
     docker:
@@ -107,7 +108,7 @@ jobs:
       - restore_cache:
           key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
       - browser-tools/install-browser-tools:
-          chrome-version: 116.0.5845.110
+          chrome-version: 120.0.6099.71
       - run:
           name: ️️🏗️ pip dev requirements
           command: |
@@ -198,7 +199,7 @@ jobs:
       - restore_cache:
           key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
       - browser-tools/install-browser-tools:
-          chrome-version: 116.0.5845.110
+          chrome-version: 120.0.6099.71
           install-firefox: false
           install-geckodriver: false
       - attach_workspace:
@@ -315,7 +316,7 @@ jobs:
       - restore_cache:
           key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
       - browser-tools/install-browser-tools:
-          chrome-version: 116.0.5845.110
+          chrome-version: 120.0.6099.71
           install-firefox: false
           install-geckodriver: false
       - attach_workspace:
@@ -386,7 +387,7 @@ jobs:
       - restore_cache:
           key: html-{{ checksum "components/dash-html-components/package.json" }}-{{ checksum "components/dash-html-components/package-lock.json" }}
       - browser-tools/install-browser-tools:
-          chrome-version: 116.0.5845.110
+          chrome-version: 120.0.6099.71
           install-firefox: false
           install-geckodriver: false
       - attach_workspace:
@@ -460,7 +461,7 @@ jobs:
       - restore_cache:
           key: dep-{{ checksum ".circleci/config.yml" }}-{{ checksum "ver.txt" }}-{{ checksum "requires-all.txt" }}
       - browser-tools/install-browser-tools:
-          chrome-version: 116.0.5845.110
+          chrome-version: 120.0.6099.71
           install-firefox: false
           install-geckodriver: false
       - attach_workspace:
@@ -516,7 +517,7 @@ jobs:
       - restore_cache:
           key: table-{{ checksum "components/dash-table/package.json" }}-{{ checksum "components/dash-table/package-lock.json" }}
       - browser-tools/install-browser-tools:
-          chrome-version: 116.0.5845.110
+          chrome-version: 120.0.6099.71
           install-firefox: false
           install-geckodriver: false
       - attach_workspace:
@@ -554,7 +555,7 @@ jobs:
       - restore_cache:
           key: dep-{{ .Branch }}-{{ checksum "package-lock.json" }}-{{ checksum "package.json" }}
       - browser-tools/install-browser-tools:
-          chrome-version: 116.0.5845.110
+          chrome-version: 120.0.6099.71
           install-firefox: false
           install-geckodriver: false
       - run:

CHANGELOG.md

@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [UNRELEASED]
 
+## Fixed
+
+- [#2756](https://github.com/plotly/dash/pull/2756) Prevent false dangerous link warning. Fixes [#2743](https://github.com/plotly/dash/issues/2743)
+
 ## Changed
 
 - [#2734](https://github.com/plotly/dash/pull/2734) Configure CI for Python 3.10 [#1863](https://github.com/plotly/dash/issues/1863)

components/dash-core-components/package.json

@@ -19,7 +19,7 @@
     "private::lint.eslint": "eslint src",
     "private::lint.flake8": "flake8 --exclude=dash_core_components,node_modules,venv",
     "private::lint.prettier": "prettier --config .prettierrc src/**/*.js --list-different",
-    "prepublishOnly": "rimraf -rf lib && babel src --out-dir lib --copy-files --config-file ./.lib.babelrc && rimraf --glob -rf lib/jl/ lib/*.jl",
+    "prepublishOnly": "rimraf lib && babel src --out-dir lib --copy-files --config-file ./.lib.babelrc && rimraf --glob lib/jl/ lib/*.jl",
     "test": "run-s -c lint test:intg test:pyimport",
     "test:intg": "pytest --nopercyfinalize --headless tests/integration ",
     "test:pyimport": "python -m unittest tests/test_dash_import.py",

components/dash-core-components/src/components/Link.react.js

@@ -46,7 +46,9 @@ const Link = props => {
         refresh,
         setProps,
     } = props;
-    const sanitizedUrl = useMemo(() => sanitizeUrl(href), [href]);
+    const sanitizedUrl = useMemo(() => {
+        return href ? sanitizeUrl(href) : undefined;
+    }, [href]);
 
     const updateLocation = e => {
         const hasModifiers = e.metaKey || e.shiftKey || e.altKey || e.ctrlKey;
@@ -70,7 +72,7 @@ const Link = props => {
     };
 
     useEffect(() => {
-        if (sanitizedUrl !== href) {
+        if (sanitizedUrl && sanitizedUrl !== href) {
             setProps({
                 _dash_error: new Error(`Dangerous link detected:: ${href}`),
             });

components/dash-html-components/README.md

@@ -100,7 +100,7 @@ See the [contributing guide](CONTRIBUTING.md) for guidelines on contributing to
         ```
     2. Cleanup the dist folder (optional)
         ```
-        $ rimraf -rf dist
+        $ rimraf dist
         ```
     3. Publish on NPM (Optional if chosen False in `publish_on_npm`)
         ```

components/dash-html-components/package.json

@@ -13,7 +13,7 @@
   },
   "homepage": "https://github.com/plotly/dash",
   "scripts": {
-    "clean": "rimraf --glob -rf ./src/* && mkdirp ./src/components",
+    "clean": "rimraf --glob ./src/* && mkdirp ./src/components",
     "prebuild": "cd scripts && sh generate-all.sh && cd ../../",
     "extract": "cd scripts && sh extract-all.sh",
     "lint": "eslint src scripts",

dash/_validate.py

@@ -392,8 +392,11 @@ def validate_index(name, checks, index):
 def validate_layout_type(value):
     if not isinstance(value, (Component, patch_collections_abc("Callable"))):
         raise exceptions.NoLayoutException(
-            "Layout must be a dash component "
-            "or a function that returns a dash component."
+            """
+            Layout must be a single dash component
+            or a function that returns a dash component.
+            Cannot be a tuple (are there any trailing commas?)
+            """
         )
 
 

dash/dash-renderer/package.json

@@ -4,7 +4,7 @@
   "description": "render dash components in react",
   "main": "build/dash_renderer.min.js",
   "scripts": {
-    "prepublishOnly": "rimraf -rf lib && babel src --extensions=\".ts,.tsx,.js,.jsx\" --out-dir lib --copy-files",
+    "prepublishOnly": "rimraf lib && babel src --extensions=\".ts,.tsx,.js,.jsx\" --out-dir lib --copy-files",
     "private::format.eslint": "eslint --quiet --fix src tests",
     "private::format.prettier": "prettier --write \"{src,tests}/**/*.{js,jsx,ts,tsx}\"",
     "private::lint.eslint": "eslint src tests",

dash/dash-renderer/src/utils/TreeContainer.ts

@@ -61,8 +61,8 @@ export function validateComponent(componentDefinition: any) {
     if (type(componentDefinition) === 'Array') {
         throw new Error(
             'The children property of a component is a list of lists, instead ' +
-                'of just a list. ' +
-                'Check the component that has the following contents, ' +
+                'of just a list. This can sometimes be due to a trailing comma. ' +
+                'Check the component that has the following contents ' +
                 'and remove one of the levels of nesting: \n' +
                 JSON.stringify(componentDefinition, null, 2)
         );

package.json

@@ -16,20 +16,20 @@
     "private::lint.pylint-dash": "PYLINTRC=${PYLINTRC:=.pylintrc312} && pylint dash setup.py --rcfile=$PYLINTRC",
     "private::lint.pylint-tests": "PYLINTRC=${PYLINTRC:=.pylintrc312} && pylint tests/unit tests/integration -d all -e C0410,C0413,W0109 --rcfile=$PYLINTRC",
     "private::lint.renderer": "cd dash/dash-renderer && npm run lint",
-    "private::test.setup-components": "cd \\@plotly/dash-test-components && npm ci && npm run build",
-    "private::test.setup-nested": "cd \\@plotly/dash-generator-test-component-nested && npm ci && npm run build",
-    "private::test.setup-standard": "cd \\@plotly/dash-generator-test-component-standard && npm ci && npm run build",
-    "private::test.setup-typescript": "cd \\@plotly/dash-generator-test-component-typescript && npm ci && npm run build",
-    "private::test.py.deploy-components": "npm run private::test.setup-components && cd \\@plotly/dash-test-components && pip install -e .",
-    "private::test.py.deploy-nested": "npm run private::test.setup-nested && cd \\@plotly/dash-generator-test-component-nested && pip install -e .",
-    "private::test.py.deploy-standard": "npm run private::test.setup-standard && cd \\@plotly/dash-generator-test-component-standard && pip install -e .",
-    "private::test.py.deploy-typescript": "npm run private::test.setup-typescript && cd \\@plotly/dash-generator-test-component-typescript && pip install -e .",
-    "private::test.R.deploy-components": "npm run private::test.setup-components && cd \\@plotly/dash-test-components && sudo R CMD INSTALL .",
-    "private::test.R.deploy-nested": "npm run private::test.setup-nested && cd \\@plotly/dash-generator-test-component-nested && sudo R CMD INSTALL .",
-    "private::test.R.deploy-standard": "npm run private::test.setup-standard && cd \\@plotly/dash-generator-test-component-standard && sudo R CMD INSTALL .",
+    "private::test.setup-components": "cd @plotly/dash-test-components && npm ci && npm run build",
+    "private::test.setup-nested": "cd @plotly/dash-generator-test-component-nested && npm ci && npm run build",
+    "private::test.setup-standard": "cd @plotly/dash-generator-test-component-standard && npm ci && npm run build",
+    "private::test.setup-typescript": "cd @plotly/dash-generator-test-component-typescript && npm ci && npm run build",
+    "private::test.py.deploy-components": "npm run private::test.setup-components && cd @plotly/dash-test-components && pip install -e .",
+    "private::test.py.deploy-nested": "npm run private::test.setup-nested && cd @plotly/dash-generator-test-component-nested && pip install -e .",
+    "private::test.py.deploy-standard": "npm run private::test.setup-standard && cd @plotly/dash-generator-test-component-standard && pip install -e .",
+    "private::test.py.deploy-typescript": "npm run private::test.setup-typescript && cd @plotly/dash-generator-test-component-typescript && pip install -e .",
+    "private::test.R.deploy-components": "npm run private::test.setup-components && cd @plotly/dash-test-components && sudo R CMD INSTALL .",
+    "private::test.R.deploy-nested": "npm run private::test.setup-nested && cd @plotly/dash-generator-test-component-nested && sudo R CMD INSTALL .",
+    "private::test.R.deploy-standard": "npm run private::test.setup-standard && cd @plotly/dash-generator-test-component-standard && sudo R CMD INSTALL .",
     "private::test.unit-dash": "pytest tests/unit",
     "private::test.unit-renderer": "cd dash/dash-renderer && npm run test",
-    "private::test.unit-generation": "cd \\@plotly/dash-generator-test-component-typescript && npm ci && npm test",
+    "private::test.unit-generation": "cd @plotly/dash-generator-test-component-typescript && npm ci && npm test",
     "private::test.integration-dash": "TESTFILES=$(circleci tests glob \"tests/integration/**/test_*.py\" | circleci tests split --split-by=timings) && pytest --headless --nopercyfinalize --junitxml=test-reports/junit_intg.xml ${TESTFILES}",
     "private::test.integration-dash-import": "cd tests/integration/dash && python dash_import_test.py",
     "cibuild": "run-s private::cibuild.*",