Changeset 10677

Timestamp:

02/16/2021 07:01:53 AM (4 years ago)

Author:

dd32

Message:

Trac: Allow for the s.w.org CDN to be bypassed and have requests go to wordpress.org to test style changes in production.

Location:

sites/trunk/trac.wordpress.org/templates

Files:

• site.html (modified) (5 diffs)
• wporg-head.html (modified) (1 diff)

sites/trunk/trac.wordpress.org/templates/site.html

@@ -53 +53 @@
     ticket_preview.html (as site.html isn't) -->
 <xi:include href="site-ticket.html" />
-
-<!--! Append a version string to CSS files hosted on the w.org CDN -->
-<py:match path="link[@rel='stylesheet' and starts-with(@href,'https://s.w.org/') and substring-after(@href,'.css') = '']">
-    <link rel="stylesheet" href="${select('@href')}?v=${scripts_version}" />
-</py:match>
 
 <!--! Styles and such. Load before first JS file (jquery.js) -->
@@ -74 +69 @@
     <xi:include href="wporg-head.html" />
     <meta name="viewport" content="width=device-width" />
-    <link rel='stylesheet' href='https://s.w.org/wp-includes/css/dashicons.min.css?20150710' type='text/css' />
+    <link rel='stylesheet' href='https://s.w.org/wp-includes/css/dashicons.min.css?${scripts_version}' type='text/css' />
     <link rel="stylesheet" type="text/css" href="https://s.w.org/style/trac/wp-trac.css?${scripts_version}" />
-    <link py:if="req.session['authenticated']" rel="stylesheet" href="https://s.w.org/wp-includes/css/wp-auth-check.css?ver=3.9-alpha" type="text/css" media="all" />
+    <link py:if="req.session['authenticated']" rel="stylesheet" href="https://s.w.org/wp-includes/css/wp-auth-check.css?${scripts_version}" type="text/css" media="all" />
 
     <script py:attrs="select('@*')"></script>
@@ -96 +91 @@
         <meta name="robots" content="$robots"/>
     </py:if>
-</py:match>
-
-<!--! Append a version string to JS files hosted on the w.org CDN -->
-<py:match path="script[starts-with(@src,'https://s.w.org/') and substring-after(@src,'.js') = '']">
-    <script src="${select('@src')}?v=${scripts_version}">${select('*|comment()|text()')}</script>
 </py:match>
 
@@ -330 +320 @@
 
     <!--! JavaScript -->
-    <script src="https://s.w.org/style/js/navigation.min.js?20190128"></script>
-    <script src="https://s.w.org/style/trac/jquery.caret.min.js?ver=2015-02-01"></script>
-    <script src="https://s.w.org/style/trac/jquery.atwho.min.js?ver=1.0.1"></script>
+    <script src="https://s.w.org/style/js/navigation.min.js?${scripts_version}"></script>
+    <script src="https://s.w.org/style/trac/jquery.caret.min.js?${scripts_version}"></script>
+    <script src="https://s.w.org/style/trac/jquery.atwho.min.js?${scripts_version}"></script>
     <script src="https://s.w.org/style/trac/wp-trac.js?${scripts_version}"></script>
 
@@ -380 +370 @@
 
 <xi:include href="site-specific.html"><xi:fallback /></xi:include>
+
+<!--! The following rules should be just before `</html>` to ensure it affects all of the document. -->
+
+<!--! Append a version string to CSS files hosted on the w.org CDN -->
+<py:match path="link[@rel='stylesheet' and starts-with(@href,'https://s.w.org/') and substring-after(@href,'.css') = '']">
+    <link rel="stylesheet" href="${select('@href')}?v=${scripts_version}" />
+</py:match>
+
+<!--! Append a version string to JS files hosted on the w.org CDN -->
+<py:match path="script[starts-with(@src,'https://s.w.org/') and substring-after(@src,'.js') = '']">
+    <script src="${select('@src')}?v=${scripts_version}">${select('*|comment()|text()')}</script>
+</py:match>
+
+<!--! Allow bypassing the WordPress.org CDN for testing. -->
+<py:if test="'cdn' in req.args and 'wordpress.org' == req.args.cdn">
+    <py:match path="link[@rel='stylesheet' and starts-with(@href,'https://s.w.org/')]">
+        <link rel="stylesheet" href="${select('@href').render().replace('s.w.org','wordpress.org')}" />
+    </py:match>
+    <py:match path="script[starts-with(@src,'https://s.w.org/')]">
+        <script src="${select('@src').render().replace('s.w.org','wordpress.org')}">${select('*|comment()|text()')}</script>
+    </py:match>
+</py:if>
+
 </html>

sites/trunk/trac.wordpress.org/templates/wporg-head.html

@@ -24 +24 @@
     </style>
     <link href='https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,400,300,600&amp;subset=latin,cyrillic-ext,greek-ext,greek,vietnamese,latin-ext,cyrillic' rel='stylesheet' type='text/css' />
-    <link rel="stylesheet" href="https://s.w.org/style/wp4.css?80" />
+    <link rel="stylesheet" href="https://s.w.org/style/wp4.css" />
     <!--[if lte IE 8]>
     <style type="text/css">