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/08/12 23:47:25 UTC
[airavata-django-portal] branch local-builds updated (9f6435a ->
12f46f6)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch local-builds
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from 9f6435a Add shebang to build script
new 7f1102d Revert "AIRAVATA-2984 Load webpack-stats.json from STATIC_ROOT"
new 12f46f6 Revert "AIRAVATA-2984 Generate webpack files in STATIC_ROOT dir"
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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/settings.py | 63 +++++++++++++++++++-
django_airavata/static/common/vue.config.js | 3 +-
django_airavata/webpack_loader_util.py | 82 --------------------------
docs/dev/new_django_app.md | 20 +++----
8 files changed, 77 insertions(+), 111 deletions(-)
delete mode 100644 django_airavata/webpack_loader_util.py
[airavata-django-portal] 02/02: Revert "AIRAVATA-2984 Generate
webpack files in STATIC_ROOT dir"
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch local-builds
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 12f46f60a3743c379bb7a5b0edd56807b6fb056d
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 | 5 ++---
6 files changed, 11 insertions(+), 17 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 37a7e3e..fdb3918 100644
--- a/docs/dev/new_django_app.md
+++ b/docs/dev/new_django_app.md
@@ -279,14 +279,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 ...
@@ -304,7 +303,7 @@ module.exports = {
plugins: [
new BundleTracker({
filename: "webpack-stats.json",
- path: staticDir + "django_airavata_myapp/dist/"
+ path: "./static/django_airavata_myapp/dist/"
})
],
optimization: {
[airavata-django-portal] 01/02: Revert "AIRAVATA-2984 Load
webpack-stats.json from STATIC_ROOT"
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch local-builds
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 7f1102d2ce576ec8b3417e389ecf3fcb0a3edd45
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Aug 12 19:45:11 2019 -0400
Revert "AIRAVATA-2984 Load webpack-stats.json from STATIC_ROOT"
This reverts commit e2b13d4808601f3cb0e5f04846aa7681297996e1.
---
django_airavata/settings.py | 63 ++++++++++++++++++++++++--
django_airavata/webpack_loader_util.py | 82 ----------------------------------
docs/dev/new_django_app.md | 15 +++----
3 files changed, 66 insertions(+), 94 deletions(-)
diff --git a/django_airavata/settings.py b/django_airavata/settings.py
index bb5ab3f..358ac85 100644
--- a/django_airavata/settings.py
+++ b/django_airavata/settings.py
@@ -17,8 +17,6 @@ from pkg_resources import iter_entry_points
from django_airavata.app_config import enhance_custom_app_config
-from . import webpack_loader_util
-
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -273,7 +271,66 @@ AUTHENTICATION_OPTIONS = {
THRIFT_CLIENT_POOL_KEEPALIVE = 5
# Webpack loader
-WEBPACK_LOADER = webpack_loader_util.create_webpack_loader_config()
+WEBPACK_LOADER = {
+ 'COMMON': {
+ 'BUNDLE_DIR_NAME': 'common/dist/',
+ 'STATS_FILE': os.path.join(
+ BASE_DIR,
+ 'django_airavata',
+ 'static',
+ 'common',
+ 'dist',
+ 'webpack-stats.json'),
+ },
+ 'ADMIN': {
+ 'BUNDLE_DIR_NAME': 'django_airavata_admin/dist/',
+ 'STATS_FILE': os.path.join(
+ BASE_DIR,
+ 'django_airavata',
+ 'apps',
+ 'admin',
+ 'static',
+ 'django_airavata_admin',
+ 'dist',
+ 'webpack-stats.json'),
+ },
+ 'DATAPARSERS': {
+ 'BUNDLE_DIR_NAME': 'django_airavata_dataparsers/dist/',
+ 'STATS_FILE': os.path.join(
+ BASE_DIR,
+ 'django_airavata',
+ 'apps',
+ 'dataparsers',
+ 'static',
+ 'django_airavata_dataparsers',
+ 'dist',
+ 'webpack-stats.json'),
+ },
+ 'GROUPS': {
+ 'BUNDLE_DIR_NAME': 'django_airavata_groups/dist/',
+ 'STATS_FILE': os.path.join(
+ BASE_DIR,
+ 'django_airavata',
+ 'apps',
+ 'groups',
+ 'static',
+ 'django_airavata_groups',
+ 'dist',
+ 'webpack-stats.json'),
+ },
+ 'WORKSPACE': {
+ 'BUNDLE_DIR_NAME': 'django_airavata_workspace/dist/',
+ 'STATS_FILE': os.path.join(
+ BASE_DIR,
+ 'django_airavata',
+ 'apps',
+ 'workspace',
+ 'static',
+ 'django_airavata_workspace',
+ 'dist',
+ 'webpack-stats.json'),
+ },
+}
LOGGING = {
'version': 1,
diff --git a/django_airavata/webpack_loader_util.py b/django_airavata/webpack_loader_util.py
deleted file mode 100644
index 8d30375..0000000
--- a/django_airavata/webpack_loader_util.py
+++ /dev/null
@@ -1,82 +0,0 @@
-"""Utilities for working with webpack_loader."""
-import os
-
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
-
-def create_webpack_loader_config(static_root=None):
- return {
- 'COMMON': {
- 'BUNDLE_DIR_NAME': 'common/dist/',
- 'STATS_FILE': os.path.join(
- static_root if static_root else
- os.path.join(
- BASE_DIR,
- 'django_airavata',
- 'static',
- ),
- 'common',
- 'dist',
- 'webpack-stats.json'),
- },
- 'ADMIN': {
- 'BUNDLE_DIR_NAME': 'django_airavata_admin/dist/',
- 'STATS_FILE': os.path.join(
- static_root if static_root else
- os.path.join(
- BASE_DIR,
- 'django_airavata',
- 'apps',
- 'admin',
- 'static',
- ),
- 'django_airavata_admin',
- 'dist',
- 'webpack-stats.json'),
- },
- 'DATAPARSERS': {
- 'BUNDLE_DIR_NAME': 'django_airavata_dataparsers/dist/',
- 'STATS_FILE': os.path.join(
- static_root if static_root else
- os.path.join(
- BASE_DIR,
- 'django_airavata',
- 'apps',
- 'dataparsers',
- 'static',
- ),
- 'django_airavata_dataparsers',
- 'dist',
- 'webpack-stats.json'),
- },
- 'GROUPS': {
- 'BUNDLE_DIR_NAME': 'django_airavata_groups/dist/',
- 'STATS_FILE': os.path.join(
- static_root if static_root else
- os.path.join(
- BASE_DIR,
- 'django_airavata',
- 'apps',
- 'groups',
- 'static',
- ),
- 'django_airavata_groups',
- 'dist',
- 'webpack-stats.json'),
- },
- 'WORKSPACE': {
- 'BUNDLE_DIR_NAME': 'django_airavata_workspace/dist/',
- 'STATS_FILE': os.path.join(
- static_root if static_root else
- os.path.join(
- BASE_DIR,
- 'django_airavata',
- 'apps',
- 'workspace',
- 'static',
- ),
- 'django_airavata_workspace',
- 'dist',
- 'webpack-stats.json'),
- },
- }
diff --git a/docs/dev/new_django_app.md b/docs/dev/new_django_app.md
index 21c2a89..37a7e3e 100644
--- a/docs/dev/new_django_app.md
+++ b/docs/dev/new_django_app.md
@@ -70,21 +70,18 @@ INSTALLED_APPS = [
### Add Webpack bundle loader config to settings.py
If the new app has Webpack built frontend, then add the following configuration
-to webpack_loader_util.py:
+to WEBPACK_LOADER in settings.py:
```python
...
'MYAPP': {
'BUNDLE_DIR_NAME': 'django_airavata_myapp/dist/',
'STATS_FILE': os.path.join(
- static_root if static_root else
- os.path.join(
- BASE_DIR,
- 'django_airavata',
- 'apps',
- 'myapp',
- 'static',
- ),
+ BASE_DIR,
+ 'django_airavata',
+ 'apps',
+ 'myapp',
+ 'static',
'django_airavata_myapp',
'dist',
'webpack-stats.json'),