Configuration changes

4 years ago · 5731f7bfea
4 changed files with 11 additions and 7 deletions
--- a/config/dev.json
+++ b/config/dev.json
@ -1,5 +1,5 @@
 {
-    "apiUrl": "https://api-dev.flexor.cc",
+    "apiUrl": "http://api-dev.flexor.cc",
    "blobUrl": "https://flexordev.blob.core.windows.net/media/",
    "media": {
        "defaultMaxSize": 5242880,
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
    "name": "flexor-web",
    "description": "Flexor API server.",
-    "version": "1.0.2",
+    "version": "1.0.3",
    "private": true,
    "browserslist": [
        "defaults"
@ -12,10 +12,10 @@
        "build:dev": "webpack --mode production --config webpack.config.ts",
        "build:prod": "webpack --mode production --config webpack.config.ts",
        "build:communicator": "webpack --config etc/communicator/webpack.config.ts",
-        "deploy:batch:dev": "az storage blob upload-batch -s ./dist/ -d $web --account-name flexordev",
-        "deploy:batch:prod": "az storage blob upload-batch -s ./dist/ -d $web --account-name flexor",
-        "deploy:config:dev": "az storage blob upload -f ./config/dev.json -c flexordev -n config.json",
-        "deploy:config:prod": "az storage blob upload -f ./config/prod.json -c flexor -n config.json",
+        "deploy:batch:dev": "az storage blob upload-batch --source ./dist/ -d '$web' --account-name flexordev",
+        "deploy:batch:prod": "az storage blob upload-batch --source ./dist/ -d '$web' --account-name flexor",
+        "deploy:config:dev": "az storage blob upload --file ./config/dev.json --name config.json --container-name '$web' --account-name flexordev",
+        "deploy:config:prod": "az storage blob upload --file ./config/prod.json --name config.json --container-name '$web' --account-name flexor",
        "deploy:dev": "run-s deploy:batch:dev deploy:config:dev",
        "deploy:prod": "run-s deploy:batch:prod deploy:config:prod"
    },
--- a/src/index.ejs
+++ b/src/index.ejs
@ -5,8 +5,8 @@
        <title>Flexor</title>
        <meta name="viewport" content="width=device-width, initial-scale=1">
    </head>
-
    <body>
        <div id="app"></div>
    </body>
+    <!-- Version: <% version %>-->
 </html>
--- a/webpack.config.ts
+++ b/webpack.config.ts
@ -3,6 +3,7 @@ import HtmlWebpackPlugin from 'html-webpack-plugin'
 import MiniCssExtractPlugin from 'mini-css-extract-plugin'
 import postcssPresetEnv from 'postcss-preset-env'
 import postcssNormalize from 'postcss-normalize'
+import PACKAGE from './package.json'
 // import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'

 import c from './config/config.json'
@ -79,6 +80,9 @@ const config: Configuration = {
            title: 'Flexor',
            hash: true,
            template: 'src/index.ejs',
+            templateParameters: {
+                'version': PACKAGE.version,
+            },
        }),
        new MiniCssExtractPlugin({
            filename: '[name].css',