Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
"private": true,
"license": "MIT",
"scripts": {
"build": "rimraf ./export && cross-env NODE_ENV=production next build && pnpm build-sw",
"build:adapter-dependencies": "tsx ../scripts/buildPickerAdapterDeps.ts",
"build": "rimraf ./export && pnpm build:adapter-dependencies && cross-env NODE_ENV=production next build && pnpm build-sw",
"build:clean": "rimraf .next && pnpm build",
"build-sw": "node ./scripts/buildServiceWorker.js",
"dev": "next dev --port 3001",
"dev": "pnpm build:adapter-dependencies && next dev --port 3001",
"deploy": "git push -f upstream master:docs-v8",
"icons": "rimraf public/static/icons/* && node ./scripts/buildIcons.js",
"serve": "serve ./export -l 3010",
Expand Down
9 changes: 9 additions & 0 deletions docs/src/modules/utils/adapter-dependencies.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"date-fns": "4.1.0",
"date-fns-jalali": "4.1.0-0",
"dayjs": "1.11.13",
"luxon": "3.6.1",
"moment": "2.30.1",
"moment-hijri": "3.0.0",
"moment-jalaali": "0.10.4"
}
9 changes: 4 additions & 5 deletions docs/src/modules/utils/postProcessImport.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { expect } from 'chai';
// eslint-disable-next-line import/no-relative-packages
import pickersPackageJson from '../../../../packages/x-date-pickers/package.json';
import adapterDependencies from './adapter-dependencies.json';
import { ADAPTER_TO_LIBRARY, postProcessImport } from './postProcessImport';

describe('postProcessImport', () => {
Expand All @@ -13,7 +12,7 @@ describe('postProcessImport', () => {

const expectedLibrary = ADAPTER_TO_LIBRARY[adapter];
expect(resolvedDep).to.deep.equal({
[expectedLibrary]: pickersPackageJson.devDependencies[expectedLibrary],
[expectedLibrary]: adapterDependencies[expectedLibrary],
});
});
});
Expand All @@ -32,7 +31,7 @@ describe('postProcessImport', () => {

const expectedLibrary = ADAPTER_TO_LIBRARY[adapter];
expect(resolvedDep).to.deep.equal({
[expectedLibrary]: pickersPackageJson.devDependencies[expectedLibrary],
[expectedLibrary]: adapterDependencies[expectedLibrary],
});
});
});
Expand All @@ -51,7 +50,7 @@ describe('postProcessImport', () => {

const expectedLibrary = ADAPTER_TO_LIBRARY[adapter];
expect(resolvedDep).to.deep.equal({
[expectedLibrary]: pickersPackageJson.devDependencies[expectedLibrary],
[expectedLibrary]: adapterDependencies[expectedLibrary],
});
});
});
Expand Down
7 changes: 3 additions & 4 deletions docs/src/modules/utils/postProcessImport.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// eslint-disable-next-line import/no-relative-packages
import pickersPackageJson from '../../../../packages/x-date-pickers/package.json';
import adapterDependencies from './adapter-dependencies.json';
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The previous solution was sketchy, but "worked".
Sadly, with the introduction of catalog:, static imports are no longer enough as we need to resolve or use resolved dep versions.

If you have better ideas on how to handle this case, I'm all ears, but let's not forget that this runs in Next.js docs runtime/browser, not Node. 🙈


export const ADAPTER_TO_LIBRARY: Record<string, keyof typeof pickersPackageJson.devDependencies> = {
export const ADAPTER_TO_LIBRARY: Record<string, keyof typeof adapterDependencies> = {
AdapterDateFns: 'date-fns',
AdapterDateFnsJalali: 'date-fns-jalali',
AdapterDayjs: 'dayjs',
Expand All @@ -27,7 +26,7 @@ export const postProcessImport = (importName: string): Record<string, string> |
`Can't determine required npm package for adapter '${dateAdapterMatch[1]}'`,
);
}
return { [packageName]: pickersPackageJson.devDependencies[packageName] ?? 'latest' };
return { [packageName]: adapterDependencies[packageName] ?? 'latest' };
}
return null;
};
35 changes: 35 additions & 0 deletions scripts/buildPickerAdapterDeps.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import childProcess from 'node:child_process';
import path from 'node:path';
import * as fse from 'fs-extra';

interface ListedDependency {
name: string;
devDependencies?: {
[key: string]: {
version: string;
};
};
}

const adapterLibs = childProcess.execSync(
'pnpm list date-fns date-fns-jalali dayjs luxon moment moment-hijri moment-jalaali --json',
{ cwd: path.resolve(__dirname, '../packages/x-date-pickers') },
);
const jsonListedDependencies: ListedDependency[] = JSON.parse(adapterLibs.toString());
const adapterDependencyMap = Object.entries(jsonListedDependencies[0].devDependencies).reduce(
(result, [libraryName, libraryInfo]) => {
result[libraryName] = libraryInfo.version;
return result;
},
{},
);
try {
fse.writeJSON(
path.resolve(__dirname, '../docs/src/modules/utils/adapter-dependencies.json'),
adapterDependencyMap,
{ encoding: 'utf8' },
);
} catch (error) {
console.error('Error writing adapter dependencies:', error);
process.exit(1);
}