Skip to content

Commit d6ec97c

Browse files
authored
Merge branch 'dev' into dev
2 parents a2fa926 + 35ced08 commit d6ec97c

File tree

10 files changed

+89
-53
lines changed

10 files changed

+89
-53
lines changed

.circleci/config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ jobs:
540540
table-visual-test:
541541
working_directory: ~/dash/components/dash-table
542542
docker:
543-
- image: cimg/node:16.13-browsers
543+
- image: cimg/node:lts-browsers
544544
environment:
545545
PERCY_TOKEN: $PERCY_TOKEN_TABLE
546546

@@ -551,7 +551,6 @@ jobs:
551551
- restore_cache:
552552
key: dep-{{ .Branch }}-{{ checksum "package-lock.json" }}-{{ checksum "package.json" }}
553553
- browser-tools/install-browser-tools:
554-
chrome-version: 120.0.6099.71
555554
install-firefox: false
556555
install-geckodriver: false
557556
- run:

components/dash-core-components/package-lock.json

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

components/dash-html-components/package-lock.json

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

components/dash-html-components/scripts/data/attributes.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"elements": [
2121
"form"
2222
],
23-
"description": "List of supported charsets."
23+
"description": "The character set, which if provided must be \"UTF-8\"."
2424
},
2525
"accessKey": {
2626
"elements": [

components/dash-table/package-lock.json

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

dash/_get_paths.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@
55

66

77
def get_asset_url(path):
8+
"""
9+
Return the URL for the provided `path` in the assets directory.
10+
11+
`dash.get_asset_url` is not compatible with Dash Snapshots.
12+
Use `get_asset_url` on the app instance instead: `app.get_asset_url`.
13+
See `app.get_asset_url` for more information.
14+
"""
815
return app_get_asset_url(CONFIG, path)
916

1017

@@ -59,6 +66,9 @@ def display_content(path):
5966
if page_name == "page-2":
6067
return chapters.page_2
6168
```
69+
70+
`dash.get_relative_path` is not compatible with Dash Snapshots. Use
71+
`get_relative_path` on the app instance instead: `app.get_relative_path`.
6272
"""
6373
return app_get_relative_path(CONFIG.requests_pathname_prefix, path)
6474

dash/dash-renderer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"postbuild": "es-check es2015 ../deps/*.js build/*.js",
1717
"test": "karma start karma.conf.js --single-run",
1818
"format": "run-s private::format.*",
19-
"lint": "run-s private::lint.*"
19+
"lint": "run-s private::lint.* --continue-on-error"
2020
},
2121
"author": "chriddyp",
2222
"license": "MIT",

dash/dash.py

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,6 +1547,33 @@ def _hash(script):
15471547
]
15481548

15491549
def get_asset_url(self, path):
1550+
"""
1551+
Return the URL for the provided `path` in the assets directory.
1552+
1553+
If `assets_external_path` is set, `get_asset_url` returns
1554+
`assets_external_path` + `assets_url_path` + `path`, where
1555+
`path` is the path passed to `get_asset_url`.
1556+
1557+
Otherwise, `get_asset_url` returns
1558+
`requests_pathname_prefix` + `assets_url_path` + `path`, where
1559+
`path` is the path passed to `get_asset_url`.
1560+
1561+
Use `get_asset_url` in an app to access assets at the correct location
1562+
in different environments. In a deployed app on Dash Enterprise,
1563+
`requests_pathname_prefix` is the app name. For an app called "my-app",
1564+
`app.get_asset_url("image.png")` would return:
1565+
1566+
```
1567+
/my-app/assets/image.png
1568+
```
1569+
1570+
While the same app running locally, without
1571+
`requests_pathname_prefix` set, would return:
1572+
1573+
```
1574+
/assets/image.png
1575+
```
1576+
"""
15501577
return _get_paths.app_get_asset_url(self.config, path)
15511578

15521579
def get_relative_path(self, path):

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"format": "run-s private::format.*",
3939
"initialize": "run-s private::initialize.*",
4040
"prepare": "husky install",
41-
"lint": "run-s private::lint.*",
41+
"lint": "run-s private::lint.* --continue-on-error",
4242
"setup-tests.py": "run-s private::test.py.deploy-*",
4343
"setup-tests.R": "run-s private::test.R.deploy-*",
4444
"citest.integration": "run-s setup-tests.py private::test.integration-*",

0 commit comments

Comments
 (0)