Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.js
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ function fullBuild () {
project: {
versions,
currentVersions: {
stable: latestVersion.stable(versions),
current: latestVersion.current(versions),
lts: latestVersion.lts(versions)
},
banner: {
Expand Down
4 changes: 2 additions & 2 deletions layouts/download-stable.hbs → layouts/download-current.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<h1>{{downloads.headline}}</h1>
</div>

{{> primary-download-matrix version=project.currentVersions.stable versionTypeStable="true"}}
{{> secondary-download-matrix version=project.currentVersions.stable versionTypeStable="true"}}
{{> primary-download-matrix version=project.currentVersions.current versionTypeCurrent="true"}}
{{> secondary-download-matrix version=project.currentVersions.current versionTypeCurrent="true"}}

</article>

Expand Down
14 changes: 7 additions & 7 deletions layouts/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,23 @@

</div>

{{#if project.currentVersions.stable}}
{{#if project.currentVersions.current}}
<div class="home-downloadblock">

<a href="https://nodejs.org/dist/{{ project.currentVersions.stable }}/" class="home-downloadbutton" title="{{ labels.download }} {{ project.currentVersions.stable }} {{ labels.stable }}" data-version="{{ project.currentVersions.stable }}">
{{ project.currentVersions.stable }} {{ labels.stable }}
<small>{{ labels.tagline-stable }}</small>
<a href="https://nodejs.org/dist/{{ project.currentVersions.current }}/" class="home-downloadbutton" title="{{ labels.download }} {{ project.currentVersions.current }} {{ labels.current }}" data-version="{{ project.currentVersions.current }}">
{{ project.currentVersions.current }} {{ labels.current }}
<small>{{ labels.tagline-current }}</small>
</a>

<ul class="list-divider-pipe home-secondary-links">
<li>
<a href="https://nodejs.org/{{site.locale}}/download/stable/">{{ labels.other-downloads }}</a>
<a href="https://nodejs.org/{{site.locale}}/download/current/">{{ labels.other-downloads }}</a>
</li>
<li>
<a href="https://github.com/nodejs/node/blob/{{ project.currentVersions.stable }}/CHANGELOG.md">{{ labels.changelog }}</a>
<a href="https://github.com/nodejs/node/blob/{{ project.currentVersions.current }}/CHANGELOG.md">{{ labels.changelog }}</a>
</li>
<li>
<a href="{{majorapidocslink project.currentVersions.stable}}">{{ labels.api }}</a>
<a href="{{majorapidocslink project.currentVersions.current}}">{{ labels.api }}</a>
</li>
</ul>

Expand Down
6 changes: 3 additions & 3 deletions layouts/partials/primary-download-matrix.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<div class="title">{{downloads.lts}}</div>
<div class="tag">{{downloads.tagline-lts}}</div>
</a>
<a {{#if versionTypeStable}}class="is-version"{{/if}} href="/{{site.locale}}/{{site.download.link}}/stable" title="{{downloads.display-hint}} {{downloads.stable}}">
<div class="title">{{downloads.stable}}</div>
<div class="tag">{{downloads.tagline-stable}}</div>
<a {{#if versionTypeCurrent}}class="is-version"{{/if}} href="/{{site.locale}}/{{site.download.link}}/current" title="{{downloads.display-hint}} {{downloads.current}}">
<div class="title">{{downloads.current}}</div>
<div class="tag">{{downloads.tagline-current}}</div>
</a>
</div>
</li>
Expand Down
4 changes: 2 additions & 2 deletions locale/en/blog/community/node-v5.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ We just released [Node.js v5.0.0](https://nodejs.org/en/blog/release/v5.0.0/). Y

Node.js is growing, and growing fast. As we continue to innovate quickly, we will focus on two different release lines. One release line will fall under our **LTS** plan. All release lines that have LTS support will be even numbers, and (most importantly) focus on stability and security. These release lines are for organizations with complex environments that find it cumbersome to continually upgrade. We recently released the first in this line: [Node.js v4.2.1](https://nodejs.org/en/blog/release/v4.2.1/) “Argon.”

The other release line is called **Stable**. All release lines will be odd numbers, and have a shorter lifespan and more frequent updates to the code. The Stable release line will focus on active development of necessary features and refinement of existing APIs. Node.js version 5 is this type of release.
The other release line is called **Current**. All release lines will be odd numbers, and have a shorter lifespan and more frequent updates to the code. The Current release line will focus on active development of necessary features and refinement of existing APIs. Node.js version 5 is this type of release.

We want to make sure that you are adopting the release that best meets your Node.js needs, so to break it down:

Expand Down Expand Up @@ -47,7 +47,7 @@ First and foremost, if you haven’t read the [Essential Steps: Long Term Suppor

* There will be no more than two active LTS release lines at any given time. Overlap is intended to help ease migration planning.

* Once a Stable release line becomes LTS, no new features or breaking changes will be added to that release. Changes are limited to bug fixes for stability, security updates, possible npm updates, documentation updates and certain performance improvements that can be demonstrated to not break existing applications.
* Once a Current release line becomes LTS, no new features or breaking changes will be added to that release. Changes are limited to bug fixes for stability, security updates, possible npm updates, documentation updates and certain performance improvements that can be demonstrated to not break existing applications.

## Questions?

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
---
layout: download-stable.hbs
layout: download-current.hbs
title: Download
download: Download
downloads:
headline: Downloads
lts: LTS
stable: Stable
tagline-stable: Latest Features
current: Current
tagline-current: Latest Features
tagline-lts: Recommended For Most Users
display-hint: Display downloads for
intro: >
Download the Node.js source code or a pre-built installer for your platform, and start developing today.
currentVersion: Current stable version
currentVersion: Current version
buildDisclaimer: "Note: Python 2.6 or 2.7 is required to build from source tarballs."
additional:
headline: Additional Platforms
Expand Down
4 changes: 2 additions & 2 deletions locale/en/download/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ download: Download
downloads:
headline: Downloads
lts: LTS
stable: Stable
tagline-stable: Latest Features
current: Current
tagline-current: Latest Features
tagline-lts: Recommended For Most Users
display-hint: Display downloads for
intro: >
Expand Down
6 changes: 3 additions & 3 deletions locale/en/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ labels:
download-for: Download for
other-downloads: Other Downloads
other-lts-downloads: Other LTS Downloads
other-stable-downloads: Other Stable Downloads
stable: Stable
other-current-downloads: Other Current Downloads
current: Current
lts: LTS
tagline-stable: Latest Features
tagline-current: Latest Features
tagline-lts: Recommended For Most Users
changelog: Changelog
api: API Docs
Expand Down
2 changes: 1 addition & 1 deletion locale/en/site.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"subtext": "LTS",
"text": "v4.4.2 API"
},
"api-stable": {
"api-current": {
"link": "/dist/latest-v5.x/docs/api",
"text": "v5.10.1 API"
},
Expand Down
6 changes: 3 additions & 3 deletions locale/it/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ labels:
download-for: Download per
other-downloads: Altri Downloads
other-lts-downloads: Altri Download LTS
other-stable-downloads: Altri Download Stabili
stable: Stabile
other-current-downloads: Altri Download Stabili
Copy link
Member

@lpinca lpinca Apr 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Altri download della versione corrente" or "Altri download correnti".
Not sure about casing.

cc: @parro-it @piccoloaiutante

P.S. we can do these things in another pr :)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Altri download della versione corrente" seems better to me.

current: Corrente
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lpinca Grazie! ;)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the exact kind of stuff I knew I would miss. Thanks for getting on it so quickly @fhemberger !!!

lts: LTS
tagline-stable: Ultime funzionalità
tagline-current: Ultime funzionalità
tagline-lts: Maturo e affidabile
changelog: Changelog
api: Documentazione API
Expand Down
2 changes: 1 addition & 1 deletion locale/it/site.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"subtext": "LTS",
"text": "v4.4.2 API"
},
"api-stable": {
"api-current": {
"link": "/dist/latest-v5.x/docs/api",
"text": "v5.10.1 API"
},
Expand Down
6 changes: 3 additions & 3 deletions locale/ko/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ labels:
download-for: Download for
other-downloads: 다른 운영 체제
other-lts-downloads: 다른 LTS 다운로드
other-stable-downloads: 다른 안정 버전 다운로드
stable: 안정 버전
other-current-downloads: 다른 안정 버전 다운로드
Copy link
Contributor

@preco21 preco21 Apr 26, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fhemberger Could you change '안정' to '현재' on here? ('stable' to 'current' in Korean)
Any other things are LGTM.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@preco21 Updated the translation, also on the next line.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fhemberger Cool! Thank you.

current: 안정 버전
lts: LTS
tagline-stable: 최신 기능
tagline-current: 최신 기능
tagline-lts: 안정적, 신뢰도 높음
changelog: 변경사항
api: API 문서
Expand Down
2 changes: 1 addition & 1 deletion locale/ko/site.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"subtext": "LTS",
"text": "v4.4.2 API"
},
"api-stable": {
"api-current": {
"link": "/dist/latest-v5.x/docs/api",
"text": "v5.10.1 API"
},
Expand Down
2 changes: 1 addition & 1 deletion scripts/helpers/latestversion.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const semver = require('semver')

exports.stable = (releases) => {
exports.current = (releases) => {
const match = releases.find((release) => !release.lts && semver.gte(release.version, '5.0.0'))
return match && match.version
}
Expand Down
10 changes: 5 additions & 5 deletions tests/scripts/latestversion.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ const test = require('tape')

const latestversion = require('../../scripts/helpers/latestversion')

test('latestversion.stable()', (t) => {
test('latestversion.current()', (t) => {
t.test('should be greater equal/greater than v5.0.0', (t) => {
const stableVersion = latestversion.stable([
const currentVersion = latestversion.current([
{ version: 'v4.2.1', lts: true },
{ version: 'v0.12.7', lts: false }
])

t.equal(stableVersion, undefined)
t.equal(currentVersion, undefined)
t.end()
})

t.test('should not be an LTS release', (t) => {
const stableVersion = latestversion.stable([
const currentVersion = latestversion.current([
{ version: 'v5.0.0', lts: false },
{ version: 'v4.2.1', lts: true },
{ version: 'v0.12.7', lts: false }
])

t.equal(stableVersion, 'v5.0.0')
t.equal(currentVersion, 'v5.0.0')
t.end()
})

Expand Down
4 changes: 2 additions & 2 deletions tests/scripts/release-post.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,13 +194,13 @@ test('fetchVersionPolicy(<version>)', (t) => {
const changelogFixture = path.resolve(__dirname, 'CHANGELOG.fixture.md')
const changelogLegacyFixture = path.resolve(__dirname, 'CHANGELOG.fixture.legacy.md')

t.test('finds "Stable" version policy', (t) => {
t.test('finds "Current" version policy', (t) => {
const github = nock('https://raw.githubusercontent.com')
.get('/nodejs/node/v4.1.0/CHANGELOG.md')
.replyWithFile(200, changelogFixture)

releasePost.fetchVersionPolicy('4.1.0').then((policy) => {
t.equal(policy, 'Stable')
t.equal(policy, 'Current')
Copy link
Member

@lpinca lpinca Apr 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This assertion fails because the channel is resolved as "Stable" from the fixture.
Maybe it makes sense to create a new fixture faking a changelog for the "Current" channel.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the name change affect existing releases? If not, this assertion should not be changed as v4.1.0 should still be considered "stable".

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the name change affect existing releases?

I vote yes.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I vote yes.

I would agree in the eyes of consistency, but that would possibly mean updating all previous changelogs/blogs etc, I'm not sure that's preferable.

@fhemberger as I'm not sure what to do about previous releases, I've made two branches with contains fixes for both scenarios:

  • rename-stable-old-still-stable: old releases should still be named "Stable"
  • rename-stable-incl-old-releases: rename old releases to "Stable" as well

Merge or cherry-pick what ever commit you see fit. IMO keeping "Stable" for old releases would be okey for this PR, further discussion and a permanent fix could be raised in a separate issue/PR.

t.true(github.isDone(), 'githubusercontent.com was requested')

t.end()
Expand Down