Merge branch 'chore/env-assets-path' into 'master'

Configure assets public path per env

See merge request pleroma/admin-fe!13

build/webpack.dev.conf.js

@@ -16,6 +16,8 @@ function resolve(dir) {
 const HOST = process.env.HOST
 const PORT = process.env.PORT && Number(process.env.PORT)
 
+const devEnv = require('../config/dev.env')
+
 const devWebpackConfig = merge(baseWebpackConfig, {
   mode: 'development',
   module: {
@@ -39,7 +41,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     overlay: config.dev.errorOverlay
       ? { warnings: false, errors: true }
       : false,
-    publicPath: config.dev.assetsPublicPath,
+    publicPath: devEnv.ASSETS_PUBLIC_PATH,
     proxy: config.dev.proxyTable,
     quiet: true, // necessary for FriendlyErrorsPlugin
     watchOptions: {
@@ -59,7 +61,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
       favicon: resolve('favicon.ico'),
       title: 'Admin FE',
       templateParameters: {
-        BASE_URL: config.dev.assetsPublicPath + config.dev.assetsSubDirectory,
+        BASE_URL: devEnv.ASSETS_PUBLIC_PATH + config.dev.assetsSubDirectory,
       },
     }),
   ]

build/webpack.prod.conf.js

@@ -57,7 +57,7 @@ const webpackConfig = merge(baseWebpackConfig, {
       favicon: resolve('favicon.ico'),
       title: 'Admin FE',
       templateParameters: {
-        BASE_URL: config.build.assetsPublicPath + config.build.assetsSubDirectory,
+        BASE_URL: env.ASSETS_PUBLIC_PATH + config.build.assetsSubDirectory,
       },
       minify: {
         removeComments: true,

config/dev.env.js

@@ -1,4 +1,5 @@
 module.exports = {
   NODE_ENV: '"development"',
-  ENV_CONFIG: '"dev"'
+  ENV_CONFIG: '"dev"',
+  ASSETS_PUBLIC_PATH: '/'
 }

config/index.js

@@ -8,7 +8,7 @@ module.exports = {
   dev: {
     // Paths
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
+    // assetsPublicPath: '', // To configure assetsPublicPath set ASSETS_PUBLIC_PATH in dev/prod.env.js
     proxyTable: {},
 
     // Various Dev Server settings
@@ -60,7 +60,7 @@ module.exports = {
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/',
+    // assetsPublicPath: '', // To configure assetsPublicPath set ASSETS_PUBLIC_PATH in dev/prod.env.js
 
     /**
      * Source Maps

config/prod.env.js

@@ -1,5 +1,6 @@
 module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG: '"prod"',
-  BASE_API: '"https://api-prod"'
+  BASE_API: '"https://api-prod"',
+  ASSETS_PUBLIC_PATH: '/pleroma/admin/'
 }