miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

fix(nextjs): codesplit buildable next libs (#7717)

Browse Source
This commit is contained in:
Kirils L 2021-11-22 16:40:14 +02:00 committed by GitHub
parent f6289beff6
commit 3d7b909af7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
e2e/react/src/react-package.test.ts
View File

@ -110,11 +110,11 @@ describe('Build React libraries and apps', () => {
runCLI(`build ${childLib}`);
runCLI(`build ${childLib2}`);
checkFilesExist(`dist/libs/${childLib}/${childLib}.esm.js`);
checkFilesExist(`dist/libs/${childLib}/${childLib}.umd.js`);
checkFilesExist(`dist/libs/${childLib}/index.esm.js`);
checkFilesExist(`dist/libs/${childLib}/index.umd.js`);
checkFilesExist(`dist/libs/${childLib2}/${childLib2}.esm.js`);
checkFilesExist(`dist/libs/${childLib2}/${childLib2}.umd.js`);
checkFilesExist(`dist/libs/${childLib2}/index.esm.js`);
checkFilesExist(`dist/libs/${childLib2}/index.umd.js`);
checkFilesExist(`dist/libs/${childLib}/assets/hello.txt`);
checkFilesExist(`dist/libs/${childLib2}/README.md`);
@ -124,8 +124,8 @@ describe('Build React libraries and apps', () => {
*/
runCLI(`build ${parentLib}`);
checkFilesExist(`dist/libs/${parentLib}/${parentLib}.esm.js`);
checkFilesExist(`dist/libs/${parentLib}/${parentLib}.umd.js`);
checkFilesExist(`dist/libs/${parentLib}/index.esm.js`);
checkFilesExist(`dist/libs/${parentLib}/index.umd.js`);
const jsonFile = readJson(`dist/libs/${parentLib}/package.json`);
expect(jsonFile.peerDependencies).toEqual(
@ -142,9 +142,9 @@ describe('Build React libraries and apps', () => {
runCLI(`build ${parentLib} --with-deps --skip-nx-cache`);
checkFilesExist(`dist/libs/${parentLib}/${parentLib}.esm.js`);
checkFilesExist(`dist/libs/${childLib}/${childLib}.esm.js`);
checkFilesExist(`dist/libs/${childLib2}/${childLib2}.esm.js`);
checkFilesExist(`dist/libs/${parentLib}/index.esm.js`);
checkFilesExist(`dist/libs/${childLib}/index.esm.js`);
checkFilesExist(`dist/libs/${childLib2}/index.esm.js`);
});
it('should support --format option', () => {
@ -159,18 +159,18 @@ export async function h() { return 'c'; }
runCLI(`build ${childLib} --format cjs,esm,umd`);
checkFilesExist(`dist/libs/${childLib}/${childLib}.cjs.js`);
checkFilesExist(`dist/libs/${childLib}/${childLib}.esm.js`);
checkFilesExist(`dist/libs/${childLib}/${childLib}.umd.js`);
checkFilesExist(`dist/libs/${childLib}/index.cjs.js`);
checkFilesExist(`dist/libs/${childLib}/index.esm.js`);
checkFilesExist(`dist/libs/${childLib}/index.umd.js`);
const cjsPackageSize = getSize(
tmpProjPath(`dist/libs/${childLib}/${childLib}.cjs.js`)
tmpProjPath(`dist/libs/${childLib}/index.cjs.js`)
);
const esmPackageSize = getSize(
tmpProjPath(`dist/libs/${childLib}/${childLib}.esm.js`)
tmpProjPath(`dist/libs/${childLib}/index.esm.js`)
);
const umdPackageSize = getSize(
tmpProjPath(`dist/libs/${childLib}/${childLib}.umd.js`)
tmpProjPath(`dist/libs/${childLib}/index.umd.js`)
);
// This is a loose requirement that ESM and CJS packages should be less than the UMD counterpart.
@ -220,7 +220,7 @@ export async function h() { return 'c'; }
// What we're testing
runCLI(`build ${myLib}`);
// Assertion
const content = readFile(`dist/libs/${myLib}/${myLib}.esm.js`);
const content = readFile(`dist/libs/${myLib}/index.esm.js`);
/**
* Then check if the result contains this "promise" polyfill?

4
e2e/workspace-integrations/src/workspace.test.ts
View File

@ -811,7 +811,7 @@ describe('cache', () => {
};
config.targets.build = {
executor: '@nrwl/workspace:run-commands',
outputs: [`dist/libs/${mylib1}/${mylib1}.esm.js`],
outputs: [`dist/libs/${mylib1}/index.esm.js`],
options: {
commands: [
{
@ -836,7 +836,7 @@ describe('cache', () => {
expect(outputWithBuildTasksCached).toContain('from cache');
expectCached(outputWithBuildTasksCached, [mylib1]);
// Ensure that only the specific file in outputs was copied to cache
expect(listFiles(`dist/libs/${mylib1}`)).toEqual([`${mylib1}.esm.js`]);
expect(listFiles(`dist/libs/${mylib1}`)).toEqual([`index.esm.js`]);
}, 120000);
function expectCached(

10
packages/web/src/executors/package/package.impl.spec.ts
View File

@ -46,16 +46,22 @@ describe('packageExecutor', () => {
expect(result.map((x) => x.output)).toEqual([
{
file: '/root/dist/ui/example.esm.js',
dir: '/root/dist/ui',
format: 'esm',
globals: { 'react/jsx-runtime': 'jsxRuntime' },
name: 'Example',
inlineDynamicImports: false,
chunkFileNames: '[name].esm.js',
entryFileNames: '[name].esm.js',
},
{
file: '/root/dist/ui/example.umd.js',
dir: '/root/dist/ui',
format: 'umd',
globals: { 'react/jsx-runtime': 'jsxRuntime' },
name: 'Example',
inlineDynamicImports: true,
chunkFileNames: '[name].umd.js',
entryFileNames: '[name].umd.js',
},
]);
});

8
packages/web/src/executors/package/package.impl.ts
View File

@ -240,8 +240,12 @@ export function createRollupOptions(
output: {
globals,
format,
file: `${options.outputPath}/${context.projectName}.${format}.js`,
dir: `${options.outputPath}`,
name: options.umdName || names(context.projectName).className,
entryFileNames: `[name].${format}.js`,
chunkFileNames: `[name].${format}.js`,
// umd doesn't support code-split bundles
inlineDynamicImports: format === 'umd',
},
external: (id) =>
externalPackages.some(
@ -286,7 +290,7 @@ function updatePackageJson(
dependencies: DependentBuildableProjectNode[],
packageJson: any
) {
const entryFileTmpl = `./${context.projectName}.<%= extension %>.js`;
const entryFileTmpl = `./index.<%= extension %>.js`;
const typingsFile = relative(options.entryRoot, options.entryFile).replace(
/\.[jt]sx?$/,
'.d.ts'