Skip to content

Commit e7cc761

Browse files
author
Andrew Schonfeld
committed
1.7.11 - hotfix for dash's custom.js file missing from webpack production builds
1 parent 84f0021 commit e7cc761

File tree

10 files changed

+25
-15
lines changed

10 files changed

+25
-15
lines changed

Diff for: .circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ defaults: &defaults
55
CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
66
CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
77
CODECOV_TOKEN: b0d35139-0a75-427a-907b-2c78a762f8f0
8-
VERSION: 1.7.10
8+
VERSION: 1.7.11
99
PANDOC_RELEASES_URL: https://github.com/jgm/pandoc/releases
1010
steps:
1111
- checkout

Diff for: CHANGES.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
## Changelog
22

3+
### 1.7.11 (2020-2-27)
4+
* hotfix for dash custom.js file missing from production webpack build script
5+
36
### 1.7.10 (2020-2-27)
47
* [#75](https://github.com/man-group/dtale/issues/75), added code snippet functionality to the following:
58
* main grid, histogram, correlations, column building & charts

Diff for: README.md

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ D-Tale was the product of a SAS to Python conversion. What was originally a per
2121
## In The News
2222
- [Man Institute](https://www.man.com/maninstitute/d-tale) (warning: contains deprecated functionality)
2323
- [Python Bytes](https://pythonbytes.fm/episodes/show/169/jupyter-notebooks-natively-on-your-ipad)
24+
- [Pip Install Python YouTube Channel](https://m.youtube.com/watch?v=0RihZNdQc7k&feature=youtu.be)
2425

2526
## Contents
2627

Diff for: docker/2_7/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ WORKDIR /app
4444

4545
RUN set -eux \
4646
; . /root/.bashrc \
47-
; easy_install dtale-1.7.10-py2.7.egg
47+
; easy_install dtale-1.7.11-py2.7.egg

Diff for: docker/3_6/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ WORKDIR /app
4444

4545
RUN set -eux \
4646
; . /root/.bashrc \
47-
; easy_install dtale-1.7.10-py3.7.egg
47+
; easy_install dtale-1.7.11-py3.7.egg

Diff for: docs/source/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464
# built documents.
6565
#
6666
# The short X.Y version.
67-
version = u'1.7.10'
67+
version = u'1.7.11'
6868
# The full version, including alpha/beta/rc tags.
69-
release = u'1.7.10'
69+
release = u'1.7.11'
7070

7171
# The language for content autogenerated by Sphinx. Refer to documentation
7272
# for a list of supported languages.

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dtale",
3-
"version": "1.7.10",
3+
"version": "1.7.11",
44
"description": "Visualizer for Pandas Data Structures",
55
"main": "main.js",
66
"directories": {

Diff for: setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def run_tests(self):
5050

5151
setup(
5252
name="dtale",
53-
version="1.7.10",
53+
version="1.7.11",
5454
author="MAN Alpha Technology",
5555
author_email="[email protected]",
5656
description="Web Client for Visualizing Pandas Objects",

Diff for: webpack.config.js

+10-7
Original file line numberDiff line numberDiff line change
@@ -127,15 +127,22 @@ function createConfig(entry) {
127127
};
128128
}
129129

130-
function createDashConfig(entryName, entryPath) {
130+
const dashEntries = [
131+
["components", "./static/dash/lib/index.js"],
132+
["custom", "./static/dash/lib/custom.js"],
133+
];
134+
135+
function createDashConfig(entry) {
136+
const entryName = entry[0];
137+
const entryPath = entry[1];
131138
return {
132139
mode: "development",
133140
entry: path.resolve(__dirname, entryPath),
134141
output: {
135142
path: path.resolve(__dirname, "./dtale/static/dash"),
136143
filename: entryName + "_bundle.js",
137144
publicPath: "/dash/",
138-
library: "components",
145+
library: entryName,
139146
libraryTarget: "window",
140147
},
141148
devtool: "source-map",
@@ -180,8 +187,4 @@ function createDashConfig(entryName, entryPath) {
180187
};
181188
}
182189

183-
module.exports = _.concat(
184-
_.map(entries, createConfig),
185-
createDashConfig("components", "./static/dash/lib/index.js"),
186-
createDashConfig("custom", "./static/dash/lib/custom.js")
187-
);
190+
module.exports = _.concat(_.map(entries, createConfig), _.map(dashEntries, createDashConfig));

Diff for: webpack.production.config.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,8 @@ module.exports = _.concat(
4141
_.filter(baseConfig, c => !_.endsWith(c.output.path, "dtale/static/dash")),
4242
createConfig
4343
),
44-
createDashConfig(_.find(baseConfig, c => _.endsWith(c.output.path, "dtale/static/dash")))
44+
_.map(
45+
_.filter(baseConfig, c => _.endsWith(c.output.path, "dtale/static/dash")),
46+
createDashConfig
47+
)
4548
);

0 commit comments

Comments
 (0)