Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nfl/react-helmet
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5.1.3
Choose a base ref
...
head repository: nfl/react-helmet
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5.2.0
Choose a head ref
  • 11 commits
  • 11 files changed
  • 7 contributors

Commits on May 24, 2017

  1. Adding an example of hrefLang

    kesava authored May 24, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    Julesssss Jules
    Copy the full SHA
    3eb8f52 View commit details

Commits on May 31, 2017

  1. Fix typo

    kulakowka authored May 31, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    Julesssss Jules
    Copy the full SHA
    fddaa3f View commit details
  2. docs: fix example typo

    Merge pull request #288 from kulakowka/patch-1
    cwelch5 authored May 31, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    Julesssss Jules
    Copy the full SHA
    312229e View commit details

Commits on Jun 1, 2017

  1. fix: Remove unexpected comma in server-rendered title

    Fixes #286
    Richard Herrera committed Jun 1, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    Julesssss Jules
    Copy the full SHA
    66b8212 View commit details

Commits on Jun 19, 2017

  1. Merge pull request #289 from /issues/286

    fix: Remove unexpected comma in server-rendered title
    cwelch5 authored Jun 19, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    Julesssss Jules
    Copy the full SHA
    1af6e44 View commit details
  2. Merge pull request #285 from kesava/patch-1

    Adding an example of hrefLang
    cwelch5 authored Jun 19, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    Julesssss Jules
    Copy the full SHA
    8981671 View commit details

Commits on Jun 20, 2017

  1. Add prettier (#295)

    - Add prettier
    - Apply prettier formatting to the project
    ldeavila authored and jamsea committed Jun 20, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    Julesssss Jules
    Copy the full SHA
    c947ede View commit details

Commits on Jun 23, 2017

  1. Adds boolean defer prop to <Helmet> that controls whether updates are…

    … sync or deferred. Default is defer={true}. Closes #291
    jaysoo committed Jun 23, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    Julesssss Jules
    Copy the full SHA
    b22e2f4 View commit details

Commits on Jul 26, 2017

  1. feat: Merge pull request #297 from jaysoo/issues/291-fouc

    feat: Adds support for synchronously updated tags (Closes #291)
    cwelch5 authored Jul 26, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6a3d3bf View commit details

Commits on Aug 29, 2017

  1. fix: Replace requestIdleCallback with requestAnimationFrame for a mor…

    …e consistent DOM write cycle. (#307)
    
    * fix: Replace requestIdleCallback with requestAnimationFrame for a more consistent DOM write cycle.
    
    * fix: Update export
    
    * chore: skip flaky test
    doctyper authored and cwelch5 committed Aug 29, 2017
    Copy the full SHA
    a2323ad View commit details
  2. docs: 5.2.0 release (#312)

    cwelch5 authored Aug 29, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    86276f3 View commit details
Showing with 3,072 additions and 1,985 deletions.
  1. +18 −1 .eslintrc
  2. +22 −5 CHANGELOG.md
  3. +5 −0 README.md
  4. +18 −22 karma.config.js
  5. +5 −2 package.json
  6. +209 −192 src/Helmet.js
  7. +20 −17 src/HelmetConstants.js
  8. +310 −198 src/HelmetUtils.js
  9. +1,191 −786 test/HelmetDeclarativeTest.js
  10. +1,245 −762 test/HelmetTest.js
  11. +29 −0 yarn.lock
19 changes: 18 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "nfl",
"extends": ["nfl", "prettier"],
"env": {
"browser": true,
"mocha": true,
@@ -8,5 +8,22 @@
"globals": {
"expect": false,
"sinon": false
},
"plugins": [
"prettier"
],
"rules": {
"prettier/prettier": ["error", {
"printWidth": 80,
"tabWidth": 4,
"singleQuote": false,
"trailingComma": "none",
"bracketSpacing": false,
"semi": true,
"useTabs": false,
"parser": "babylon",
"jsxBracketSameLine": false
}
]
}
}
27 changes: 22 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
<a name="5.2.0"></a>
# [5.2.0](https://github.com/nfl/react-helmet/compare/5.1.3...5.2.0) (2017-08-29)


### Features

* Adds support for synchronously updated tags
([#297](https://github.com/nfl/react-helmet/pull/297))
([6a3d3bf](https://github.com/nfl/react-helmet/commit/6a3d3bf)), closes [#291](https://github.com/nfl/react-helmet/issues/291)

### Bug Fixes

* Remove unexpected comma in server-rendered title ([#289](https://github.com/nfl/react-helmet/pull/289)) ([66b8212](https://github.com/nfl/react-helmet/commit/66b8212)), closes [#286](https://github.com/nfl/react-helmet/issues/286)
* Replace requestIdleCallback with requestAnimationFrame for a more consistent DOM write cycle. ([#307](https://github.com/nfl/react-helmet/issues/307)) ([a2323ad](https://github.com/nfl/react-helmet/commit/a2323ad))



<a name="5.1.3"></a>
## [5.1.3](https://github.com/nfl/react-helmet/compare/5.0.3...v5.1.3) (2017-05-18)
## [5.1.3](https://github.com/nfl/react-helmet/compare/5.0.3...5.1.3) (2017-05-18)


### Bug Fixes
@@ -9,7 +26,7 @@


<a name="5.0.3"></a>
## [5.0.3](https://github.com/nfl/react-helmet/compare/5.0.2...v5.0.3) (2017-04-10)
## [5.0.3](https://github.com/nfl/react-helmet/compare/5.0.2...5.0.3) (2017-04-10)


### Bug Fixes
@@ -19,7 +36,7 @@


<a name="5.0.2"></a>
## [5.0.2](https://github.com/nfl/react-helmet/compare/5.0.1...v5.0.2) (2017-03-28)
## [5.0.2](https://github.com/nfl/react-helmet/compare/5.0.1...5.0.2) (2017-03-28)


### Bug Fixes
@@ -29,7 +46,7 @@


<a name="5.0.1"></a>
## [5.0.1](https://github.com/nfl/react-helmet/compare/5.0.0...v5.0.1) (2017-03-24)
## [5.0.1](https://github.com/nfl/react-helmet/compare/5.0.0...5.0.1) (2017-03-24)


### Bug Fixes
@@ -39,7 +56,7 @@


<a name="5.0.0"></a>
# [5.0.0](https://github.com/nfl/react-helmet/compare/4.0.0...v5.0.0) (2017-03-21)
# [5.0.0](https://github.com/nfl/react-helmet/compare/4.0.0...5.0.0) (2017-03-21)

### Features

5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ import React from "react";
import {Helmet} from "react-helmet";

class Application extends React.Component {
render () {
return (
<div className="application">
<Helmet>
@@ -28,6 +29,7 @@ class Application extends React.Component {
...
</div>
);
}
};
```

@@ -212,6 +214,9 @@ function HTML () {
<link rel="canonical" href="http://mysite.com/example" />
<link rel="apple-touch-icon" href="http://mysite.com/img/apple-touch-icon-57x57.png" />
<link rel="apple-touch-icon" sizes-"72x72" href="http://mysite.com/img/apple-touch-icon-72x72.png" />
{locales.map((locale) => {
<link rel="alternate" href="http://example.com/{locale}" hrefLang={locale} />
})}

{/* multiple script elements */}
<script src="http://include.com/pathtojs.js" type="text/javascript" />
40 changes: 18 additions & 22 deletions karma.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Karma configuration

module.exports = function (config) {
module.exports = function(config) {
function normalizationBrowserName(browser) {
return browser.toLowerCase().split(/[ /-]/)[0];
}
@@ -20,14 +20,9 @@ module.exports = function (config) {
},

// frameworks to use
frameworks: [
"chai-sinon",
"mocha"
],
frameworks: ["chai-sinon", "mocha"],

files: [
"./test/test.js"
],
files: ["./test/test.js"],

preprocessors: {
// add webpack as preprocessor
@@ -37,21 +32,25 @@ module.exports = function (config) {
coverageReporter: {
dir: "coverage/json",
includeAllSources: true,
reporters: [{
type: "json",
subdir: normalizationBrowserName
}]
reporters: [
{
type: "json",
subdir: normalizationBrowserName
}
]
},

webpack: {
devtool: "inline-source-map",
module: {
rules: [{
test: /\.js$/,
// exclude this dirs from coverage
exclude: [/node_modules/],
loader: "babel-loader"
}]
rules: [
{
test: /\.js$/,
// exclude this dirs from coverage
exclude: [/node_modules/],
loader: "babel-loader"
}
]
},
watch: true
},
@@ -62,10 +61,7 @@ module.exports = function (config) {

// test results reporter to use
// possible values: "dots", "progress", "junit", "growl", "coverage"
reporters: [
"coverage",
"spec"
],
reporters: ["coverage", "spec"],

// web server port
port: 9876,
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "react-helmet",
"description": "A document head manager for React",
"version": "5.1.3",
"version": "5.2.0",
"main": "./lib/Helmet.js",
"author": "NFL <engineers@nfl.com>",
"contributors": [
@@ -55,9 +55,11 @@
"cz-conventional-changelog": "^2.0.0",
"eslint": "^3.18.0",
"eslint-config-nfl": "^11.1.0",
"eslint-config-prettier": "^2.2.0",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^4.0.0",
"eslint-plugin-mocha": "^4.9.0",
"eslint-plugin-prettier": "^2.1.2",
"eslint-plugin-react": "^6.10.2",
"istanbul": "^0.4.5",
"karma": "^1.5.0",
@@ -76,6 +78,7 @@
"karma-webpack": "^2.0.3",
"mocha": "^3.2.0",
"phantomjs-prebuilt": "^2.1.14",
"prettier": "^1.4.4",
"react": "^15.x",
"react-dom": "^15.x",
"rimraf": "^2.6.1",
@@ -86,7 +89,7 @@
"scripts": {
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
"clean": "rimraf lib coverage es",
"lint": "eslint --ignore-path .gitignore -- .",
"lint": "eslint --ignore-path .gitignore --fix -- .",
"test": "cross-env BABEL_ENV=test karma start karma.config.js",
"posttest": "istanbul report lcov text",
"pretest": "npm run clean && npm run lint",
Loading