Merge branch 'main' into repo-sync

Octomerger · web-flow · commit c923ec409624 · 2021-08-18T10:23:16.000+10:00
diff --git a/lib/enterprise-server-releases.js b/lib/enterprise-server-releases.js
@@ -12,8 +12,9 @@ export const dates = JSON.parse(
 // Some frontmatter may contain the upcoming GHES release number
 export const next = '3.2'
 
-export const supported = ['3.1', '3.0', '2.22', '2.21']
+export const supported = ['3.1', '3.0', '2.22']
 export const deprecated = [
+  '2.21',
   '2.20',
   '2.19',
   '2.18',
diff --git a/lib/patterns.js b/lib/patterns.js
@@ -29,7 +29,7 @@ export const dataReference = /{% ?data\s(?:early-access\.)?(?:reusables|variable
 export const imagePath = /\/?assets\/images\/.*?\.(png|svg|gif|pdf|ico|jpg|jpeg)/gi
 export const homepagePath = /^\/\w{2}$/ // /en, /ja /cn
 export const multipleSlashes = /^\/{2,}/
-export const assetPaths = /\/(?:javascripts|stylesheets|assets|node_modules|dist)\//
+export const assetPaths = /\/(?:javascripts|stylesheets|assets|node_modules|dist|_next)\//
 export const oldApiPath = /\/v[34]\/(?!guides|overview).+?\/.+/
 export const staticRedirect = /<link rel="canonical" href="(.+?)">/
 export const enterpriseNoVersion = /\/enterprise\/([^\d].*$)/
diff --git a/script/enterprise-server-deprecations/archive-version.js b/script/enterprise-server-deprecations/archive-version.js
@@ -65,7 +65,7 @@ class RewriteAssetPathsPlugin {
       // https://githubdocs.azureedge.net/github-images/enterprise/2.17/assets/images/foo/bar.png
       if (resource.isHtml()) {
         newBody = text.replace(
-          /(?<attribute>src|href)="(?:\.\.\/)*(?<basepath>dist|javascripts|stylesheets|assets\/fonts|assets\/images|node_modules)/g,
+          /(?<attribute>src|href)="(?:\.\.\/)*(?<basepath>_next\/static|javascripts|stylesheets|assets\/fonts|assets\/images|node_modules)/g,
           (match, attribute, basepath) => {
             let replaced = path.join('/enterprise', this.version, basepath)
             if (basepath === 'assets/images') {
diff --git a/tests/linting/lint-files.js b/tests/linting/lint-files.js
@@ -19,7 +19,7 @@ import renderContent from '../../lib/render-content/index.js'
 import getApplicableVersions from '../../lib/get-applicable-versions.js'
 import { execSync } from 'child_process'
 import { allVersions } from '../../lib/all-versions.js'
-import { supported, next } from '../../lib/enterprise-server-releases.js'
+import { supported, next, deprecated } from '../../lib/enterprise-server-releases.js'
 import { getLiquidConditionals } from '../../script/helpers/get-liquid-conditionals.js'
 import allowedVersionOperators from '../../lib/liquid-tags/ifversion-supported-operators.js'
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
@@ -1102,10 +1102,12 @@ function validateIfversionConditionals(conds) {
             `Found a "${operator}" operator inside "${cond}", but "${operator}" is not supported`
           )
         }
-        // NOTE: The following will throw errors when we deprecate a version until we run the script to remove the
-        // deprecated versioning. If we deprecate a version before we have a working version of that script,
-        // we can comment out this part of the test temporarily and re-enable it once the script is ready.
-        if (!(supported.includes(release) || release === next)) {
+        // Check that the versions in conditionals are supported
+        // versions of GHES or the first deprecated version. Allowing
+        // the first deprecated version to exist in code ensures
+        // allows us to deprecate the version before removing
+        // the old liquid content.
+        if (!(supported.includes(release) || release === next || deprecated[0] === release)) {
           errors.push(
             `Found ${release} inside "${cond}", but ${release} is not a supported GHES release`
           )
