Skip to content

Commit

Permalink
fix(site) Partially revert #2026 (#2033)
Browse files Browse the repository at this point in the history
  • Loading branch information
@montogeek
montogeek committed Apr 13, 2018
1 parent 0ebc4ac commit 247b4ce
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 84 deletions.
40 changes: 20 additions & 20 deletions antwar.config.js
View file
Expand Up @@ -14,69 +14,69 @@ module.exports = () => ({
'/': {
title: 'Home',
layout: () => require('./src/components/Page/Page.jsx').default,
content: () => require.context('./src/content', false, /^\.\/.*\.md$/),
index: () => require('./src/components/Splash/Splash.jsx').default,
content: () => require.context('./loaders/page-loader!./src/content', false, /^\.\/.*\.md$/),
index: () => require('./src/components/Splash/Splash.jsx').default
},
concepts: {
title: 'Concepts',
url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
layout: () => require('./src/components/Page/Page.jsx').default,
content: () => require.context('./src/content/concepts', false, /^\.\/.*\.md$/)
content: () => require.context('./loaders/page-loader!./src/content/concepts', false, /^\.\/.*\.md$/)
},
configuration: {
title: 'Configuration',
url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
layout: () => require('./src/components/Page/Page.jsx').default,
content: () => require.context('./src/content/configuration', false, /^\.\/.*\.md$/)
content: () => require.context('./loaders/page-loader!./src/content/configuration', false, /^\.\/.*\.md$/)
},
api: {
title: 'API',
url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
layout: () => require('./src/components/Page/Page.jsx').default,
content: () => require.context('./src/content/api', false, /^\.\/.*\.md$/)
content: () => require.context('./loaders/page-loader!./src/content/api', false, /^\.\/.*\.md$/)
},
guides: {
title: 'Guides',
url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
layout: () => require('./src/components/Page/Page.jsx').default,
content: () => require.context('./src/content/guides', false, /^\.\/.*\.md$/)
content: () => require.context('./loaders/page-loader!./src/content/guides', false, /^\.\/.*\.md$/)
},
plugins: {
title: 'Plugins',
url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
layout: () => require('./src/components/Page/Page.jsx').default,
content: () => {
return combineContexts(
require.context('./src/content/plugins', false, /^\.\/.*\.md$/),
require.context('./generated/plugins', false, /^\.\/.*\.md$/)
require.context('./loaders/page-loader!./src/content/plugins', false, /^\.\/.*\.md$/),
require.context('./loaders/page-loader!./generated/plugins', false, /^\.\/.*\.md$/)
);
}
},
loaders: {
title: 'Loaders',
url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
layout: () => require('./src/components/Page/Page.jsx').default,
content: () => {
return combineContexts(
require.context('./src/content/loaders', false, /^\.\/.*\.md$/),
require.context('./generated/loaders', false, /^\.\/.*\.md$/)
require.context('./loaders/page-loader!./src/content/loaders', false, /^\.\/.*\.md$/),
require.context('./loaders/page-loader!./generated/loaders', false, /^\.\/.*\.md$/)
);
}
},
contribute: {
title: 'Contribute',
url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
layout: () => require('./src/components/Page/Page.jsx').default,
content: () => require.context('./src/content/contribute', false, /^\.\/.*\.md$/),
content: () => require.context('./loaders/page-loader!./src/content/contribute', false, /^\.\/.*\.md$/)
},
migrate: {
title: 'Migrate',
url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
layout: () => require('./src/components/Page/Page.jsx').default,
content: () => require.context('./src/content/migrate', false, /^\.\/.*\.md$/),
content: () => require.context('./loaders/page-loader!./src/content/migrate', false, /^\.\/.*\.md$/)
},
vote: () => require('./src/components/Vote/Vote.jsx').default,
organization: () => require('./src/components/Organization/Organization.jsx').default,
'starter-kits': () => require('./src/components/StarterKits/StarterKits.jsx').default,
'starter-kits': () => require('./src/components/StarterKits/StarterKits.jsx').default
}
});
4 changes: 2 additions & 2 deletions src/components/Support/Support.jsx
View file
Expand Up @@ -95,7 +95,7 @@ export default class Support extends React.Component {
</div>

{
(typeof window !== 'undefined') ? supporters.map((supporter, index) => (
supporters.map((supporter, index) => (
<a key={ supporter.id || supporter.slug || index }
className="support__item"
title={ `$${formatMoney(supporter.totalDonations / 100)} by ${supporter.name || supporter.slug}` }
Expand All @@ -108,7 +108,7 @@ export default class Support extends React.Component {
onError={ this._handleImgError } />}
{ rank === 'backer' ? <figure className="support__outline" /> : null }
</a>
)) : null
))
}

<div className="support__bottom">
Expand Down
6 changes: 1 addition & 5 deletions webpack.config.js
View file
Expand Up @@ -85,11 +85,7 @@ module.exports = (env) => ({
{
test: /\.html$/,
use: 'raw-loader'
},
{
test: /\.md$/,
use: 'page-loader',
},
}
]
},

Expand Down
57 changes: 0 additions & 57 deletions yarn.lock
View file
Expand Up @@ -2361,63 +2361,6 @@ es-to-primitive@^1.1.1:
is-date-object "^1.0.1"
is-symbol "^1.0.1"

es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
version "0.10.42"
resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.42.tgz#8c07dd33af04d5dcd1310b5cef13bea63a89ba8d"
dependencies:
es6-iterator "~2.0.3"
es6-symbol "~3.1.1"
next-tick "1"

es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
dependencies:
d "1"
es5-ext "^0.10.35"
es6-symbol "^3.1.1"

es6-map@^0.1.3:
version "0.1.5"
resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
dependencies:
d "1"
es5-ext "~0.10.14"
es6-iterator "~2.0.1"
es6-set "~0.1.5"
es6-symbol "~3.1.1"
event-emitter "~0.3.5"

es6-promise@^4.1.0:
version "4.2.4"
resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"

es6-set@~0.1.5:
version "0.1.5"
resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
dependencies:
d "1"
es5-ext "~0.10.14"
es6-iterator "~2.0.1"
es6-symbol "3.1.1"
event-emitter "~0.3.5"

es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
dependencies:
d "1"
es5-ext "~0.10.14"

es6-weak-map@^2.0.1:
version "2.0.2"
resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
dependencies:
d "1"
es5-ext "^0.10.14"
es6-iterator "^2.0.1"
es6-symbol "^3.1.1"

esanimate@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/esanimate/-/esanimate-1.1.0.tgz#e71712b6d8b2bb2e6d5d40a6392a7bf9c7c20857"
Expand Down

0 comments on commit 247b4ce

Please sign in to comment.