Issue 235 - Fix regressions introduced to PyPi and NPM packaging (#237)

Author: Marc-Andre-Rivet

Diff for: packages/dash-table/.circleci/config.yml

@@ -42,11 +42,11 @@ jobs:
 
             - run:
                 name: Run build:js
-                command: npm run build:js-test
+                command: npm run private::build:js-test
 
             - run:
                 name: Run build:py
-                command: npm run build:py
+                command: npm run private::build:py
 
             - run:
                 name: Run tests
@@ -76,7 +76,7 @@ jobs:
 
             - run:
                 name: Run build:js
-                command: npm run build:js
+                command: npm run private::build:js
 
             - run:
                 name: Run visual tests

Diff for: packages/dash-table/.config/webpack/base.js

@@ -16,7 +16,7 @@ module.exports = (preprocessor = {}, mode = 'development') => {
         },
         mode: mode,
         output: {
-            path: path.resolve(__dirname, './../../lib'),
+            path: path.resolve(__dirname, `./../../${dashLibraryName}`),
             filename: '[name].js',
             library: dashLibraryName,
             libraryTarget: 'umd'

Diff for: packages/dash-table/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/).
 
+## [3.1.5] - 2018-11-09
+### Fixed
+- Fix python package regression [#235](https://github.com/plotly/dash-table/issues/235)
+
 ## [3.1.4] - 2018-11-06
 ### Added
 - New derived props for `selected_rows` [#147](https://github.com/plotly/dash-table/issues/147)

Diff for: packages/dash-table/MANIFEST.in

@@ -1,5 +1,5 @@
 include dash_table/bundle.js
 include dash_table/metadata.json
-include dash_table/package.json
+include dash_table/package-info.json
 include README.md
 include package.json

Diff for: packages/dash-table/dash_table/__init__.py

@@ -13,7 +13,7 @@
     _sys.exit(1)
 
 _basepath = _os.path.dirname(__file__)
-_filepath = _os.path.abspath(_os.path.join(_basepath, 'package.json'))
+_filepath = _os.path.abspath(_os.path.join(_basepath, 'package-info.json'))
 with open(_filepath) as f:
     package = json.load(f)
 

Diff for: packages/dash-table/dash_table/package.json renamed to packages/dash-table/dash_table/package-info.json

@@ -1,13 +1,17 @@
 {
   "name": "dash-table",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "description": "Dash table",
-  "main": "lib/bundle.js",
+  "main": "dash_table/bundle.js",
   "scripts": {
     "preprivate::opentests": "run-s private::wait*",
     "preprivate::runtests": "run-s private::wait*",
     "private::build": "node --max_old_space_size=4096 node_modules/webpack/bin/webpack --display-reasons --bail",
-    "postprivate::build": "cp -R lib/* dash_table",
+    "private::build:js": "run-s \"private::build -- --mode production\"",
+    "private::build:js-dev": "run-s \"private::build -- --mode development\"",
+    "private::build:js-test": "run-s \"private::build -- --config webpack.test.config.js\"",
+    "private::build:js-test-watch": "run-s \"private::build -- --config webpack.test.config.js --watch\"",
+    "private::build:py": "./extract-meta src/dash-table/DataTable.js > dash_table/metadata.json && cp package.json dash_table/package-info.json",
     "private::host_dash8081": "python tests/cypress/dash/v_be_page.py",
     "private::host_dash8082": "python tests/cypress/dash/v_copy_paste.py",
     "private::host_dash8083": "python tests/cypress/dash/v_fe_page.py",
@@ -21,16 +25,12 @@
     "private::opentests": "cypress open",
     "private::runtests": "cypress run --browser chrome",
     "build.watch": "webpack-dev-server --content-base dash_table --mode development",
-    "build:js": "run-s \"private::build -- --mode production\"",
-    "build:js-dev": "run-s \"private::build -- --mode development\"",
-    "build:js-test": "run-s \"private::build -- --config webpack.test.config.js\"",
-    "build:js-test-watch": "run-s \"private::build -- --config webpack.test.config.js --watch\"",
-    "build:py": "./extract-meta src/dash-table/DataTable.js > dash_table/metadata.json && cp package.json dash_table",
+    "build": "run-s private::build:js private::build:py",
     "lint": "run-s private::lint.js private::lint.ts",
     "test": "run-p --race private::host* private::runtests",
     "test.visual": "build-storybook && percy-storybook",
     "test.visual-local": "build-storybook",
-    "test.watch": "run-p --race \"build:js-test-watch\" --race private::host* private::opentests"
+    "test.watch": "run-p --race \"private::build:js-test-watch\" --race private::host* private::opentests"
   },
   "author": "Chris P <[email protected]",
   "license": "MIT",
@@ -81,7 +81,7 @@
     "webpack-preprocessor": "^0.1.12"
   },
   "files": [
-    "/lib/bundle.js"
+    "/dash_table/bundle*.js"
   ],
   "peerDependencies": {
     "react": ">=0.14",

Diff for: packages/dash-table/package.json

@@ -1,13 +1,17 @@
 {
   "name": "dash-table",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "description": "Dash table",
-  "main": "lib/bundle.js",
+  "main": "dash_table/bundle.js",
   "scripts": {
     "preprivate::opentests": "run-s private::wait*",
     "preprivate::runtests": "run-s private::wait*",
     "private::build": "node --max_old_space_size=4096 node_modules/webpack/bin/webpack --display-reasons --bail",
-    "postprivate::build": "cp -R lib/* dash_table",
+    "private::build:js": "run-s \"private::build -- --mode production\"",
+    "private::build:js-dev": "run-s \"private::build -- --mode development\"",
+    "private::build:js-test": "run-s \"private::build -- --config webpack.test.config.js\"",
+    "private::build:js-test-watch": "run-s \"private::build -- --config webpack.test.config.js --watch\"",
+    "private::build:py": "./extract-meta src/dash-table/DataTable.js > dash_table/metadata.json && cp package.json dash_table/package-info.json",
     "private::host_dash8081": "python tests/cypress/dash/v_be_page.py",
     "private::host_dash8082": "python tests/cypress/dash/v_copy_paste.py",
     "private::host_dash8083": "python tests/cypress/dash/v_fe_page.py",
@@ -21,16 +25,12 @@
     "private::opentests": "cypress open",
     "private::runtests": "cypress run --browser chrome",
     "build.watch": "webpack-dev-server --content-base dash_table --mode development",
-    "build:js": "run-s \"private::build -- --mode production\"",
-    "build:js-dev": "run-s \"private::build -- --mode development\"",
-    "build:js-test": "run-s \"private::build -- --config webpack.test.config.js\"",
-    "build:js-test-watch": "run-s \"private::build -- --config webpack.test.config.js --watch\"",
-    "build:py": "./extract-meta src/dash-table/DataTable.js > dash_table/metadata.json && cp package.json dash_table",
+    "build": "run-s private::build:js private::build:py",
     "lint": "run-s private::lint.js private::lint.ts",
     "test": "run-p --race private::host* private::runtests",
     "test.visual": "build-storybook && percy-storybook",
     "test.visual-local": "build-storybook",
-    "test.watch": "run-p --race \"build:js-test-watch\" --race private::host* private::opentests"
+    "test.watch": "run-p --race \"private::build:js-test-watch\" --race private::host* private::opentests"
   },
   "author": "Chris P <[email protected]",
   "license": "MIT",
@@ -81,7 +81,7 @@
     "webpack-preprocessor": "^0.1.12"
   },
   "files": [
-    "/lib/bundle.js"
+    "/dash_table/bundle*.js"
   ],
   "peerDependencies": {
     "react": ">=0.14",