Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(next-mdx): resolve webpack loader #17983

Merged
merged 11 commits into from
Jan 4, 2021
Merged

fix(next-mdx): resolve webpack loader #17983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
df45542
ci: allow testing multiple examples in pnp tests
merceyz Oct 4, 2020
e1df9cb
fix(next): add missing peer dependencies for sass support
merceyz Oct 4, 2020
36448fb
ci: invoke test script using bash
merceyz Oct 4, 2020
7c1a8d5
ci: speed up pnp test
merceyz Oct 4, 2020
49ca15f
Merge branch 'canary' into merceyz/pnp-sass
merceyz Oct 5, 2020
4d4b0b3
Merge branch 'canary' into merceyz/pnp-sass
merceyz Oct 6, 2020
bcafb32
Merge branch 'canary' into merceyz/pnp-sass
merceyz Oct 8, 2020
ce2d303
Merge branch 'canary' into merceyz/pnp-sass
merceyz Oct 15, 2020
6817507
fix(next-mdx): require.resolve webpack loader
merceyz Oct 17, 2020
64e7384
Merge branch 'canary' into merceyz/mdx
Timer Jan 4, 2021
ca4747e
fix: add @mdx-js/react as a peer dependency
merceyz Jan 4, 2021
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
1 change: 1 addition & 0 deletions examples/with-mdx/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
},
"dependencies": {
"@mdx-js/loader": "^1.5.1",
"@mdx-js/react": "^1.6.18",
merceyz marked this conversation as resolved.
Show resolved Hide resolved
"@next/mdx": "^9.1.1",
"next": "latest",
"react": "^16.8.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/next-mdx/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = (pluginOptions = {}) => (nextConfig = {}) => {
use: [
options.defaultLoaders.babel,
{
loader: '@mdx-js/loader',
loader: require.resolve('@mdx-js/loader'),
options: pluginOptions.options,
},
],
Expand Down
3 changes: 2 additions & 1 deletion packages/next-mdx/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"directory": "packages/next-mdx"
},
"peerDependencies": {
"@mdx-js/loader": ">=0.15.0"
"@mdx-js/loader": ">=0.15.0",
"@mdx-js/react": "*"
}
}
1 change: 1 addition & 0 deletions test-pnp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
declare -a testCases=(
"with-typescript"
"with-next-sass"
"with-mdx"
)

set -e
Expand Down