build: merged recent master changes into the PR133

Mijago · May 7, 2023 · c9f9c25 · c9f9c25
2 parents d868210 + 6fb58c2
commit c9f9c25
Show file tree

Hide file tree

Showing 9 changed files with 2,043 additions and 2,040 deletions.
diff --git a/.env_example b/.env_example
@@ -3,4 +3,5 @@ D2AP_BUNGIE_CLIENT_ID=
 D2AP_BUNGIE_CLIENT_SECRET=
 
 D2AP_FEATURE_ENABLE_MODSLOT_LIMITATION=0
-D2AP_FEATURE_ENABLE_ZERO_WASTE=0
+D2AP_FEATURE_ENABLE_ZERO_WASTE=0
+D2AP_FEATURE_ENABLE_GUARDIAN_GAMES_FEATURES=1
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -1,5 +1,5 @@
 {
-    "tabWidth": 4,
+    "tabWidth": 2,
     "useTabs": false,
     "singleQuote": false,
     "semi": true,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "d2-armor-picker",
-    "version": "2.3.1",
+    "version": "2.3.2",
     "scripts": {
         "ng": "ng",
         "config": "ts-node set-env.ts",

diff --git a/set-env.ts b/set-env.ts
@@ -2,46 +2,47 @@ const writeFile = require("fs").writeFile;
 
 const production = process.env.PRODUCTION === "1";
 const beta_branch = process.env.BETA === "1";
-const version = "2.3.1";
+const version = "2.3.2";
 
 // Configure Angular `environment.ts` file path
 const targetPath = production
-    ? "./src/environments/environment.prod.ts"
-    : beta_branch
-    ? "./src/environments/environment.prod.ts"
-    : "./src/environments/environment.ts";
+  ? "./src/environments/environment.prod.ts"
+  : beta_branch
+  ? "./src/environments/environment.prod.ts"
+  : "./src/environments/environment.ts";
 // Load node modules
 
 require("dotenv").config({
-    path: production ? ".env" : beta_branch ? ".env_beta" : ".env_dev",
+  path: production ? ".env" : beta_branch ? ".env_beta" : ".env_dev",
 });
 
 const revision = require("child_process").execSync("git rev-parse --short HEAD").toString().trim();
 
 var version_tag = production ? "" : beta_branch ? "-beta-" + revision : "-dev-" + revision;
 
 const data = {
-    version: version + version_tag,
-    revision: revision,
-    production: production,
-    beta: beta_branch,
-    apiKey: process.env.D2AP_BUNGIE_API_KEY,
-    clientId: process.env.D2AP_BUNGIE_CLIENT_ID,
-    client_secret: process.env.D2AP_BUNGIE_CLIENT_SECRET,
-    nodeEnv: process.env.NODE_ENV,
-    offlineMode: false,
-    featureFlags: {
-        enableModslotLimitation: process.env.D2AP_FEATURE_ENABLE_MODSLOT_LIMITATION == "1",
-        enableZeroWaste: process.env.D2AP_FEATURE_ENABLE_ZERO_WASTE == "1",
-    },
+  version: version + version_tag,
+  revision: revision,
+  production: production,
+  beta: beta_branch,
+  apiKey: process.env.D2AP_BUNGIE_API_KEY,
+  clientId: process.env.D2AP_BUNGIE_CLIENT_ID,
+  client_secret: process.env.D2AP_BUNGIE_CLIENT_SECRET,
+  nodeEnv: process.env.NODE_ENV,
+  offlineMode: false,
+  featureFlags: {
+    enableModslotLimitation: process.env.D2AP_FEATURE_ENABLE_MODSLOT_LIMITATION == "1",
+    enableZeroWaste: process.env.D2AP_FEATURE_ENABLE_ZERO_WASTE == "1",
+    enableGuardianGamesFeatures: process.env.D2AP_FEATURE_ENABLE_GUARDIAN_GAMES_FEATURES == "1",
+  },
 };
 
 // `environment.ts` file structure
 const envConfigFile = `export const environment = ${JSON.stringify(data, null, 2)};`;
 writeFile(targetPath, envConfigFile, (err: NodeJS.ErrnoException | null) => {
-    if (err) {
-        throw console.error(err);
-    } else {
-        console.log(`Angular environment.ts file generated correctly at ${targetPath} \n`);
-    }
+  if (err) {
+    throw console.error(err);
+  } else {
+    console.log(`Angular environment.ts file generated correctly at ${targetPath} \n`);
+  }
 });