Added server.modify.sha1_in_config option.

roquie · roquie · commit f5039e30fa78 · 2020-01-27T15:26:35.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## [2.0.2] - 2020-01-27
+
+### Added
+
+- Option `server.modify.sha1_in_config`. Enable of disable `__config` name with passed VCS SHA1 from CI.
+
+### Changed
+
+None.
+
+### Removed
+
+None.
+
 ## [2.0.1] - 2020-01-27
 
 Prerender option now more configurable and supports many of sets
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ Server created for javascript SPA apps like: Vue, React, Angular, etc.
 ## Docker usage
 
 ```Dockerfile
-FROM microparts/static-server-php:2.0.1
+FROM microparts/static-server-php:2.0.2
 
 ARG VCS_SHA1
 ARG STAGE
@@ -45,7 +45,7 @@ server run
 
 Result:
 ```bash
-[2019-12-18 17:38:30] Server.INFO: State: STAGE=local SHA1= VERSION=2.0.1 CONFIG_PATH=/Users/roquie/google_drive/projects/microparts/static-server-php/configuration
+[2019-12-18 17:38:30] Server.INFO: State: STAGE=local SHA1= VERSION=2.0.2 CONFIG_PATH=/Users/roquie/google_drive/projects/microparts/static-server-php/configuration
 [2019-12-18 17:38:30] Server.INFO: Files modification enabled. Have fun!.
 [2019-12-18 17:38:30] Server.INFO: Nginx Brotli module not installed. Turning off this compression method.
 [2019-12-18 17:38:30] Server.INFO: Check if platform supports async io...
@@ -68,7 +68,7 @@ server reload
 Reload command result:
 ```bash
 [2019-12-18 17:41:44] Server.INFO: Reload configuration
-[2019-12-18 17:41:44] Server.INFO: State: STAGE=local SHA1= VERSION=2.0.1 CONFIG_PATH=/Users/roquie/google_drive/projects/microparts/static-server-php/configuration
+[2019-12-18 17:41:44] Server.INFO: State: STAGE=local SHA1= VERSION=2.0.2 CONFIG_PATH=/Users/roquie/google_drive/projects/microparts/static-server-php/configuration
 [2019-12-18 17:41:44] Server.INFO: Files modification enabled. Have fun!.
 [2019-12-18 17:41:44] Server.INFO: Nginx Brotli module not installed. Turning off this compression method.
 [2019-12-18 17:41:44] Server.INFO: Check if platform supports async io...
diff --git a/configuration/defaults/___server.yaml b/configuration/defaults/___server.yaml
@@ -11,6 +11,7 @@ defaults:
       # head -> Injects the __config.js to top of <head> tag. It will be block content rendering, so not recommended.
       # before_script -> Injects the __config.js before first <script> tag in DOM document. Better than `head` variant.
       inject: before_script # head/before_script
+      sha1_in_config: false
     handler:
       name: nginx
       options:
diff --git a/src/Application.php b/src/Application.php
@@ -22,7 +22,7 @@
 
 final class Application
 {
-    public const VERSION = '2.0.1';
+    public const VERSION = '2.0.2';
     private const SERVER_LOG_CHANNEL = 'Server';
 
     private Configuration $conf;
diff --git a/src/Modifier/DefaultPreferencesConfigurator.php b/src/Modifier/DefaultPreferencesConfigurator.php
@@ -47,7 +47,10 @@ public function getModifier(): GenericModifyInterface
         $this->logger->info('Files modification enabled. Have fun!.');
 
         $mod = new Modify();
-        $location = $this->getConfigName('/__config.js');
+
+        $location = $this->configuration->get('server.modify.sha1_in_config', false)
+            ? $this->getConfigName('/__config.js')
+            : '/__config.js';
 
         $mod->addTemplate(__DIR__ . '/../stub/__config.js', $location);
         $mod->addTemplate(__DIR__ . '/../stub/security.txt', '/.well-known/security.txt');
diff --git a/tests/example_dist/vue/modified/__config_test.js b/tests/example_dist/vue/modified/__config_test.js
diff --git a/tests/example_dist/vue/modified/index.html b/tests/example_dist/vue/modified/index.html
@@ -3,7 +3,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1">
-  <link rel="preload" href="/__config_test.js" as="script"><link rel="icon" href="/favicon.ico">
+  <link rel="preload" href="/__config.js" as="script"><link rel="icon" href="/favicon.ico">
   <title>example_dist</title>
   <link href="/js/about.5273d30c.js" rel="prefetch">
   <link href="/css/app.e28d37a7.css" rel="preload" as="style">
@@ -15,7 +15,7 @@
 <noscript><strong>We're sorry but example_dist doesn't work properly without JavaScript enabled. Please enable it to
   continue.</strong></noscript>
 <div id="app"></div>
-<script src="/__config_test.js"></script><script src="/js/chunk-vendors.a377004b.js"></script>
+<script src="/__config.js"></script><script src="/js/chunk-vendors.a377004b.js"></script>
 <script src="/js/app.06433c76.js"></script>
 </body>
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`
`23`	`23`	`final class Application`
`24`	`24`	`{`
`25`		`- public const VERSION = '2.0.1';`
	`25`	`+ public const VERSION = '2.0.2';`
`26`	`26`	`private const SERVER_LOG_CHANNEL = 'Server';`
`27`	`27`
`28`	`28`	`private Configuration $conf;`