Merge branch 'master' into advance-rfc-0774

Author: ef4

.github/actions/setup-rfcs-tooling/action.yml

@@ -9,7 +9,7 @@ runs:
       with:
         repository: emberjs/rfcs-tooling
         path: rfcs-tooling
-        ref: 'v2.1.1'
+        ref: 'v3.0.0'
 
     - uses: actions/setup-node@v3
       with:

.github/workflows/advance-rfc.yml

@@ -55,7 +55,7 @@ jobs:
             echo "A new RFC was added"        
             echo "value=true" >> $GITHUB_OUTPUT
           else
-            node rfcs-tooling/has-stage-changed.js ${{ github.event.before }} ${{ steps.rfcs.outputs.modified-rfc }}
+            node rfcs-tooling/scripts/has-stage-changed.mjs ${{ github.event.before }} ${{ steps.rfcs.outputs.modified-rfc }}
             if [[ $? == 0 ]]; then
               echo "## Yes, stage has changed" >> $GITHUB_STEP_SUMMARY
               echo "value=true" >> $GITHUB_OUTPUT
@@ -69,7 +69,7 @@ jobs:
         if: steps.has-stage-changed.outputs.value == 'true'
         id: new-stage
         run: |
-          new_stage=`node rfcs-tooling/find-next-stage.js ${{ steps.rfcs.outputs.modified-rfc }}`
+          new_stage=`node rfcs-tooling/scripts/find-next-stage.mjs ${{ steps.rfcs.outputs.modified-rfc }}`
           echo "New Stage: $new_stage"
           echo "value=$new_stage" >> $GITHUB_OUTPUT
 

.github/workflows/ci.yml

@@ -15,4 +15,4 @@ jobs:
         uses: ./.github/actions/setup-rfcs-tooling
 
       - name: Lint the frontmatter of all RFCs
-        run: node ./rfcs-tooling/lint-rfc-frontmatter.js text/*.md
+        run: node ./rfcs-tooling/scripts/lint-rfc-frontmatter.mjs text/*.md

.github/workflows/generate-rfc-frontmatter-json.yml

@@ -18,7 +18,7 @@ jobs:
 
       - name: Generate frontmatter data file
         run: |
-          node rfcs-tooling/list-frontmatter.js text/*.md > rfc-data.json
+          node rfcs-tooling/scripts/list-frontmatter.mjs text/*.md > rfc-data.json
 
       - uses: actions/upload-artifact@v3
         with:

.github/workflows/newly-added-rfcs.yml

@@ -92,7 +92,7 @@ jobs:
 
       - name: Verify stage of newly added RFC is `accepted` in frontmatter
         run: |
-          frontmatter=`node rfcs-tooling/rfc-frontmatter.js ${{ needs.check-rfcs.outputs.modified-rfc }}`
+          frontmatter=`node rfcs-tooling/scripts/rfc-frontmatter.mjs ${{ needs.check-rfcs.outputs.modified-rfc }}`
           stage=`echo $frontmatter | jq '.stage'`
           if [[ $stage != '"accepted"' ]]; then
               echo "::error::Newly added RFCs must have the stage 'accepted' in the frontmatter"
@@ -113,8 +113,7 @@ jobs:
       - name: Test RFC Filename matches PR Number that adds it
         env:
           PR_NUMBER: ${{ github.event.pull_request.number }}
-        run: node check-filename-matches-pr.js $PR_NUMBER ${{ needs.check-rfcs.outputs.modified-rfc }}
-        working-directory: rfcs-tooling
+        run: node rfcs-tooling/scripts/check-filename-matches-pr.mjs $PR_NUMBER ${{ needs.check-rfcs.outputs.modified-rfc }}
 
   check-accepted-pr-url:
     name: Verify Accepted PR URL is correct
@@ -129,7 +128,7 @@ jobs:
 
       - name: Verify Accepted PR URL is correct
         run: |
-          frontmatter=`node rfcs-tooling/rfc-frontmatter.js ${{ needs.check-rfcs.outputs.modified-rfc }}`
+          frontmatter=`node rfcs-tooling/scripts/rfc-frontmatter.mjs ${{ needs.check-rfcs.outputs.modified-rfc }}`
           accepted_pr=`echo $frontmatter | jq '.prs.accepted'`
           accepted_pr=${accepted_pr//\"/}
           expected_pr="${{ github.event.pull_request.html_url }}"

.github/workflows/open-advancement-pr.yml

@@ -28,16 +28,17 @@ jobs:
 
       - name: Update frontmatter
         run: |
-          node rfcs-tooling/update-rfc-stage.js ${{ inputs.new-stage }} ${{ inputs.rfc-path }}
+          node rfcs-tooling/scripts/update-rfc-stage.mjs ${{ inputs.new-stage }} ${{ inputs.rfc-path }}
 
       - name: Set variables for use in PR
         id: pr-variables
         run: |
-          frontmatter=`node rfcs-tooling/rfc-frontmatter.js ${{ inputs.rfc-path }}`
+          frontmatter=`node rfcs-tooling/scripts/rfc-frontmatter.mjs ${{ inputs.rfc-path }}`
           ready_for_release_pr=`echo $frontmatter | jq '.prs."ready-for-release"'`
           ready_for_release_pr=${ready_for_release_pr//\"/}
           released_pr=`echo $frontmatter | jq '.prs.released'`
           released_pr=${released_pr//\"/}
+          title=`echo $frontmatter | jq '.title'`
           if [[ ${{ inputs.new-stage }} == "ready-for-release" ]]; then
             pretty_stage="Ready for Release"
             template=`sed -e 's/__RFC_NUMBER__/${{ inputs.rfc-number }}/g' .github/PULL_REQUEST_TEMPLATE/advance-to-ready-for-release.md`  
@@ -53,23 +54,24 @@ jobs:
           echo 'EOF' >> $GITHUB_OUTPUT     
           echo "Pretty Stage: $pretty_stage"
           echo "pretty-stage=$pretty_stage" >> $GITHUB_OUTPUT
+          echo "title=$title" >> $GITHUB_OUTPUT
 
       - name: Open PR
         id: create-pr
         uses: peter-evans/create-pull-request@v4.2.0
         with:
           token: ${{ secrets.personal-access-token }}
-          commit-message: "Advance RFC to Stage ${{ inputs.new-stage }}"
+          commit-message: "Advance RFC {{ inputs.rfc-number }} to Stage ${{ inputs.new-stage }}"
           add-paths: 'text'
           branch: "advance-rfc-${{ inputs.rfc-number }}"
-          title: "Advance RFC #${{ inputs.rfc-number}} to Stage ${{ steps.pr-variables.outputs.pretty-stage }}"
+          title: "Advance RFC #${{ inputs.rfc-number}} `${{ steps.pr-variables.outputs.title }}` to Stage ${{ steps.pr-variables.outputs.pretty-stage }}"
           body: "${{ steps.pr-variables.outputs.body }}"
           labels: "RFC Advancement,S-${{ steps.pr-variables.outputs.pretty-stage}}"
           draft: true
 
       - name: Add new PR link to RFC frontmatter
         run: |
-          node rfcs-tooling/update-advancement-pr.js ${{ inputs.rfc-path }} ${{ inputs.new-stage}} ${{ steps.create-pr.outputs.pull-request-url }}
+          node rfcs-tooling/scripts/update-advancement-pr.mjs ${{ inputs.rfc-path }} ${{ inputs.new-stage}} ${{ steps.create-pr.outputs.pull-request-url }}
 
       - name: Update PR
         run: |

.github/workflows/trigger-opening-advancement-pr.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Find new stage
         id: new-stage
         run: |
-          new_stage=`node rfcs-tooling/find-next-stage.js ${{ inputs.rfc-path }}`
+          new_stage=`node rfcs-tooling/scripts/find-next-stage.mjs ${{ inputs.rfc-path }}`
           echo "New Stage: $new_stage"
           echo "value=$new_stage" >> $GITHUB_OUTPUT
 

README.md

@@ -282,7 +282,8 @@ that RFC.
 
 RFCs in [Final Comment Periods](#final-comment-periods-fcp) are labeled with
 [Final Comment Period](https://github.com/emberjs/rfcs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc+label%3A%22Final+Comment+Period%22)
-and are announced on the [Ember twitter account](https://twitter.com/emberjs).
+and are announced in `#news-and-announcements` on [Ember Discord](https://discord.gg/emberjs) and
+on the [Ember twitter account](https://twitter.com/emberjs).
 
 [Quick links](#quick-links-for-pull-requests-for-proposed-and-advancing-rfcs)
 are provided at the top of the README to help you review what you are interested in.
@@ -450,9 +451,9 @@ further guidance.
 
 For certain stage advancements, a _final comment period_ (FCP) is required. This
 is a period lasting 7 days. The beginning of this period will be signaled with a
-comment and tag on the RFC's pull request. Furthermore,
-[Ember's official Twitter account](https://twitter.com/emberjs) will post a
-tweet about the RFC to attract the community's attention.
+comment and tag on the RFC's pull request. Furthermore, a message will be posted in
+`#news-and-announcements` on [Ember Discord](https://discord.gg/emberjs) and on the
+[official Ember Twitter account](https://twitter.com/emberjs) to attract the community's attention.
 
 An RFC can be modified based upon feedback from the [core teams] and community
 during the final comment period. Significant modifications may trigger a new

text/0236-deprecation-ember-string.md

@@ -1,5 +1,5 @@
 ---
-stage: released
+stage: recommended
 start-date: 2017-07-14T00:00:00.000Z
 release-date: 2023-01-12T00:00:00.000Z
 release-versions:
@@ -11,6 +11,7 @@ prs:
   accepted: 'https://github.com/emberjs/rfcs/pull/236'
   ready-for-release: 'https://github.com/emberjs/rfcs/pull/892'
   released: 'https://github.com/emberjs/rfcs/pull/897'
+  recommended: 'https://github.com/emberjs/rfcs/pull/898'
 project-link:
 meta:
   tracking: 'https://github.com/emberjs/ember.js/issues/20340'

text/0331-deprecate-globals-resolver.md

@@ -1,5 +1,5 @@
 ---
-stage: released
+stage: recommended
 start-date: 2018-05-08T00:00:00.000Z
 release-date: 2020-01-20T00:00:00.000Z
 release-versions: