You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/10/02 19:01:50 UTC
[airavata-django-portal] 05/06: Revert "AIRAVATA-2984 Generate
webpack files in STATIC_ROOT dir"
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 6e2cc65eaaf2ebfee1fc081a3a996199533babad
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Aug 12 19:45:20 2019 -0400
Revert "AIRAVATA-2984 Generate webpack files in STATIC_ROOT dir"
This reverts commit 22134a0b5b30c09af6d0fdaf2add142beaedf83b.
---
django_airavata/apps/admin/vue.config.js | 5 ++---
django_airavata/apps/dataparsers/vue.config.js | 5 ++---
django_airavata/apps/groups/vue.config.js | 5 ++---
django_airavata/apps/workspace/vue.config.js | 5 ++---
django_airavata/static/common/vue.config.js | 3 +--
docs/dev/new_django_app.md | 7 ++-----
6 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/django_airavata/apps/admin/vue.config.js b/django_airavata/apps/admin/vue.config.js
index 3ca614a..f3e326d 100644
--- a/django_airavata/apps/admin/vue.config.js
+++ b/django_airavata/apps/admin/vue.config.js
@@ -1,13 +1,12 @@
const BundleTracker = require("webpack-bundle-tracker");
const path = require("path");
-const staticDir = process.env.STATIC_ROOT ? process.env.STATIC_ROOT : "./static/";
module.exports = {
publicPath:
process.env.NODE_ENV === "development"
? "http://localhost:9000/static/django_airavata_admin/dist/"
: "/static/django_airavata_admin/dist/",
- outputDir: staticDir + "django_airavata_admin/dist",
+ outputDir: "./static/django_airavata_admin/dist",
css: {
loaderOptions: {
postcss: {
@@ -21,7 +20,7 @@ module.exports = {
plugins: [
new BundleTracker({
filename: "webpack-stats.json",
- path: staticDir + "django_airavata_admin/dist/"
+ path: "./static/django_airavata_admin/dist/"
})
],
optimization: {
diff --git a/django_airavata/apps/dataparsers/vue.config.js b/django_airavata/apps/dataparsers/vue.config.js
index 1b62467..bc51dd7 100644
--- a/django_airavata/apps/dataparsers/vue.config.js
+++ b/django_airavata/apps/dataparsers/vue.config.js
@@ -1,13 +1,12 @@
const BundleTracker = require("webpack-bundle-tracker");
const path = require("path");
-const staticDir = process.env.STATIC_ROOT ? process.env.STATIC_ROOT : "./static/";
module.exports = {
publicPath:
process.env.NODE_ENV === "development"
? "http://localhost:9000/static/django_airavata_dataparsers/dist/"
: "/static/django_airavata_dataparsers/dist/",
- outputDir: staticDir + "django_airavata_dataparsers/dist",
+ outputDir: "./static/django_airavata_dataparsers/dist",
pages: {
'parser-details': './static/django_airavata_dataparsers/js/entry-parser-details',
'parser-list': './static/django_airavata_dataparsers/js/parser-listing-entry-point.js',
@@ -26,7 +25,7 @@ module.exports = {
plugins: [
new BundleTracker({
filename: "webpack-stats.json",
- path: staticDir + "django_airavata_dataparsers/dist/"
+ path: "./static/django_airavata_dataparsers/dist/"
})
],
optimization: {
diff --git a/django_airavata/apps/groups/vue.config.js b/django_airavata/apps/groups/vue.config.js
index ef3b4c3..5fdc24f 100644
--- a/django_airavata/apps/groups/vue.config.js
+++ b/django_airavata/apps/groups/vue.config.js
@@ -1,13 +1,12 @@
const BundleTracker = require("webpack-bundle-tracker");
const path = require("path");
-const staticDir = process.env.STATIC_ROOT ? process.env.STATIC_ROOT : "./static/";
module.exports = {
publicPath:
process.env.NODE_ENV === "development"
? "http://localhost:9000/static/django_airavata_groups/dist/"
: "/static/django_airavata_groups/dist/",
- outputDir: staticDir + "django_airavata_groups/dist",
+ outputDir: "./static/django_airavata_groups/dist",
pages: {
'group-list': './static/django_airavata_groups/js/group-listing-entry-point.js',
'group-create': './static/django_airavata_groups/js/group-create-entry-point.js',
@@ -26,7 +25,7 @@ module.exports = {
plugins: [
new BundleTracker({
filename: "webpack-stats.json",
- path: staticDir + "django_airavata_groups/dist/"
+ path: "./static/django_airavata_groups/dist/"
})
],
optimization: {
diff --git a/django_airavata/apps/workspace/vue.config.js b/django_airavata/apps/workspace/vue.config.js
index 92f8662..deef681 100644
--- a/django_airavata/apps/workspace/vue.config.js
+++ b/django_airavata/apps/workspace/vue.config.js
@@ -1,13 +1,12 @@
const BundleTracker = require("webpack-bundle-tracker");
const path = require("path");
-const staticDir = process.env.STATIC_ROOT ? process.env.STATIC_ROOT : "./static/";
module.exports = {
publicPath:
process.env.NODE_ENV === "development"
? "http://localhost:9000/static/django_airavata_workspace/dist/"
: "/static/django_airavata_workspace/dist/",
- outputDir: staticDir + "django_airavata_workspace/dist",
+ outputDir: "./static/django_airavata_workspace/dist",
pages: {
'project-list': './static/django_airavata_workspace/js/entry-project-list',
'dashboard': './static/django_airavata_workspace/js/entry-dashboard',
@@ -31,7 +30,7 @@ module.exports = {
plugins: [
new BundleTracker({
filename: "webpack-stats.json",
- path: staticDir + "django_airavata_workspace/dist/"
+ path: "./static/django_airavata_workspace/dist/"
})
],
optimization: {
diff --git a/django_airavata/static/common/vue.config.js b/django_airavata/static/common/vue.config.js
index 237b081..82ac222 100644
--- a/django_airavata/static/common/vue.config.js
+++ b/django_airavata/static/common/vue.config.js
@@ -1,5 +1,4 @@
const BundleTracker = require("webpack-bundle-tracker");
-const staticDir = process.env.STATIC_ROOT ? process.env.STATIC_ROOT + "common/" : "./";
module.exports = {
publicPath: "/static/common/dist/",
@@ -12,7 +11,7 @@ module.exports = {
plugins: [
new BundleTracker({
filename: "webpack-stats.json",
- path: staticDir + "dist/"
+ path: "./dist/"
})
]
}
diff --git a/docs/dev/new_django_app.md b/docs/dev/new_django_app.md
index f17d465..8c9118e 100644
--- a/docs/dev/new_django_app.md
+++ b/docs/dev/new_django_app.md
@@ -285,16 +285,13 @@ Now add a `vue.config.js` file too:
```javascript
const BundleTracker = require("webpack-bundle-tracker");
const path = require("path");
-const staticDir = process.env.STATIC_ROOT
- ? process.env.STATIC_ROOT
- : "./static/";
module.exports = {
publicPath:
process.env.NODE_ENV === "development"
? "http://localhost:9000/static/django_airavata_myapp/dist/"
: "/static/django_airavata_myapp/dist/",
- outputDir: staticDir + "django_airavata_myapp/dist",
+ outputDir: "./static/django_airavata_myapp/dist",
pages: {
home: "./static/django_airavata_myapp/js/entry-home"
// additional entry points go here ...
@@ -312,7 +309,7 @@ module.exports = {
plugins: [
new BundleTracker({
filename: "webpack-stats.json",
- path: staticDir + "django_airavata_myapp/dist/"
+ path: "./static/django_airavata_myapp/dist/"
})
],
optimization: {