Skip to content

Commit

Permalink
Merge branch 'master' into hanli/rfc-deprecate-prototype-extensions
Browse files Browse the repository at this point in the history
  • Loading branch information
smilland authored Sep 22, 2022
2 parents b49ddc3 + d0752d4 commit 65da28b
Show file tree
Hide file tree
Showing 229 changed files with 7,525 additions and 1,746 deletions.
54 changes: 6 additions & 48 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,61 +9,19 @@ jobs:
lint-frontmatter:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Checkout tools repo
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: emberjs/rfcs-tooling
path: rfcs-tooling
ref: 'v1.1.0'

- uses: actions/setup-node@v2.1.2
- uses: actions/setup-node@v3

- run: yarn install
working-directory: rfcs-tooling

- name: Lint the frontmatter of all RFCs for informational purposes
run: node lint-rfc-frontmatter.js ../text/*.md || true # Don't want to fail on old RFCs just yet
working-directory: rfcs-tooling

- name: Get Changed Files
uses: lots0logs/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Filter Added Files to added RFCs
id: files
run: |
added_files=`jq -r '[.[] | select(startswith("text/"))] | join(" ")' ${HOME}/files_added.json`
echo "::set-output name=added::$added_files"
- name: Lint added RFCs frontmatter
if: ${{ steps.files.outputs.added }}
run: |
node rfcs-tooling/lint-rfc-frontmatter.js ${{ steps.files.outputs.added }}
validate-mdbook:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2

- name: Setup mdBook
uses: peaceiris/actions-mdbook@v1
with:
mdbook-version: "0.4.15"

- name: "[mdBook] Prepare files"
run: |
if [ ! -d src ]; then
mkdir src
fi
echo "[Introduction](introduction.md)\n" > src/SUMMARY.md
for f in $(ls text/* | sort)
do
echo "- [$(basename $f ".md")]($(basename $f))" >> src/SUMMARY.md
cp $f src
done
cp README.md src/introduction.md
- name: "[mdBook] Build mdBook"
run: mdbook build
- name: Lint the frontmatter of all RFCs
run: node ./rfcs-tooling/lint-rfc-frontmatter.js text/*.md
38 changes: 0 additions & 38 deletions .github/workflows/github-pages.yml

This file was deleted.

36 changes: 22 additions & 14 deletions 0000-template.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,31 @@
---
Stage: Accepted
Start Date:
Release Date: Unreleased
Release Versions:
ember-source: vX.Y.Z
ember-data: vX.Y.Z
Relevant Team(s):
RFC PR:
stage: accepted
start-date:
release-date:
release-versions:
teams: # delete teams that aren't relevant
- cli
- data
- framework
- learning
- steering
- typescript
prs:
accepted: # update this to the PR that you propose your RFC in
project-link:
---

<!---
Directions for above:
Stage: Leave as is
Start Date: Fill in with today's date, YYYY-MM-DD
Release Date: Leave as is
Release Versions: Leave as is
Relevant Team(s): Fill this in with the [team(s)](README.md#relevant-teams) to which this RFC applies
RFC PR: Fill this in with the URL for the Proposal RFC PR
stage: Leave as is
start-date: Fill in with today's date, 2032-12-01T00:00:00.000Z
release-date: Leave as is
release-versions: Leave as is
teams: Include only the [team(s)](README.md#relevant-teams) for which this RFC applies
prs:
accepted: Fill this in with the URL for the Proposal RFC PR
project-link: Leave as is
-->

# <RFC title>
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ consistent and controlled path for new features to enter the framework.

[Active RFC List](https://github.com/emberjs/rfcs/pulls)

[Approved RFC List](https://emberjs.github.io/rfcs/)

## When you need to follow this process

You need to follow this process if you intend to make "substantial"
Expand Down
2 changes: 0 additions & 2 deletions book.toml

This file was deleted.

44 changes: 26 additions & 18 deletions deprecation-template.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,31 @@
---
Stage: Accepted
Start Date:
Release Date: Unreleased
Release Versions:
ember-source: vX.Y.Z
ember-data: vX.Y.Z
Relevant Team(s):
RFC PR:
stage: accepted
start-date:
release-date:
release-versions:
teams: # delete teams that aren't relevant
- cli
- data
- framework
- learning
- steering
- typescript
prs:
accepted: # update this to the PR that you propose your RFC in
project-link:
---

<!---
Directions for above:
Stage: Leave as is
Start Date: Fill in with today's date, YYYY-MM-DD
Release Date: Leave as is
Release Versions: Leave as is
Relevant Team(s): Fill this in with the [team(s)](README.md#relevant-teams) to which this RFC applies
RFC PR: Fill this in with the URL for the Proposal RFC PR
<!---
Directions for above:
stage: Leave as is
start-date: Fill in with today's date, 2032-12-01T00:00:00.000Z
release-date: Leave as is
release-versions: Leave as is
teams: Include only the [team(s)](README.md#relevant-teams) for which this RFC applies
prs:
accepted: Fill this in with the URL for the Proposal RFC PR
project-link: Leave as is
-->

# <RFC title>
Expand Down Expand Up @@ -46,7 +54,7 @@ re-organized or altered? Does it change how Ember is taught to new users
at any level?
Does it mean we need to put effort into highlighting the replacement
functionality more? What should we do about documentation, in the guides
related to this feature?
related to this feature?
How should this deprecation be introduced and explained to existing Ember
users?

Expand Down
19 changes: 0 additions & 19 deletions generate-book.sh

This file was deleted.

4 changes: 4 additions & 0 deletions stages/accepted.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
name: Accepted
order: 5
---
4 changes: 4 additions & 0 deletions stages/closed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
name: Closed
order: 10
---
4 changes: 4 additions & 0 deletions stages/discontinued.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
name: Discontinued
order: 11
---
4 changes: 4 additions & 0 deletions stages/exploring.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
name: Exploring
order: 1
---
4 changes: 4 additions & 0 deletions stages/proposed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
name: Proposed
order: 0
---
4 changes: 4 additions & 0 deletions stages/ready-for-release.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
name: Ready For Release
order: 6
---
4 changes: 4 additions & 0 deletions stages/recommended.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
name: Recommended
order: 8
---
4 changes: 4 additions & 0 deletions stages/released.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
name: Released
order: 7
---
3 changes: 3 additions & 0 deletions teams/cli.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
name: CLI
---
3 changes: 3 additions & 0 deletions teams/data.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
name: Data
---
3 changes: 3 additions & 0 deletions teams/framework.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
name: Framework
---
3 changes: 3 additions & 0 deletions teams/learning.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
name: Learning
---
3 changes: 3 additions & 0 deletions teams/steering.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
name: Steering
---
3 changes: 3 additions & 0 deletions teams/typescript.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
name: TypeScript
---
23 changes: 16 additions & 7 deletions text/0001-transform-attribute-meta-parameter.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
---
Start Date: 2014-08-14
RFC PR: https://github.com/emberjs/rfcs/pull/1
Ember Issue: https://github.com/emberjs/data/pull/4086

stage: released
start-date: 2014-08-14T00:00:00.000Z
release-date: 2016-05-03T00:00:00.000Z
release-versions:
ember-data: v2.5.0

teams:
- data
prs:
accepted: https://github.com/emberjs/rfcs/pull/1
project-link:
meta:
ember-issue: https://github.com/emberjs/data/pull/4086
---

# Summary

For Ember Data. Pass through attribute meta data, which includes `parentType`, `options`, `name`, etc.,
to the transform associated with that attribute. This will allow provide the following function signiture updates to `DS.Transform`:
to the transform associated with that attribute. This will allow provide the following function signiture updates to `DS.Transform`:

* `transform.serialize(deserialized, attributeMeta)`
* `transform.deserialize(serialized, attributeMeta)`
Expand Down Expand Up @@ -66,10 +75,10 @@ App.MarkdownTransform = DS.Transform.extend({
serialize: function (deserialized, attributeMeta) {
return deserialized.raw;
},

deserialize: function (serialized, attributeMeta) {
var options = attributeMeta.options.markdown || {};

return marked(serialized, options);
}
});
Expand Down
23 changes: 16 additions & 7 deletions text/0003-block-params.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
---
Start Date: 2014-08-18
RFC PR: https://github.com/emberjs/rfcs/pull/3
Issues:
Ember Stream support: emberjs/ember.js#5522
Handlebars parser support: wycats/handlebars.js#906
HTMLBars compiler support: tildeio/htmlbars#147

stage: recommended
start-date: 2014-08-18T00:00:00.000Z
release-date: 2015-02-07T00:00:00.000Z
release-versions:
ember-source: v1.10.0

teams:
- framework
prs:
accepted: https://github.com/emberjs/rfcs/pull/3
project-link:
meta:
issues:
Ember Stream support: emberjs/ember.js#5522
Handlebars parser support: wycats/handlebars.js#906
HTMLBars compiler support: tildeio/htmlbars#147
---

# Summary
Expand Down
13 changes: 9 additions & 4 deletions text/0003-cli-ember-doctor.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
---
Start Date: 2015-01-10
Relevant Team(s): Ember CLI
RFC PR: https://github.com/ember-cli/rfcs/pull/3

stage: accepted
start-date: 2015-01-10T00:00:00.000Z
release-date:
release-versions:
teams:
- cli
prs:
accepted: https://github.com/ember-cli/rfcs/pull/3
project-link:
---

# Summary
Expand Down
Loading

0 comments on commit 65da28b

Please sign in to comment.