From 4200a8665c780bcd85037184c75c843f0647c9fb Mon Sep 17 00:00:00 2001
From: Volker E <volker.e@wikimedia.org>
Date: Thu, 14 May 2020 13:54:15 -0700
Subject: [PATCH] Naming convention using 'skin' as entrance point

Using 'skin' as entrance point files, similar to already existing
convention in MediaWiki land with 'skin.json' or 'SkinVector.php' as
example in Vector skin. Replacing Apache inspired 'index' convention.
Also renaming legacy to 'skin-legacy' to be clear on file base that it's
a modification of 'skin'.

Bug: T249073
Change-Id: Ief1c469724d4ffe238d307407c3ddb46f2e1abfa
---
 includes/VectorTemplate.php                               | 2 +-
 .../templates/{legacy.mustache => skin-legacy.mustache}   | 0
 includes/templates/{index.mustache => skin.mustache}      | 0
 resources/skins.vector.js/{index.js => skin.js}           | 0
 .../skins.vector.legacy.js/{index.js => skin-legacy.js}   | 0
 resources/skins.vector.styles/common/print.less           | 2 +-
 .../skins.vector.styles/{legacy.less => skin-legacy.less} | 0
 resources/skins.vector.styles/{index.less => skin.less}   | 0
 skin.json                                                 | 8 ++++----
 stories/legacy.stories.js                                 | 4 ++--
 10 files changed, 8 insertions(+), 8 deletions(-)
 rename includes/templates/{legacy.mustache => skin-legacy.mustache} (100%)
 rename includes/templates/{index.mustache => skin.mustache} (100%)
 rename resources/skins.vector.js/{index.js => skin.js} (100%)
 rename resources/skins.vector.legacy.js/{index.js => skin-legacy.js} (100%)
 rename resources/skins.vector.styles/{legacy.less => skin-legacy.less} (100%)
 rename resources/skins.vector.styles/{index.less => skin.less} (100%)

diff --git a/includes/VectorTemplate.php b/includes/VectorTemplate.php
index 045d667..542e88e 100644
--- a/includes/VectorTemplate.php
+++ b/includes/VectorTemplate.php
@@ -76,7 +76,7 @@ class VectorTemplate extends BaseTemplate {
 
 		$this->templateParser = $templateParser;
 		$this->isLegacy = $isLegacy;
-		$this->templateRoot = $isLegacy ? 'legacy' : 'index';
+		$this->templateRoot = $isLegacy ? 'skin-legacy' : 'skin';
 	}
 
 	/**
diff --git a/includes/templates/legacy.mustache b/includes/templates/skin-legacy.mustache
similarity index 100%
rename from includes/templates/legacy.mustache
rename to includes/templates/skin-legacy.mustache
diff --git a/includes/templates/index.mustache b/includes/templates/skin.mustache
similarity index 100%
rename from includes/templates/index.mustache
rename to includes/templates/skin.mustache
diff --git a/resources/skins.vector.js/index.js b/resources/skins.vector.js/skin.js
similarity index 100%
rename from resources/skins.vector.js/index.js
rename to resources/skins.vector.js/skin.js
diff --git a/resources/skins.vector.legacy.js/index.js b/resources/skins.vector.legacy.js/skin-legacy.js
similarity index 100%
rename from resources/skins.vector.legacy.js/index.js
rename to resources/skins.vector.legacy.js/skin-legacy.js
diff --git a/resources/skins.vector.styles/common/print.less b/resources/skins.vector.styles/common/print.less
index c462659..d0dce65 100644
--- a/resources/skins.vector.styles/common/print.less
+++ b/resources/skins.vector.styles/common/print.less
@@ -6,7 +6,7 @@
 	@border-color-base: @wmui-color-base0;
 	@border-color-footer: #eee;
 
-	/* These styles retain the existing typography in index.less
+	/* These styles retain the existing typography in skin.less
 	In future (when deploying these styles) we may want to refactor skins.vector.styles
 	to apply certain styles in print as well as screen mode. */
 	.toc,
diff --git a/resources/skins.vector.styles/legacy.less b/resources/skins.vector.styles/skin-legacy.less
similarity index 100%
rename from resources/skins.vector.styles/legacy.less
rename to resources/skins.vector.styles/skin-legacy.less
diff --git a/resources/skins.vector.styles/index.less b/resources/skins.vector.styles/skin.less
similarity index 100%
rename from resources/skins.vector.styles/index.less
rename to resources/skins.vector.styles/skin.less
diff --git a/skin.json b/skin.json
index 8c68db7..db6208a 100644
--- a/skin.json
+++ b/skin.json
@@ -47,7 +47,7 @@
 				"desktop",
 				"mobile"
 			],
-			"styles": [ "resources/skins.vector.styles/legacy.less" ]
+			"styles": [ "resources/skins.vector.styles/skin-legacy.less" ]
 		},
 		"skins.vector.styles": {
 			"class": "ResourceLoaderSkinModule",
@@ -56,7 +56,7 @@
 				"desktop",
 				"mobile"
 			],
-			"styles": [ "resources/skins.vector.styles/index.less" ]
+			"styles": [ "resources/skins.vector.styles/skin.less" ]
 		},
 		"skins.vector.icons": {
 			"class": "ResourceLoaderImageModule",
@@ -76,7 +76,7 @@
 		},
 		"skins.vector.js": {
 			"packageFiles": [
-				"resources/skins.vector.js/index.js",
+				"resources/skins.vector.js/skin.js",
 				"resources/skins.vector.legacy.js/collapsibleTabs.js",
 				"resources/skins.vector.legacy.js/vector.js"
 			],
@@ -87,7 +87,7 @@
 		},
 		"skins.vector.legacy.js": {
 			"packageFiles": [
-				"resources/skins.vector.legacy.js/index.js",
+				"resources/skins.vector.legacy.js/skin-legacy.js",
 				"resources/skins.vector.legacy.js/collapsibleTabs.js",
 				"resources/skins.vector.legacy.js/vector.js"
 			],
diff --git a/stories/legacy.stories.js b/stories/legacy.stories.js
index 9b4d41f..bcb81db 100644
--- a/stories/legacy.stories.js
+++ b/stories/legacy.stories.js
@@ -1,6 +1,6 @@
 import mustache from 'mustache';
-import '../resources/skins.vector.styles/legacy.less';
-import legacySkinTemplate from '!!raw-loader!../includes/templates/legacy.mustache';
+import '../resources/skins.vector.styles/skin-legacy.less';
+import legacySkinTemplate from '!!raw-loader!../includes/templates/skin-legacy.mustache';
 import {
 	LEGACY_TEMPLATE_DATA,
 	NAVIGATION_TEMPLATE_DATA,