diff --git a/packages/dash-table/.circleci/config.yml b/packages/dash-table/.circleci/config.yml index 07464896af..fe016ec307 100644 --- a/packages/dash-table/.circleci/config.yml +++ b/packages/dash-table/.circleci/config.yml @@ -213,6 +213,7 @@ jobs: . venv/bin/activate git clone --depth 1 git@github.com:plotly/dash.git dash-main pip install -e ./dash-main --quiet + cd dash-main/dash-renderer && npm install --ignore-scripts && npm run build && pip install -e . && cd ../.. - run: name: Install test requirements diff --git a/packages/dash-table/package.json b/packages/dash-table/package.json index 446150f500..027a130a73 100644 --- a/packages/dash-table/package.json +++ b/packages/dash-table/package.json @@ -18,9 +18,9 @@ "pretest.standalone": "run-s private::build:js-test", "private::build": "node --max_old_space_size=4096 node_modules/webpack/bin/webpack --display-reasons --bail", "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:js-dev": "run-s \"private::build -- --mode development --config webpack.dev.config.js\"", + "private::build:js-test": "run-s \"private::build -- --mode development --config webpack.test.config.js\"", + "private::build:js-test-watch": "run-s \"private::build -- --mode development --config webpack.test.config.js --watch\"", "private::build:py": "dash-generate-components src/dash-table/dash/DataTable.js dash_table -p 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", @@ -37,7 +37,7 @@ "private::test.unit": "cypress run --browser chrome --spec 'tests/cypress/tests/unit/**/*'", "private::test.server": "cypress run --browser chrome --spec 'tests/cypress/tests/server/**/*'", "private::test.standalone": "cypress run --browser chrome --spec 'tests/cypress/tests/standalone/**/*'", - "build.watch": "webpack-dev-server --content-base dash_table --mode development", + "build.watch": "webpack-dev-server --content-base dash_table --mode development --config webpack.dev.config.js", "build": "run-s private::build:js private::build:py", "lint": "run-s private::lint:*", "test.server": "run-p --race private::host* private::test.server", @@ -108,4 +108,4 @@ "node": ">=8.11.0", "npm": ">=6.1.0" } -} +} \ No newline at end of file diff --git a/packages/dash-table/webpack.config.js b/packages/dash-table/webpack.config.js index 9b48b41142..8f0828aaa4 100644 --- a/packages/dash-table/webpack.config.js +++ b/packages/dash-table/webpack.config.js @@ -1 +1,4 @@ -module.exports = require('./.config/webpack/base.js')(); \ No newline at end of file +let config = require('./.config/webpack/base.js')(); +config.externals['prop-types'] = 'PropTypes'; + +module.exports = config; \ No newline at end of file diff --git a/packages/dash-table/webpack.test.config.js b/packages/dash-table/webpack.test.config.js index dc39588e89..cbd73489bc 100644 --- a/packages/dash-table/webpack.test.config.js +++ b/packages/dash-table/webpack.test.config.js @@ -8,6 +8,4 @@ const options = { mode: 'development' }; -const config = require('./.config/webpack/base.js')(options); - -module.exports = config; \ No newline at end of file +module.exports = require('./.config/webpack/base.js')(options); \ No newline at end of file