@docusaurus/mdx-loader 4.0.0-canary-6928 → 4.0.0-canary-6929
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/loader.d.ts.map +1 -1
- package/lib/loader.js +4 -12
- package/lib/loader.js.map +1 -1
- package/lib/remark/transformImage/index.d.ts.map +1 -1
- package/lib/remark/transformImage/index.js +5 -3
- package/lib/remark/transformImage/index.js.map +1 -1
- package/lib/remark/transformLinks/index.d.ts.map +1 -1
- package/lib/remark/transformLinks/index.js +5 -7
- package/lib/remark/transformLinks/index.js.map +1 -1
- package/lib/remark/utils/index.d.ts.map +1 -1
- package/lib/remark/utils/index.js +11 -20
- package/lib/remark/utils/index.js.map +1 -1
- package/lib/utils.d.ts +1 -2
- package/lib/utils.d.ts.map +1 -1
- package/lib/utils.js +6 -3
- package/lib/utils.js.map +1 -1
- package/package.json +6 -6
- package/src/loader.ts +4 -17
- package/src/remark/transformImage/index.ts +6 -10
- package/src/remark/transformLinks/index.ts +6 -16
- package/src/remark/utils/index.ts +11 -20
- package/src/utils.ts +11 -12
package/lib/loader.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAeH,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AACvC,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AAC3C,YAAY,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AA2K3C,wBAAsB,SAAS,CAC7B,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,EAC5B,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAiBf"}
|
package/lib/loader.js
CHANGED
|
@@ -52,7 +52,6 @@ ${JSON.stringify(frontMatter, null, 2)}`;
|
|
|
52
52
|
const assets = options.createAssets && !isMDXPartial
|
|
53
53
|
? options.createAssets({ filePath, frontMatter })
|
|
54
54
|
: undefined;
|
|
55
|
-
const fileLoaderUtils = (0, utils_1.getFileLoaderUtils)(compilerName === 'server');
|
|
56
55
|
// TODO use remark plugins to insert extra exports instead of string concat?
|
|
57
56
|
// cf how the toc is exported
|
|
58
57
|
const exportsCode = `
|
|
@@ -61,12 +60,7 @@ export const contentTitle = ${(0, serializeJS_1.serializeJS)(contentTitle)};
|
|
|
61
60
|
${metadataPath
|
|
62
61
|
? `export {default as metadata} from '${(0, utils_1.aliasedSitePath)(metadataPath, options.siteDir)}'`
|
|
63
62
|
: ''}
|
|
64
|
-
${assets
|
|
65
|
-
? `export const assets = ${(0, utils_2.createAssetsExportCode)({
|
|
66
|
-
assets,
|
|
67
|
-
inlineMarkdownAssetImageFileLoader: fileLoaderUtils.loaders.inlineMarkdownAssetImageFileLoader,
|
|
68
|
-
})};`
|
|
69
|
-
: ''}
|
|
63
|
+
${assets ? `export const assets = ${(0, utils_2.createAssetsExportCode)({ assets })};` : ''}
|
|
70
64
|
`;
|
|
71
65
|
const code = `
|
|
72
66
|
${exportsCode}
|
|
@@ -102,13 +96,11 @@ async function loadMDXWithCaching({ resource, fileContent, filePath, options, co
|
|
|
102
96
|
// When deduplicating client/server compilations, we always use the client
|
|
103
97
|
// compilation and not the server compilation
|
|
104
98
|
// This is important because the server compilation usually skips some steps
|
|
105
|
-
// Notably:
|
|
106
|
-
//
|
|
99
|
+
// Notably: unused directives warnings are only reported by the client
|
|
100
|
+
// Note: asset requests do not depend on the compiler, emitting assets
|
|
101
|
+
// is controlled by the bundler asset rules
|
|
107
102
|
// See https://github.com/facebook/docusaurus/issues/10544#issuecomment-2390943794
|
|
108
103
|
// See https://github.com/facebook/docusaurus/pull/10553
|
|
109
|
-
// TODO a problem with this: server bundle will use client inline loaders
|
|
110
|
-
// This means server bundle will use ?emit=true for assets
|
|
111
|
-
// We should try to get rid of inline loaders to cleanup this caching logic
|
|
112
104
|
if (compilerName === 'client') {
|
|
113
105
|
const promise = loadMDX({
|
|
114
106
|
fileContent,
|
package/lib/loader.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAEH,wEAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/remark/transformImage/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAqBH,OAAO,KAAK,EAAC,MAAM,EAAc,MAAM,SAAS,CAAC;AAEjD,OAAO,KAAK,EAAQ,IAAI,EAAC,MAAM,OAAO,CAAC;AAEvC,OAAO,KAAK,EACV,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAE3B,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,wBAAwB,CAAC,CAAC;CAC3E,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/remark/transformImage/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAqBH,OAAO,KAAK,EAAC,MAAM,EAAc,MAAM,SAAS,CAAC;AAEjD,OAAO,KAAK,EAAQ,IAAI,EAAC,MAAM,OAAO,CAAC;AAEvC,OAAO,KAAK,EACV,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAE3B,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,wBAAwB,CAAC,CAAC;CAC3E,CAAC;AAyMF,QAAA,MAAM,MAAM,EAAE,MAAM,CAAC,aAAa,EAAE,EAAE,IAAI,CAqBzC,CAAC;eAEa,MAAM"}
|
|
@@ -45,7 +45,11 @@ async function toImageRequireNode([node], imagePath, context) {
|
|
|
45
45
|
const parsedUrl = (0, utils_1.parseURLOrPath)(node.url);
|
|
46
46
|
const hash = parsedUrl.hash ?? '';
|
|
47
47
|
const search = parsedUrl.search ?? '';
|
|
48
|
-
const requireString =
|
|
48
|
+
const requireString = (0, utils_1.createAssetRequest)({
|
|
49
|
+
assetPath: (0, utils_1.escapePath)(relativeImagePath),
|
|
50
|
+
search,
|
|
51
|
+
type: 'image',
|
|
52
|
+
});
|
|
49
53
|
if (node.alt) {
|
|
50
54
|
attributes.push({
|
|
51
55
|
type: 'mdxJsxAttribute',
|
|
@@ -166,11 +170,9 @@ async function processImageNode(target, context) {
|
|
|
166
170
|
const plugin = function plugin(options) {
|
|
167
171
|
const onBrokenMarkdownImages = asFunction(options.onBrokenMarkdownImages);
|
|
168
172
|
return async (root, vfile) => {
|
|
169
|
-
const fileLoaderUtils = (0, utils_1.getFileLoaderUtils)(vfile.data.compilerName === 'server');
|
|
170
173
|
const context = {
|
|
171
174
|
...options,
|
|
172
175
|
filePath: vfile.path,
|
|
173
|
-
inlineMarkdownImageFileLoader: fileLoaderUtils.loaders.inlineMarkdownImageFileLoader,
|
|
174
176
|
onBrokenMarkdownImages,
|
|
175
177
|
};
|
|
176
178
|
const promises = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/remark/transformImage/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,kEAA6B;AAC7B,uDAAuC;AACvC,6CAQ2B;AAC3B,kDAAsD;AACtD,wEAAwC;AACxC,uCAA0C;AAC1C,oCAIkB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/remark/transformImage/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/remark/transformLinks/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAoBH,OAAO,KAAK,EAAC,MAAM,EAAc,MAAM,SAAS,CAAC;AAGjD,OAAO,KAAK,EAAO,IAAI,EAAC,MAAM,OAAO,CAAC;AACtC,OAAO,KAAK,EACV,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAE3B,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,qBAAqB,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,uBAAuB,CAAC,CAAC;CACzE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/remark/transformLinks/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAoBH,OAAO,KAAK,EAAC,MAAM,EAAc,MAAM,SAAS,CAAC;AAGjD,OAAO,KAAK,EAAO,IAAI,EAAC,MAAM,OAAO,CAAC;AACtC,OAAO,KAAK,EACV,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAE3B,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,qBAAqB,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,uBAAuB,CAAC,CAAC;CACzE,CAAC;AA2NF,QAAA,MAAM,MAAM,EAAE,MAAM,CAAC,aAAa,EAAE,EAAE,IAAI,CAqBzC,CAAC;eAEa,MAAM"}
|
|
@@ -48,11 +48,11 @@ function toAssetRequireNode([node], assetPath, context) {
|
|
|
48
48
|
const parsedUrl = (0, utils_1.parseURLOrPath)(node.url);
|
|
49
49
|
const hash = parsedUrl.hash ?? '';
|
|
50
50
|
const search = parsedUrl.search ?? '';
|
|
51
|
-
const requireString =
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
51
|
+
const requireString = (0, utils_1.createAssetRequest)({
|
|
52
|
+
assetPath: (0, utils_1.escapePath)(relativeAssetPath),
|
|
53
|
+
search,
|
|
54
|
+
type: 'file',
|
|
55
|
+
});
|
|
56
56
|
attributes.push({
|
|
57
57
|
type: 'mdxJsxAttribute',
|
|
58
58
|
name: 'target',
|
|
@@ -184,11 +184,9 @@ async function processLinkNode(target, context) {
|
|
|
184
184
|
const plugin = function plugin(options) {
|
|
185
185
|
const onBrokenMarkdownLinks = asFunction(options.onBrokenMarkdownLinks);
|
|
186
186
|
return async (root, vfile) => {
|
|
187
|
-
const fileLoaderUtils = (0, utils_1.getFileLoaderUtils)(vfile.data.compilerName === 'server');
|
|
188
187
|
const context = {
|
|
189
188
|
...options,
|
|
190
189
|
filePath: vfile.path,
|
|
191
|
-
inlineMarkdownLinkFileLoader: fileLoaderUtils.loaders.inlineMarkdownLinkFileLoader,
|
|
192
190
|
onBrokenMarkdownLinks,
|
|
193
191
|
};
|
|
194
192
|
const promises = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/remark/transformLinks/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,kEAA6B;AAC7B,uDAAuC;AACvC,6CAQ2B;AAC3B,wEAAwC;AACxC,uCAAkC;AAClC,oCAIkB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/remark/transformLinks/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/remark/utils/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,OAAO,CAAC;AAChC,OAAO,KAAK,EAAC,8BAA8B,EAAC,MAAM,gBAAgB,CAAC;AAEnE;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,OAAO,SAAS,IAAI,EAChD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,GACf,OAAO,CAUT;AAED,wBAAgB,0BAA0B,CACxC,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GACX,8BAA8B,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/remark/utils/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,OAAO,CAAC;AAChC,OAAO,KAAK,EAAC,8BAA8B,EAAC,MAAM,gBAAgB,CAAC;AAEnE;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,OAAO,SAAS,IAAI,EAChD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,GACf,OAAO,CAUT;AAED,wBAAgB,0BAA0B,CACxC,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GACX,8BAA8B,CAyChC;AAUD,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAGjE"}
|
|
@@ -31,7 +31,7 @@ function transformNode(node, newNode) {
|
|
|
31
31
|
function assetRequireAttributeValue(requireString, hash) {
|
|
32
32
|
return {
|
|
33
33
|
type: 'mdxJsxAttributeValueExpression',
|
|
34
|
-
value: `require("${requireString}")
|
|
34
|
+
value: `require("${requireString}")${hash && ` + '${hash}'`}`,
|
|
35
35
|
data: {
|
|
36
36
|
estree: {
|
|
37
37
|
type: 'Program',
|
|
@@ -41,27 +41,18 @@ function assetRequireAttributeValue(requireString, hash) {
|
|
|
41
41
|
expression: {
|
|
42
42
|
type: 'BinaryExpression',
|
|
43
43
|
left: {
|
|
44
|
-
type: '
|
|
45
|
-
|
|
46
|
-
type: 'CallExpression',
|
|
47
|
-
callee: {
|
|
48
|
-
type: 'Identifier',
|
|
49
|
-
name: 'require',
|
|
50
|
-
},
|
|
51
|
-
arguments: [
|
|
52
|
-
{
|
|
53
|
-
type: 'Literal',
|
|
54
|
-
value: requireString,
|
|
55
|
-
raw: `"${requireString}"`,
|
|
56
|
-
},
|
|
57
|
-
],
|
|
58
|
-
optional: false,
|
|
59
|
-
},
|
|
60
|
-
property: {
|
|
44
|
+
type: 'CallExpression',
|
|
45
|
+
callee: {
|
|
61
46
|
type: 'Identifier',
|
|
62
|
-
name: '
|
|
47
|
+
name: 'require',
|
|
63
48
|
},
|
|
64
|
-
|
|
49
|
+
arguments: [
|
|
50
|
+
{
|
|
51
|
+
type: 'Literal',
|
|
52
|
+
value: requireString,
|
|
53
|
+
raw: `"${requireString}"`,
|
|
54
|
+
},
|
|
55
|
+
],
|
|
65
56
|
optional: false,
|
|
66
57
|
},
|
|
67
58
|
operator: '+',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/remark/utils/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;AAEH,wEAAwC;AAIxC;;;;;GAKG;AACH,uBACE,IAAU,EACV,OAAgB;IAEhB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAChC,kCAAkC;QAClC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACnC,kCAAkC;QAClC,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;IACH,OAAO,IAAe,CAAC;AACzB,CAAC;AAED,oCACE,aAAqB,EACrB,IAAY;IAEZ,OAAO;QACL,IAAI,EAAE,gCAAgC;QACtC,KAAK,EAAE,YAAY,aAAa,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/remark/utils/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;AAEH,wEAAwC;AAIxC;;;;;GAKG;AACH,uBACE,IAAU,EACV,OAAgB;IAEhB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAChC,kCAAkC;QAClC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACnC,kCAAkC;QAClC,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;IACH,OAAO,IAAe,CAAC;AACzB,CAAC;AAED,oCACE,aAAqB,EACrB,IAAY;IAEZ,OAAO;QACL,IAAI,EAAE,gCAAgC;QACtC,KAAK,EAAE,YAAY,aAAa,KAAK,IAAI,IAAI,OAAO,IAAI,GAAG,EAAE;QAC7D,IAAI,EAAE;YACJ,MAAM,EAAE;gBACN,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE;oBACJ;wBACE,IAAI,EAAE,qBAAqB;wBAC3B,UAAU,EAAE;4BACV,IAAI,EAAE,kBAAkB;4BACxB,IAAI,EAAE;gCACJ,IAAI,EAAE,gBAAgB;gCACtB,MAAM,EAAE;oCACN,IAAI,EAAE,YAAY;oCAClB,IAAI,EAAE,SAAS;iCAChB;gCACD,SAAS,EAAE;oCACT;wCACE,IAAI,EAAE,SAAS;wCACf,KAAK,EAAE,aAAa;wCACpB,GAAG,EAAE,IAAI,aAAa,GAAG;qCAC1B;iCACF;gCACD,QAAQ,EAAE,KAAK;6BAChB;4BACD,QAAQ,EAAE,GAAG;4BACb,KAAK,EAAE;gCACL,IAAI,EAAE,SAAS;gCACf,KAAK,EAAE,IAAI;gCACX,GAAG,EAAE,IAAI,IAAI,GAAG;6BACjB;yBACF;qBACF;iBACF;gBACD,UAAU,EAAE,QAAQ;gBACpB,QAAQ,EAAE,EAAE;aACb;SACF;KACF,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU;IACpC,OAAO,IAAI,CAAC,QAAQ,EAAE,KAAK;QACzB,CAAC,CAAC,gBAAM,CAAC,WAAW,CAAA,UAAU,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,WAAW,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE;QAC7F,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED,2DAA2D;AAC3D,uEAAuE;AACvE,wCAA+C,IAAU;IACvD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAC1C,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AAC/C,CAAC"}
|
package/lib/utils.d.ts
CHANGED
|
@@ -15,9 +15,8 @@ import type { Options } from './options';
|
|
|
15
15
|
*
|
|
16
16
|
* `{image: "./myImage.png"}` => `{image: require("./myImage.png")}`
|
|
17
17
|
*/
|
|
18
|
-
export declare function createAssetsExportCode({ assets
|
|
18
|
+
export declare function createAssetsExportCode({ assets }: {
|
|
19
19
|
assets: unknown;
|
|
20
|
-
inlineMarkdownAssetImageFileLoader: string;
|
|
21
20
|
}): string;
|
|
22
21
|
/**
|
|
23
22
|
* data.contentTitle is set by the remark contentTitle plugin
|
package/lib/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAGL,KAAK,mBAAmB,EACzB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAe,KAAK,qBAAqB,EAAC,MAAM,aAAa,CAAC;AAGrE,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAEvC;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,EAAC,MAAM,EAAC,EAAE;IAAC,MAAM,EAAE,OAAO,CAAA;CAAC,GAAG,MAAM,CAwC1E;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE;IAC5C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,GAAG,MAAM,GAAG,SAAS,CAErB;AAED,wBAAsB,YAAY,CAAC,EACjC,QAAQ,EACR,WAAW,EACX,WAAW,EACX,OAAO,EACP,YAAY,GACb,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,mBAAmB,CAAC;CACnC,GAAG,OAAO,CAAC,qBAAqB,CAAC,CA2CjC"}
|
package/lib/utils.js
CHANGED
|
@@ -23,7 +23,7 @@ const preprocessor_1 = tslib_1.__importDefault(require("./preprocessor"));
|
|
|
23
23
|
*
|
|
24
24
|
* `{image: "./myImage.png"}` => `{image: require("./myImage.png")}`
|
|
25
25
|
*/
|
|
26
|
-
function createAssetsExportCode({ assets
|
|
26
|
+
function createAssetsExportCode({ assets }) {
|
|
27
27
|
if (typeof assets !== 'object' ||
|
|
28
28
|
!assets ||
|
|
29
29
|
Object.keys(assets).length === 0) {
|
|
@@ -39,8 +39,11 @@ function createAssetsExportCode({ assets, inlineMarkdownAssetImageFileLoader, })
|
|
|
39
39
|
// We could enhance this logic and check if file exists on disc?
|
|
40
40
|
if (typeof assetValue === 'string' && assetValue.startsWith('./')) {
|
|
41
41
|
// TODO do we have other use-cases than image assets?
|
|
42
|
-
|
|
43
|
-
|
|
42
|
+
const request = (0, utils_1.createAssetRequest)({
|
|
43
|
+
assetPath: (0, utils_1.escapePath)(assetValue),
|
|
44
|
+
type: 'image-file',
|
|
45
|
+
});
|
|
46
|
+
return `require("${request}")`;
|
|
44
47
|
}
|
|
45
48
|
return undefined;
|
|
46
49
|
}
|
package/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;AAEH,wEAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;AAEH,wEAAwC;AACxC,6CAI2B;AAC3B,2CAAqE;AACrE,+CAAqD;AACrD,0EAA0C;AAG1C;;;;;;;GAOG;AACH,gCAAuC,EAAC,MAAM,EAAoB;IAChE,IACE,OAAO,MAAM,KAAK,QAAQ;QAC1B,CAAC,MAAM;QACP,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAChC,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,gDAAgD;IAChD,SAAS,oBAAoB,CAAC,UAAmB;QAC/C,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9B,MAAM,cAAc,GAAG,UAAU,CAAC,GAAG,CACnC,CAAC,IAAa,EAAE,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,WAAW,CAC7D,CAAC;YACF,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QAC1C,CAAC;QACD,8CAA8C;QAC9C,gEAAgE;QAChE,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAClE,qDAAqD;YACrD,MAAM,OAAO,GAAG,IAAA,0BAAkB,EAAC;gBACjC,SAAS,EAAE,IAAA,kBAAU,EAAC,UAAU,CAAC;gBACjC,IAAI,EAAE,YAAY;aACnB,CAAC,CAAC;YACH,OAAO,YAAY,OAAO,IAAI,CAAC;QACjC,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE5C,MAAM,SAAS,GAAG,YAAY;SAC3B,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAoB,EAAE,EAAE;QACvC,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACrD,OAAO,gBAAgB,CAAC,CAAC,CAAC,IAAI,GAAG,MAAM,gBAAgB,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;IACzE,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnB,OAAO,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;AACzC,CAAC;AAED;;GAEG;AACH,iCAAwC,IAEvC;IACC,OAAO,IAAI,CAAC,YAAkC,CAAC;AACjD,CAAC;AAEM,KAAK,uBAAuB,EACjC,QAAQ,EACR,WAAW,EACX,WAAW,EACX,OAAO,EACP,YAAY,GAOb;IACC,MAAM,uBAAuB,GAAG,IAAA,sBAAY,EAAC;QAC3C,WAAW;QACX,QAAQ;QACR,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,cAAc,EAAE,OAAO,CAAC,cAAc;KACvC,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,IAAA,oCAAsB,EAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAE/D,MAAM,SAAS,GAAG,IAAA,wBAAY,EAAC;QAC7B,QAAQ;QACR,OAAO;QACP,cAAc;KACf,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,OAAO,MAAM,SAAS,CAAC,OAAO,CAAC;YAC7B,OAAO,EAAE,uBAAuB;YAChC,QAAQ;YACR,WAAW;YACX,YAAY;SACb,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,YAAY,EAAE,CAAC;QACtB,MAAM,KAAK,GAAG,YAAqB,CAAC;QAEpC,wDAAwD;QACxD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACjD,MAAM,YAAY,GAChB,SAAS,KAAK,IAAI;YAChB,CAAC,CAAC,0CAA0C;gBAC1C,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC;YACxB,CAAC,CAAC,iDAAiD;gBACjD,GAAG,SAAS,KAAK,KAAK,CAAC,KAAK,EAAE,CAAC;QAErC,MAAM,IAAI,KAAK,CACb,mCAAmC,gBAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,YACtD,KAAK,CAAC,OACR,eAAe,YAAY,EAAE;QAC7B,sEAAsE;QACtE,EAAC,KAAK,EAAE,YAAY,EAAC,CACtB,CAAC;IACJ,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@docusaurus/mdx-loader",
|
|
3
|
-
"version": "4.0.0-canary-
|
|
3
|
+
"version": "4.0.0-canary-6929",
|
|
4
4
|
"description": "Docusaurus Loader for MDX",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -14,10 +14,10 @@
|
|
|
14
14
|
},
|
|
15
15
|
"license": "MIT",
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@docusaurus/fs": "4.0.0-canary-
|
|
18
|
-
"@docusaurus/logger": "4.0.0-canary-
|
|
19
|
-
"@docusaurus/utils": "4.0.0-canary-
|
|
20
|
-
"@docusaurus/utils-validation": "4.0.0-canary-
|
|
17
|
+
"@docusaurus/fs": "4.0.0-canary-6929",
|
|
18
|
+
"@docusaurus/logger": "4.0.0-canary-6929",
|
|
19
|
+
"@docusaurus/utils": "4.0.0-canary-6929",
|
|
20
|
+
"@docusaurus/utils-validation": "4.0.0-canary-6929",
|
|
21
21
|
"@mdx-js/mdx": "^3.1.1",
|
|
22
22
|
"@slorber/remark-comment": "^1.0.0",
|
|
23
23
|
"astring": "^1.9.0",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"webpack": "^5.111.0"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@docusaurus/types": "4.0.0-canary-
|
|
42
|
+
"@docusaurus/types": "4.0.0-canary-6929",
|
|
43
43
|
"@types/escape-html": "^1.0.4",
|
|
44
44
|
"@types/estree": "^1.0.9",
|
|
45
45
|
"@types/mdast": "^4.0.4",
|
package/src/loader.ts
CHANGED
|
@@ -9,7 +9,6 @@ import logger from '@docusaurus/logger';
|
|
|
9
9
|
import {
|
|
10
10
|
aliasedSitePath,
|
|
11
11
|
DEFAULT_PARSE_FRONT_MATTER,
|
|
12
|
-
getFileLoaderUtils,
|
|
13
12
|
getWebpackLoaderCompilerName,
|
|
14
13
|
} from '@docusaurus/utils';
|
|
15
14
|
import {
|
|
@@ -82,8 +81,6 @@ ${JSON.stringify(frontMatter, null, 2)}`;
|
|
|
82
81
|
? options.createAssets({filePath, frontMatter})
|
|
83
82
|
: undefined;
|
|
84
83
|
|
|
85
|
-
const fileLoaderUtils = getFileLoaderUtils(compilerName === 'server');
|
|
86
|
-
|
|
87
84
|
// TODO use remark plugins to insert extra exports instead of string concat?
|
|
88
85
|
// cf how the toc is exported
|
|
89
86
|
const exportsCode = `
|
|
@@ -97,15 +94,7 @@ ${
|
|
|
97
94
|
)}'`
|
|
98
95
|
: ''
|
|
99
96
|
}
|
|
100
|
-
${
|
|
101
|
-
assets
|
|
102
|
-
? `export const assets = ${createAssetsExportCode({
|
|
103
|
-
assets,
|
|
104
|
-
inlineMarkdownAssetImageFileLoader:
|
|
105
|
-
fileLoaderUtils.loaders.inlineMarkdownAssetImageFileLoader,
|
|
106
|
-
})};`
|
|
107
|
-
: ''
|
|
108
|
-
}
|
|
97
|
+
${assets ? `export const assets = ${createAssetsExportCode({assets})};` : ''}
|
|
109
98
|
`;
|
|
110
99
|
|
|
111
100
|
const code = `
|
|
@@ -160,13 +149,11 @@ async function loadMDXWithCaching({
|
|
|
160
149
|
// When deduplicating client/server compilations, we always use the client
|
|
161
150
|
// compilation and not the server compilation
|
|
162
151
|
// This is important because the server compilation usually skips some steps
|
|
163
|
-
// Notably:
|
|
164
|
-
//
|
|
152
|
+
// Notably: unused directives warnings are only reported by the client
|
|
153
|
+
// Note: asset requests do not depend on the compiler, emitting assets
|
|
154
|
+
// is controlled by the bundler asset rules
|
|
165
155
|
// See https://github.com/facebook/docusaurus/issues/10544#issuecomment-2390943794
|
|
166
156
|
// See https://github.com/facebook/docusaurus/pull/10553
|
|
167
|
-
// TODO a problem with this: server bundle will use client inline loaders
|
|
168
|
-
// This means server bundle will use ?emit=true for assets
|
|
169
|
-
// We should try to get rid of inline loaders to cleanup this caching logic
|
|
170
157
|
if (compilerName === 'client') {
|
|
171
158
|
const promise = loadMDX({
|
|
172
159
|
fileContent,
|
|
@@ -12,7 +12,7 @@ import {
|
|
|
12
12
|
posixPath,
|
|
13
13
|
escapePath,
|
|
14
14
|
findAsyncSequential,
|
|
15
|
-
|
|
15
|
+
createAssetRequest,
|
|
16
16
|
parseURLOrPath,
|
|
17
17
|
parseLocalURLPath,
|
|
18
18
|
} from '@docusaurus/utils';
|
|
@@ -44,7 +44,6 @@ type Context = {
|
|
|
44
44
|
siteDir: PluginOptions['siteDir'];
|
|
45
45
|
onBrokenMarkdownImages: OnBrokenMarkdownImagesFunction;
|
|
46
46
|
filePath: string;
|
|
47
|
-
inlineMarkdownImageFileLoader: string;
|
|
48
47
|
};
|
|
49
48
|
|
|
50
49
|
function asFunction(
|
|
@@ -99,9 +98,11 @@ async function toImageRequireNode(
|
|
|
99
98
|
const parsedUrl = parseURLOrPath(node.url);
|
|
100
99
|
const hash = parsedUrl.hash ?? '';
|
|
101
100
|
const search = parsedUrl.search ?? '';
|
|
102
|
-
const requireString =
|
|
103
|
-
escapePath(relativeImagePath)
|
|
104
|
-
|
|
101
|
+
const requireString = createAssetRequest({
|
|
102
|
+
assetPath: escapePath(relativeImagePath),
|
|
103
|
+
search,
|
|
104
|
+
type: 'image',
|
|
105
|
+
});
|
|
105
106
|
if (node.alt) {
|
|
106
107
|
attributes.push({
|
|
107
108
|
type: 'mdxJsxAttribute',
|
|
@@ -243,14 +244,9 @@ const plugin: Plugin<PluginOptions[], Root> = function plugin(
|
|
|
243
244
|
const onBrokenMarkdownImages = asFunction(options.onBrokenMarkdownImages);
|
|
244
245
|
|
|
245
246
|
return async (root, vfile) => {
|
|
246
|
-
const fileLoaderUtils = getFileLoaderUtils(
|
|
247
|
-
vfile.data.compilerName === 'server',
|
|
248
|
-
);
|
|
249
247
|
const context: Context = {
|
|
250
248
|
...options,
|
|
251
249
|
filePath: vfile.path!,
|
|
252
|
-
inlineMarkdownImageFileLoader:
|
|
253
|
-
fileLoaderUtils.loaders.inlineMarkdownImageFileLoader,
|
|
254
250
|
onBrokenMarkdownImages,
|
|
255
251
|
};
|
|
256
252
|
|
|
@@ -12,7 +12,7 @@ import {
|
|
|
12
12
|
posixPath,
|
|
13
13
|
escapePath,
|
|
14
14
|
findAsyncSequential,
|
|
15
|
-
|
|
15
|
+
createAssetRequest,
|
|
16
16
|
parseURLOrPath,
|
|
17
17
|
parseLocalURLPath,
|
|
18
18
|
} from '@docusaurus/utils';
|
|
@@ -43,7 +43,6 @@ type Context = PluginOptions & {
|
|
|
43
43
|
siteDir: string;
|
|
44
44
|
onBrokenMarkdownLinks: OnBrokenMarkdownLinksFunction;
|
|
45
45
|
filePath: string;
|
|
46
|
-
inlineMarkdownLinkFileLoader: string;
|
|
47
46
|
};
|
|
48
47
|
|
|
49
48
|
type Target = [node: Link, index: number, parent: Parent];
|
|
@@ -104,14 +103,11 @@ function toAssetRequireNode(
|
|
|
104
103
|
const hash = parsedUrl.hash ?? '';
|
|
105
104
|
const search = parsedUrl.search ?? '';
|
|
106
105
|
|
|
107
|
-
const requireString =
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
}${context.inlineMarkdownLinkFileLoader}${
|
|
113
|
-
escapePath(relativeAssetPath) + search
|
|
114
|
-
}`;
|
|
106
|
+
const requireString = createAssetRequest({
|
|
107
|
+
assetPath: escapePath(relativeAssetPath),
|
|
108
|
+
search,
|
|
109
|
+
type: 'file',
|
|
110
|
+
});
|
|
115
111
|
|
|
116
112
|
attributes.push({
|
|
117
113
|
type: 'mdxJsxAttribute',
|
|
@@ -265,15 +261,9 @@ const plugin: Plugin<PluginOptions[], Root> = function plugin(
|
|
|
265
261
|
const onBrokenMarkdownLinks = asFunction(options.onBrokenMarkdownLinks);
|
|
266
262
|
|
|
267
263
|
return async (root, vfile) => {
|
|
268
|
-
const fileLoaderUtils = getFileLoaderUtils(
|
|
269
|
-
vfile.data.compilerName === 'server',
|
|
270
|
-
);
|
|
271
|
-
|
|
272
264
|
const context: Context = {
|
|
273
265
|
...options,
|
|
274
266
|
filePath: vfile.path!,
|
|
275
|
-
inlineMarkdownLinkFileLoader:
|
|
276
|
-
fileLoaderUtils.loaders.inlineMarkdownLinkFileLoader,
|
|
277
267
|
onBrokenMarkdownLinks,
|
|
278
268
|
};
|
|
279
269
|
|
|
@@ -36,7 +36,7 @@ export function assetRequireAttributeValue(
|
|
|
36
36
|
): MdxJsxAttributeValueExpression {
|
|
37
37
|
return {
|
|
38
38
|
type: 'mdxJsxAttributeValueExpression',
|
|
39
|
-
value: `require("${requireString}")
|
|
39
|
+
value: `require("${requireString}")${hash && ` + '${hash}'`}`,
|
|
40
40
|
data: {
|
|
41
41
|
estree: {
|
|
42
42
|
type: 'Program',
|
|
@@ -46,27 +46,18 @@ export function assetRequireAttributeValue(
|
|
|
46
46
|
expression: {
|
|
47
47
|
type: 'BinaryExpression',
|
|
48
48
|
left: {
|
|
49
|
-
type: '
|
|
50
|
-
|
|
51
|
-
type: 'CallExpression',
|
|
52
|
-
callee: {
|
|
53
|
-
type: 'Identifier',
|
|
54
|
-
name: 'require',
|
|
55
|
-
},
|
|
56
|
-
arguments: [
|
|
57
|
-
{
|
|
58
|
-
type: 'Literal',
|
|
59
|
-
value: requireString,
|
|
60
|
-
raw: `"${requireString}"`,
|
|
61
|
-
},
|
|
62
|
-
],
|
|
63
|
-
optional: false,
|
|
64
|
-
},
|
|
65
|
-
property: {
|
|
49
|
+
type: 'CallExpression',
|
|
50
|
+
callee: {
|
|
66
51
|
type: 'Identifier',
|
|
67
|
-
name: '
|
|
52
|
+
name: 'require',
|
|
68
53
|
},
|
|
69
|
-
|
|
54
|
+
arguments: [
|
|
55
|
+
{
|
|
56
|
+
type: 'Literal',
|
|
57
|
+
value: requireString,
|
|
58
|
+
raw: `"${requireString}"`,
|
|
59
|
+
},
|
|
60
|
+
],
|
|
70
61
|
optional: false,
|
|
71
62
|
},
|
|
72
63
|
operator: '+',
|
package/src/utils.ts
CHANGED
|
@@ -6,7 +6,11 @@
|
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
import logger from '@docusaurus/logger';
|
|
9
|
-
import {
|
|
9
|
+
import {
|
|
10
|
+
createAssetRequest,
|
|
11
|
+
escapePath,
|
|
12
|
+
type WebpackCompilerName,
|
|
13
|
+
} from '@docusaurus/utils';
|
|
10
14
|
import {getProcessor, type SimpleProcessorResult} from './processor';
|
|
11
15
|
import {validateMDXFrontMatter} from './frontMatter';
|
|
12
16
|
import preprocessor from './preprocessor';
|
|
@@ -20,13 +24,7 @@ import type {Options} from './options';
|
|
|
20
24
|
*
|
|
21
25
|
* `{image: "./myImage.png"}` => `{image: require("./myImage.png")}`
|
|
22
26
|
*/
|
|
23
|
-
export function createAssetsExportCode({
|
|
24
|
-
assets,
|
|
25
|
-
inlineMarkdownAssetImageFileLoader,
|
|
26
|
-
}: {
|
|
27
|
-
assets: unknown;
|
|
28
|
-
inlineMarkdownAssetImageFileLoader: string;
|
|
29
|
-
}): string {
|
|
27
|
+
export function createAssetsExportCode({assets}: {assets: unknown}): string {
|
|
30
28
|
if (
|
|
31
29
|
typeof assets !== 'object' ||
|
|
32
30
|
!assets ||
|
|
@@ -47,10 +45,11 @@ export function createAssetsExportCode({
|
|
|
47
45
|
// We could enhance this logic and check if file exists on disc?
|
|
48
46
|
if (typeof assetValue === 'string' && assetValue.startsWith('./')) {
|
|
49
47
|
// TODO do we have other use-cases than image assets?
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
48
|
+
const request = createAssetRequest({
|
|
49
|
+
assetPath: escapePath(assetValue),
|
|
50
|
+
type: 'image-file',
|
|
51
|
+
});
|
|
52
|
+
return `require("${request}")`;
|
|
54
53
|
}
|
|
55
54
|
return undefined;
|
|
56
55
|
}
|