Skip to content

Commit 066e571

Browse files
authored
Merge pull request #1185 from winnerNick/dev
Sort also the directory name for proper ordering between css and js plugin folders
2 parents 71a233b + 52eb81c commit 066e571

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
1212
### Fixed
1313
- [#1249](https://github.com/plotly/dash/pull/1249) Fixes [#919](https://github.com/plotly/dash/issues/919) so `dash.testing` is compatible with more `pytest` plugins, particularly `pytest-flake8` and `pytest-black`.
1414
- [#1248](https://github.com/plotly/dash/pull/1248) Fixes [#1245](https://github.com/plotly/dash/issues/1245), so you can use prop persistence with components that have dict IDs, ie for pattern-matching callbacks.
15+
- [#1185](https://github.com/plotly/dash/pull/1185) Sort asset directories, same as we sort files inside those directories. This way if you need your assets loaded in a certain order, you can add prefixes to subdirectory names and enforce that order.
1516

1617
## [1.12.0] - 2020-05-05
1718
### Added

dash/dash.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1066,7 +1066,7 @@ def _walk_assets_directory(self):
10661066
ignore_str = self.config.assets_ignore
10671067
ignore_filter = re.compile(ignore_str) if ignore_str else None
10681068

1069-
for current, _, files in os.walk(walk_dir):
1069+
for current, _, files in sorted(os.walk(walk_dir)):
10701070
if current == walk_dir:
10711071
base = ""
10721072
else:

0 commit comments

Comments
 (0)