Merge branch 'main' into move-content-guide

mdn · Jan 28, 2025 · dd2b081 · dd2b081
2 parents 8b70235 + b8cc989
commit dd2b081
Show file tree

Hide file tree

Showing 30 changed files with 1,018 additions and 360 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -8,41 +8,36 @@
 # Default content owners
 /files/en-us/ @mdn/yari-content-mdn
 
+# MDN Firefox release notes
+/files/en-us/mozilla/ @mdn/core-yari-content
+
+# Mozilla Add-ons
+/files/en-us/mozilla/add-ons/ @mdn/yari-content-mozilla-add-ons
+
 # Accessibility
 /files/en-us/web/accessibility/ @mdn/yari-content-accessibility
-/files/en-us/learn/accessibility/ @mdn/yari-content-accessibility
+
+# Web API
+/files/en-us/web/api/ @mdn/yari-content-web-api
 
 # CSS
 /files/en-us/web/css/ @mdn/yari-content-css
-/files/en-us/learn/css/ @mdn/yari-content-css
 
 # HTML
 /files/en-us/web/html/ @mdn/yari-content-html
-/files/en-us/learn/html/ @mdn/yari-content-html
-
-# JavaScript
-/files/en-us/web/javascript/ @mdn/yari-content-javascript
-/files/en-us/learn/javascript/ @mdn/yari-content-javascript
 
 # HTTP
 /files/en-us/web/http/ @mdn/yari-content-http
-/files/en-us/learn/server-side/ @mdn/yari-content-http
 
-# Web API
-/files/en-us/web/api/ @mdn/yari-content-web-api
-
-# Mozilla Add-ons
-/files/en-us/mozilla/add-ons/ @mdn/yari-content-mozilla-add-ons
+# JavaScript
+/files/en-us/web/javascript/ @mdn/yari-content-javascript
 
 # MathML
 /files/en-us/web/mathml/ @mdn/content-mathml
 
-# MDN Firefox Release Notes
-/files/en-us/mozilla/firefox @mdn/core-yari-content
-
-# New templates and sidebars
+# Templates and sidebars (rari)
 /files/jsondata/L10n-Template.json @mdn/core-dev
-/files/sidebars @mdn/core-dev
+/files/sidebars/ @mdn/core-dev
 
 # ============================= CONTROL FILES ============================= #
 # The CODEOWNERS file must end with these matches: Any pull request changing

diff --git a/.github/issue-regex-labeler.yml b/.github/issue-regex-labeler.yml
@@ -19,27 +19,29 @@ Content:HTTP:
 Content:JS:
   - '\/docs\/Web\/JavaScript'
 Content:Learn:
-  - '\/docs\/Learn\/(Common|Front|Getting|Learning|Performance)'
-Content:Learn:Accessibility:
-  - '\/docs\/Learn\/Accessibility'
-Content:Learn:Client-side:
-  - '\/docs\/Learn\/Tools_and_testing\/(Client-side|Understanding_client-side)'
-Content:Learn:Cross-Browser-Testing:
-  - '\/docs\/Learn\/Tools_and_testing\/Cross_browser_testing'
-Content:Learn:CSS:
-  - '\/docs\/Learn\/CSS'
-Content:Learn:Django:
-  - '\/docs\/Learn\/Server-side\/Django'
-Content:Learn:Express:
-  - '\/docs\/Learn\/Server-side\/Express_Nodejs'
-Content:Learn:Forms:
-  - '\/docs\/Learn\/Forms'
-Content:Learn:GitHub:
-  - '\/docs\/Learn\/Tools_and_testing\/GitHub'
-Content:Learn:HTML:
-  - '\/docs\/Learn\/HTML'
-Content:Learn:JavaScript:
-  - '\/docs\/Learn\/JavaScript'
+  - '\/docs\/Learn_web_development\/'
+# Mapping for old directories, see https://github.com/mdn/content/pull/36967
+#
+# Content:Learn:Accessibility:
+#   - '\/docs\/Learn\/Accessibility'
+# Content:Learn:Client-side:
+#   - '\/docs\/Learn\/Tools_and_testing\/(Client-side|Understanding_client-side)'
+# Content:Learn:Cross-Browser-Testing:
+#   - '\/docs\/Learn\/Tools_and_testing\/Cross_browser_testing'
+# Content:Learn:CSS:
+#   - '\/docs\/Learn\/CSS'
+# Content:Learn:Django:
+#   - '\/docs\/Learn\/Server-side\/Django'
+# Content:Learn:Express:
+#   - '\/docs\/Learn\/Server-side\/Express_Nodejs'
+# Content:Learn:Forms:
+#   - '\/docs\/Learn\/Forms'
+# Content:Learn:GitHub:
+#   - '\/docs\/Learn\/Tools_and_testing\/GitHub'
+# Content:Learn:HTML:
+#   - '\/docs\/Learn\/HTML'
+# Content:Learn:JavaScript:
+#   - '\/docs\/Learn\/JavaScript'
 Content:Manifest:
   - '\/docs\/Web\/Manifest'
 Content:MathML:

diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -57,62 +57,53 @@ Content:JS:
 Content:Learn:
   - changed-files:
       - all-globs-to-any-file:
-          - files/en-us/learn/**
-          - "!files/en-us/learn/accessibility/**"
-          - "!files/en-us/learn/tools_and_testing/client-side_javascript_frameworks/**"
-          - "!files/en-us/learn/tools_and_testing/understanding_client-side_tools/**"
-          - "!files/en-us/learn/tools_and_testing/cross_browser_testing/**"
-          - "!files/en-us/learn/css/**"
-          - "!files/en-us/learn/server-side/django/**"
-          - "!files/en-us/learn/server-side/express_nodejs/**"
-          - "!files/en-us/learn/forms/**"
-          - "!files/en-us/learn/tools_and_testing/github/**"
-          - "!files/en-us/learn/html/**"
-          - "!files/en-us/learn/javascript/**"
+          - files/en-us/learn_web_development/**
   - changed-files:
       - any-glob-to-any-file:
           - files/en-us/web/tutorials/**
-Content:Learn:Accessibility:
-  - changed-files:
-      - any-glob-to-any-file:
-          - files/en-us/learn/accessibility/**
-Content:Learn:Client-side:
-  - changed-files:
-      - any-glob-to-any-file:
-          - files/en-us/learn/tools_and_testing/client-side_javascript_frameworks/**
-          - files/en-us/learn/tools_and_testing/understanding_client-side_tools/**
-Content:Learn:Cross-Browser-Testing:
-  - changed-files:
-      - any-glob-to-any-file:
-          - files/en-us/learn/tools_and_testing/cross_browser_testing/**
-Content:Learn:CSS:
-  - changed-files:
-      - any-glob-to-any-file:
-          - files/en-us/learn/css/**
-Content:Learn:Django:
-  - changed-files:
-      - any-glob-to-any-file:
-          - files/en-us/learn/server-side/django/**
-Content:Learn:Express:
-  - changed-files:
-      - any-glob-to-any-file:
-          - files/en-us/learn/server-side/express_nodejs/**
-Content:Learn:Forms:
-  - changed-files:
-      - any-glob-to-any-file:
-          - files/en-us/learn/forms/**
-Content:Learn:GitHub:
-  - changed-files:
-      - any-glob-to-any-file:
-          - files/en-us/learn/tools_and_testing/github/**
-Content:Learn:HTML:
-  - changed-files:
-      - any-glob-to-any-file:
-          - files/en-us/learn/html/**
-Content:Learn:JavaScript:
-  - changed-files:
-      - any-glob-to-any-file:
-          - files/en-us/learn/javascript/**
+# Mapping for old directories, see https://github.com/mdn/content/pull/36967
+#
+# Content:Learn:Accessibility:
+#   - changed-files:
+#       - any-glob-to-any-file:
+#           - files/en-us/learn/accessibility/**
+# Content:Learn:Client-side:
+#   - changed-files:
+#       - any-glob-to-any-file:
+#           - files/en-us/learn/tools_and_testing/client-side_javascript_frameworks/**
+#           - files/en-us/learn/tools_and_testing/understanding_client-side_tools/**
+# Content:Learn:Cross-Browser-Testing:
+#   - changed-files:
+#       - any-glob-to-any-file:
+#           - files/en-us/learn/tools_and_testing/cross_browser_testing/**
+# Content:Learn:CSS:
+#   - changed-files:
+#       - any-glob-to-any-file:
+#           - files/en-us/learn/css/**
+# Content:Learn:Django:
+#   - changed-files:
+#       - any-glob-to-any-file:
+#           - files/en-us/learn/server-side/django/**
+# Content:Learn:Express:
+#   - changed-files:
+#       - any-glob-to-any-file:
+#           - files/en-us/learn/server-side/express_nodejs/**
+# Content:Learn:Forms:
+#   - changed-files:
+#       - any-glob-to-any-file:
+#           - files/en-us/learn/forms/**
+# Content:Learn:GitHub:
+#   - changed-files:
+#       - any-glob-to-any-file:
+#           - files/en-us/learn/tools_and_testing/github/**
+# Content:Learn:HTML:
+#   - changed-files:
+#       - any-glob-to-any-file:
+#           - files/en-us/learn/html/**
+# Content:Learn:JavaScript:
+#   - changed-files:
+#       - any-glob-to-any-file:
+#           - files/en-us/learn/javascript/**
 Content:Manifest:
   - changed-files:
       - any-glob-to-any-file:
@@ -170,7 +161,6 @@ Content:Other:
   - changed-files:
       - any-glob-to-any-file:
           - files/en-us/related/**
-          - files/en-us/web/demos/**
           - files/en-us/web/exslt/**
           - files/en-us/web/opensearch/**
           - files/en-us/web/privacy/**

diff --git a/.lintstagedrc.js b/.lintstagedrc.js
@@ -1,7 +1,7 @@
 export default {
   "files/en-us/_redirects.txt": (filenames) => [
-    `yarn content fix-redirects en-US`,
-    `yarn content validate-redirects en-us --strict`,
+    `yarn content fix-redirects`,
+    `yarn content:legacy validate-redirects en-us --strict`,
   ],
   "!*.md": (filenames) => [
     `prettier --ignore-unknown --write ${filenames.join(" ")}`,