Skip to content

Commit 247b4ce

Browse files
montogeekmontogeek
authored
fix(site) Partially revert #2026 (#2033)
1 parent 0ebc4ac commit 247b4ce

File tree

4 files changed

+23
-84
lines changed

4 files changed

+23
-84
lines changed

‎antwar.config.js

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,69 +14,69 @@ module.exports = () => ({
1414
'/': {
1515
title: 'Home',
1616
layout: () => require('./src/components/Page/Page.jsx').default,
17-
content: () => require.context('./src/content', false, /^\.\/.*\.md$/),
18-
index: () => require('./src/components/Splash/Splash.jsx').default,
17+
content: () => require.context('./loaders/page-loader!./src/content', false, /^\.\/.*\.md$/),
18+
index: () => require('./src/components/Splash/Splash.jsx').default
1919
},
2020
concepts: {
2121
title: 'Concepts',
22-
url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
22+
url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
2323
layout: () => require('./src/components/Page/Page.jsx').default,
24-
content: () => require.context('./src/content/concepts', false, /^\.\/.*\.md$/)
24+
content: () => require.context('./loaders/page-loader!./src/content/concepts', false, /^\.\/.*\.md$/)
2525
},
2626
configuration: {
2727
title: 'Configuration',
28-
url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
28+
url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
2929
layout: () => require('./src/components/Page/Page.jsx').default,
30-
content: () => require.context('./src/content/configuration', false, /^\.\/.*\.md$/)
30+
content: () => require.context('./loaders/page-loader!./src/content/configuration', false, /^\.\/.*\.md$/)
3131
},
3232
api: {
3333
title: 'API',
34-
url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
34+
url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
3535
layout: () => require('./src/components/Page/Page.jsx').default,
36-
content: () => require.context('./src/content/api', false, /^\.\/.*\.md$/)
36+
content: () => require.context('./loaders/page-loader!./src/content/api', false, /^\.\/.*\.md$/)
3737
},
3838
guides: {
3939
title: 'Guides',
40-
url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
40+
url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
4141
layout: () => require('./src/components/Page/Page.jsx').default,
42-
content: () => require.context('./src/content/guides', false, /^\.\/.*\.md$/)
42+
content: () => require.context('./loaders/page-loader!./src/content/guides', false, /^\.\/.*\.md$/)
4343
},
4444
plugins: {
4545
title: 'Plugins',
46-
url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
46+
url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
4747
layout: () => require('./src/components/Page/Page.jsx').default,
4848
content: () => {
4949
return combineContexts(
50-
require.context('./src/content/plugins', false, /^\.\/.*\.md$/),
51-
require.context('./generated/plugins', false, /^\.\/.*\.md$/)
50+
require.context('./loaders/page-loader!./src/content/plugins', false, /^\.\/.*\.md$/),
51+
require.context('./loaders/page-loader!./generated/plugins', false, /^\.\/.*\.md$/)
5252
);
5353
}
5454
},
5555
loaders: {
5656
title: 'Loaders',
57-
url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
57+
url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
5858
layout: () => require('./src/components/Page/Page.jsx').default,
5959
content: () => {
6060
return combineContexts(
61-
require.context('./src/content/loaders', false, /^\.\/.*\.md$/),
62-
require.context('./generated/loaders', false, /^\.\/.*\.md$/)
61+
require.context('./loaders/page-loader!./src/content/loaders', false, /^\.\/.*\.md$/),
62+
require.context('./loaders/page-loader!./generated/loaders', false, /^\.\/.*\.md$/)
6363
);
6464
}
6565
},
6666
contribute: {
6767
title: 'Contribute',
68-
url: ({sectionName, fileName}) => `/${sectionName}/${fileName}/`,
68+
url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
6969
layout: () => require('./src/components/Page/Page.jsx').default,
70-
content: () => require.context('./src/content/contribute', false, /^\.\/.*\.md$/),
70+
content: () => require.context('./loaders/page-loader!./src/content/contribute', false, /^\.\/.*\.md$/)
7171
},
7272
migrate: {
7373
title: 'Migrate',
7474
url: ({ sectionName, fileName }) => `/${sectionName}/${fileName}/`,
7575
layout: () => require('./src/components/Page/Page.jsx').default,
76-
content: () => require.context('./src/content/migrate', false, /^\.\/.*\.md$/),
76+
content: () => require.context('./loaders/page-loader!./src/content/migrate', false, /^\.\/.*\.md$/)
7777
},
7878
vote: () => require('./src/components/Vote/Vote.jsx').default,
7979
organization: () => require('./src/components/Organization/Organization.jsx').default,
80-
'starter-kits': () => require('./src/components/StarterKits/StarterKits.jsx').default,
80+
'starter-kits': () => require('./src/components/StarterKits/StarterKits.jsx').default
8181
}
8282
});

‎src/components/Support/Support.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export default class Support extends React.Component {
9595
</div>
9696

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

114114
<div className="support__bottom">

‎webpack.config.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,7 @@ module.exports = (env) => ({
8585
{
8686
test: /\.html$/,
8787
use: 'raw-loader'
88-
},
89-
{
90-
test: /\.md$/,
91-
use: 'page-loader',
92-
},
88+
}
9389
]
9490
},
9591

‎yarn.lock

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2361,63 +2361,6 @@ es-to-primitive@^1.1.1:
23612361
is-date-object "^1.0.1"
23622362
is-symbol "^1.0.1"
23632363

2364-
es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
2365-
version "0.10.42"
2366-
resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.42.tgz#8c07dd33af04d5dcd1310b5cef13bea63a89ba8d"
2367-
dependencies:
2368-
es6-iterator "~2.0.3"
2369-
es6-symbol "~3.1.1"
2370-
next-tick "1"
2371-
2372-
es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
2373-
version "2.0.3"
2374-
resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
2375-
dependencies:
2376-
d "1"
2377-
es5-ext "^0.10.35"
2378-
es6-symbol "^3.1.1"
2379-
2380-
es6-map@^0.1.3:
2381-
version "0.1.5"
2382-
resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
2383-
dependencies:
2384-
d "1"
2385-
es5-ext "~0.10.14"
2386-
es6-iterator "~2.0.1"
2387-
es6-set "~0.1.5"
2388-
es6-symbol "~3.1.1"
2389-
event-emitter "~0.3.5"
2390-
2391-
es6-promise@^4.1.0:
2392-
version "4.2.4"
2393-
resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
2394-
2395-
es6-set@~0.1.5:
2396-
version "0.1.5"
2397-
resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
2398-
dependencies:
2399-
d "1"
2400-
es5-ext "~0.10.14"
2401-
es6-iterator "~2.0.1"
2402-
es6-symbol "3.1.1"
2403-
event-emitter "~0.3.5"
2404-
2405-
[email protected], es6-symbol@^3.1.1, es6-symbol@~3.1.1:
2406-
version "3.1.1"
2407-
resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
2408-
dependencies:
2409-
d "1"
2410-
es5-ext "~0.10.14"
2411-
2412-
es6-weak-map@^2.0.1:
2413-
version "2.0.2"
2414-
resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
2415-
dependencies:
2416-
d "1"
2417-
es5-ext "^0.10.14"
2418-
es6-iterator "^2.0.1"
2419-
es6-symbol "^3.1.1"
2420-
24212364
esanimate@^1.1.0:
24222365
version "1.1.0"
24232366
resolved "https://registry.yarnpkg.com/esanimate/-/esanimate-1.1.0.tgz#e71712b6d8b2bb2e6d5d40a6392a7bf9c7c20857"

0 commit comments

Comments
 (0)