From 0717b0a942e309f8e7d8ec0ee691c45747ff50f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Wed, 26 Feb 2020 09:44:09 -0500 Subject: [PATCH 1/6] change `~` to `-` --- dash_core_components_base/__init__.py | 16 ++++++++-------- webpack.config.js | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dash_core_components_base/__init__.py b/dash_core_components_base/__init__.py index 12bea5315..092252ff9 100644 --- a/dash_core_components_base/__init__.py +++ b/dash_core_components_base/__init__.py @@ -52,20 +52,20 @@ _js_dist = [] _js_dist.extend([{ - 'relative_package_path': 'async~{}.js'.format(async_resource), + 'relative_package_path': 'async-{}.js'.format(async_resource), 'external_url': ( 'https://unpkg.com/dash-core-components@{}' - '/dash_core_components/async~{}.js' + '/dash_core_components/async-{}.js' ).format(__version__, async_resource), 'namespace': 'dash_core_components', 'async': True } for async_resource in async_resources]) _js_dist.extend([{ - 'relative_package_path': 'async~{}.js.map'.format(async_resource), + 'relative_package_path': 'async-{}.js.map'.format(async_resource), 'external_url': ( 'https://unpkg.com/dash-core-components@{}' - '/dash_core_components/async~{}.js.map' + '/dash_core_components/async-{}.js.map' ).format(__version__, async_resource), 'namespace': 'dash_core_components', 'dynamic': True @@ -116,19 +116,19 @@ 'async': 'eager' }, { - 'relative_package_path': 'async~plotlyjs.js', + 'relative_package_path': 'async-plotlyjs.js', 'external_url': ( 'https://unpkg.com/dash-core-components@{}' - '/dash_core_components/async~graph~plotlyjs.js' + '/dash_core_components/async-plotlyjs.js' ).format(__version__), 'namespace': 'dash_core_components', 'async': 'lazy' }, { - 'relative_package_path': 'async~plotlyjs.js.map', + 'relative_package_path': 'async-plotlyjs.js.map', 'external_url': ( 'https://unpkg.com/dash-core-components@{}' - '/dash_core_components/async~graph~plotlyjs.js.map' + '/dash_core_components/async-plotlyjs.js.map' ).format(__version__), 'namespace': 'dash_core_components', 'dynamic': True diff --git a/webpack.config.js b/webpack.config.js index 166cc0450..bf55ddf9a 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -118,7 +118,7 @@ module.exports = (env, argv) => { chunks: 'async', minSize: 0, name(module, chunks, cacheGroupKey) { - return `${cacheGroupKey}~${chunks[0].name}`; + return `${cacheGroupKey}-${chunks[0].name}`; } }, shared: { @@ -134,7 +134,7 @@ module.exports = (env, argv) => { new WebpackDashDynamicImport(), new webpack.SourceMapDevToolPlugin({ filename: '[file].map', - exclude: ['async~plotlyjs'] + exclude: ['async-plotlyjs'] }) ] } From 0f48dfc8dbf1041457086d64407de8dd4a8146f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Wed, 26 Feb 2020 12:30:59 -0500 Subject: [PATCH 2/6] 2.7.x, 3.6.x, 3.7.x CI --- .circleci/config.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2ece53603..111d0b338 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: lint-unit-37: &lint-unit working_directory: ~/project docker: - - image: circleci/python:3.7-stretch-node-browsers + - image: circleci/python:3.7.5-stretch-node-browsers environment: PYTHON_VERSION: py37 steps: @@ -44,21 +44,21 @@ jobs: lint-unit-36: <<: *lint-unit docker: - - image: circleci/python:3.6-stretch-node-browsers + - image: circleci/python:3.6.9-stretch-node-browsers environment: PYTHON_VERSION: py36 lint-unit-27: <<: *lint-unit docker: - - image: circleci/python:2.7-stretch-node-browsers + - image: circleci/python:2.7.16-stretch-node-browsers environment: PYTHON_VERSION: py27 build-dash-37: &build-dash working_directory: ~/project docker: - - image: circleci/python:3.7-stretch-node-browsers + - image: circleci/python:3.7.5-stretch-node-browsers environment: PYTHON_VERSION: py37 steps: @@ -99,21 +99,21 @@ jobs: build-dash-36: <<: *build-dash docker: - - image: circleci/python:3.6-stretch-node-browsers + - image: circleci/python:3.6.9-stretch-node-browsers environment: PYTHON_VERSION: py36 build-dash-27: <<: *build-dash docker: - - image: circleci/python:2.7-stretch-node-browsers + - image: circleci/python:2.7.16-stretch-node-browsers environment: PYTHON_VERSION: py27 test-37: &test working_directory: ~/project docker: - - image: circleci/python:3.7-stretch-node-browsers + - image: circleci/python:3.7.5-stretch-node-browsers environment: PYTHON_VERSION: py37 PERCY_PARALLEL_TOTAL: -1 @@ -145,7 +145,7 @@ jobs: test-36: <<: *test docker: - - image: circleci/python:3.6-stretch-node-browsers + - image: circleci/python:3.6.9-stretch-node-browsers environment: PYTHON_VERSION: py36 PERCY_ENABLE: 0 @@ -153,7 +153,7 @@ jobs: test-27: <<: *test docker: - - image: circleci/python:2.7-stretch-node-browsers + - image: circleci/python:2.7.16-stretch-node-browsers environment: PYTHON_VERSION: py27 PERCY_ENABLE: 0 @@ -161,7 +161,7 @@ jobs: test-legacy-37: &test-legacy working_directory: ~/project docker: - - image: circleci/python:3.7-stretch-node-browsers + - image: circleci/python:3.7.5-stretch-node-browsers environment: PYTHON_VERSION: py37 PERCY_PARALLEL_TOTAL: -1 @@ -195,14 +195,14 @@ jobs: test-legacy-36: <<: *test-legacy docker: - - image: circleci/python:3.6-stretch-node-browsers + - image: circleci/python:3.6.9-stretch-node-browsers environment: PYTHON_VERSION: py36 PERCY_ENABLE: 0 test-legacy-27: <<: *test-legacy docker: - - image: circleci/python:2.7-stretch-node-browsers + - image: circleci/python:2.7.16-stretch-node-browsers environment: PYTHON_VERSION: py27 PERCY_ENABLE: 0 From 451b90c23469f04fabb2fe1e8cbcc006a3df120e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Wed, 26 Feb 2020 13:47:34 -0500 Subject: [PATCH 3/6] update manifest --- MANIFEST.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 31a1634fd..576fde457 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,8 +2,8 @@ include dash_core_components/dash_core_components.min.js include dash_core_components/dash_core_components.min.js.map include dash_core_components/dash_core_components-shared.js include dash_core_components/dash_core_components-shared.js.map -include dash_core_components/async~*.js -include dash_core_components/async~*.js.map +include dash_core_components/async-*.js +include dash_core_components/async-*.js.map include dash_core_components/metadata.json include dash_core_components/package-info.json include dash_core_components/plotly.min.js From 6ae9d918e2eeaaf507eebc9bb1c27b8e3eab33bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Wed, 26 Feb 2020 14:30:39 -0500 Subject: [PATCH 4/6] findAsyncPlotlyJs --- tests/integration/graph/test_graph_varia.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/graph/test_graph_varia.py b/tests/integration/graph/test_graph_varia.py index f4a340b46..54c825589 100644 --- a/tests/integration/graph/test_graph_varia.py +++ b/tests/integration/graph/test_graph_varia.py @@ -25,7 +25,7 @@ def findSyncPlotlyJs(scripts): def findAsyncPlotlyJs(scripts): for script in scripts: - if "dash_core_components/async~plotlyjs" in script.get_attribute( + if "dash_core_components/async-plotlyjs" in script.get_attribute( 'src' ): return script From e9c64ba7815b5d4b0757b3c9ccd41316498b7db9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Wed, 26 Feb 2020 21:00:52 -0500 Subject: [PATCH 5/6] undo CI exact versions --- .circleci/config.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 111d0b338..2ece53603 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: lint-unit-37: &lint-unit working_directory: ~/project docker: - - image: circleci/python:3.7.5-stretch-node-browsers + - image: circleci/python:3.7-stretch-node-browsers environment: PYTHON_VERSION: py37 steps: @@ -44,21 +44,21 @@ jobs: lint-unit-36: <<: *lint-unit docker: - - image: circleci/python:3.6.9-stretch-node-browsers + - image: circleci/python:3.6-stretch-node-browsers environment: PYTHON_VERSION: py36 lint-unit-27: <<: *lint-unit docker: - - image: circleci/python:2.7.16-stretch-node-browsers + - image: circleci/python:2.7-stretch-node-browsers environment: PYTHON_VERSION: py27 build-dash-37: &build-dash working_directory: ~/project docker: - - image: circleci/python:3.7.5-stretch-node-browsers + - image: circleci/python:3.7-stretch-node-browsers environment: PYTHON_VERSION: py37 steps: @@ -99,21 +99,21 @@ jobs: build-dash-36: <<: *build-dash docker: - - image: circleci/python:3.6.9-stretch-node-browsers + - image: circleci/python:3.6-stretch-node-browsers environment: PYTHON_VERSION: py36 build-dash-27: <<: *build-dash docker: - - image: circleci/python:2.7.16-stretch-node-browsers + - image: circleci/python:2.7-stretch-node-browsers environment: PYTHON_VERSION: py27 test-37: &test working_directory: ~/project docker: - - image: circleci/python:3.7.5-stretch-node-browsers + - image: circleci/python:3.7-stretch-node-browsers environment: PYTHON_VERSION: py37 PERCY_PARALLEL_TOTAL: -1 @@ -145,7 +145,7 @@ jobs: test-36: <<: *test docker: - - image: circleci/python:3.6.9-stretch-node-browsers + - image: circleci/python:3.6-stretch-node-browsers environment: PYTHON_VERSION: py36 PERCY_ENABLE: 0 @@ -153,7 +153,7 @@ jobs: test-27: <<: *test docker: - - image: circleci/python:2.7.16-stretch-node-browsers + - image: circleci/python:2.7-stretch-node-browsers environment: PYTHON_VERSION: py27 PERCY_ENABLE: 0 @@ -161,7 +161,7 @@ jobs: test-legacy-37: &test-legacy working_directory: ~/project docker: - - image: circleci/python:3.7.5-stretch-node-browsers + - image: circleci/python:3.7-stretch-node-browsers environment: PYTHON_VERSION: py37 PERCY_PARALLEL_TOTAL: -1 @@ -195,14 +195,14 @@ jobs: test-legacy-36: <<: *test-legacy docker: - - image: circleci/python:3.6.9-stretch-node-browsers + - image: circleci/python:3.6-stretch-node-browsers environment: PYTHON_VERSION: py36 PERCY_ENABLE: 0 test-legacy-27: <<: *test-legacy docker: - - image: circleci/python:2.7.16-stretch-node-browsers + - image: circleci/python:2.7-stretch-node-browsers environment: PYTHON_VERSION: py27 PERCY_ENABLE: 0 From ee7f86a3bd72b9eec2d87949d92613fc09f836ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andre=CC=81=20Rivet?= Date: Wed, 26 Feb 2020 21:16:33 -0500 Subject: [PATCH 6/6] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c73e0a761..3c98ab03d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [Unreleased] +### Changed +- [#762](https://github.com/plotly/dash-core-components/pull/762) Renamed async modules with hyphen `-` instead of tilde `~` + ## [1.8.0] - 2020-02-04 ### Changed - [#743](https://github.com/plotly/dash-core-components/pull/743) Location component now emits an event on URL path update from Link component