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

Jump to bottom

fix(react): migrations should not crash when adding development configuration #10261

Merged
merged 2 commits into from
May 12, 2022
Merged

fix(react): migrations should not crash when adding development configuration #10261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cd0528
fix(react): handle creation of development configuration when missing…
john-waitforit May 12, 2022
c8c63b4
fix(nextjs): handle creation of development configuration when missin…
john-waitforit May 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 37 additions & 0 deletions packages/next/src/migrations/update-14-0-0/add-default-development-configurations.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,43 @@ describe('React default development configuration', () => {
});
});

it('should add development configuration if no configurations at all', async () => {
const tree = createTreeWithEmptyWorkspace(2);
addProjectConfiguration(
tree,
'example',
{
root: 'apps/example',
projectType: 'application',
targets: {
build: {
executor: '@nrwl/next:build',
defaultConfiguration: 'production',
configurations: { production: {} },
},
serve: {
executor: '@nrwl/next:server',
},
},
},
true
);

await update(tree);

const config = readProjectConfiguration(tree, 'example');

expect(config.targets.build.defaultConfiguration).toEqual('production');
expect(config.targets.build.configurations.production).toEqual({});
expect(config.targets.build.configurations.development).toEqual({});

expect(config.targets.serve.defaultConfiguration).toEqual('development');
expect(config.targets.serve.configurations.development).toEqual({
buildTarget: `example:build:development`,
dev: true,
});
});

it('should work without targets', async () => {
const tree = createTreeWithEmptyWorkspace(2);
addProjectConfiguration(
Expand Down
2 changes: 2 additions & 0 deletions packages/next/src/migrations/update-14-0-0/add-default-development-configurations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ export async function update(tree: Tree) {
if (config.targets?.build?.executor === '@nrwl/next:build') {
shouldUpdate = true;
config.targets.build.defaultConfiguration ??= 'production';
config.targets.build.configurations ??= {};
config.targets.build.configurations.development ??= {};
}

if (config.targets?.serve?.executor === '@nrwl/next:server') {
shouldUpdate = true;
config.targets.serve.defaultConfiguration ??= 'development';
config.targets.serve.configurations ??= {};
config.targets.serve.configurations.development ??= {
buildTarget: `${name}:build:development`,
dev: true,
Expand Down
43 changes: 43 additions & 0 deletions packages/react/src/migrations/update-14-0-0/add-default-development-configurations.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,49 @@ describe('React default development configuration', () => {
});
});

it('should add development configuration if no configurations at all', async () => {
const tree = createTreeWithEmptyWorkspace(2);
addProjectConfiguration(
tree,
'example',
{
root: 'apps/example',
projectType: 'application',
targets: {
build: {
executor: '@nrwl/web:webpack',
defaultConfiguration: 'production',
configurations: { production: { sourceMap: false } },
},
serve: {
executor: '@nrwl/web:dev-server',
},
},
},
true
);

await update(tree);

const config = readProjectConfiguration(tree, 'example');

expect(config.targets.build.defaultConfiguration).toEqual('production');
expect(config.targets.build.configurations.production).toEqual({
sourceMap: false,
});
expect(config.targets.build.configurations.development).toEqual({
extractLicenses: false,
optimization: false,
sourceMap: true,
vendorChunk: true,
});

expect(config.targets.serve.defaultConfiguration).toEqual('development');
expect(config.targets.serve.configurations.development).toEqual({
buildTarget: `example:build:development`,
});
});

it('should work without targets', async () => {
const tree = createTreeWithEmptyWorkspace(2);
addProjectConfiguration(
Expand Down
2 changes: 2 additions & 0 deletions packages/react/src/migrations/update-14-0-0/add-default-development-configurations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export async function update(tree: Tree) {
if (config.targets?.build?.executor === '@nrwl/web:webpack') {
shouldUpdate = true;
config.targets.build.defaultConfiguration ??= 'production';
config.targets.build.configurations ??= {};
config.targets.build.configurations.development ??= {
extractLicenses: false,
optimization: false,
Expand All @@ -24,6 +25,7 @@ export async function update(tree: Tree) {
if (config.targets?.serve?.executor === '@nrwl/web:dev-server') {
shouldUpdate = true;
config.targets.serve.defaultConfiguration ??= 'development';
config.targets.serve.configurations ??= {};
config.targets.serve.configurations.development ??= {
buildTarget: `${name}:build:development`,
};
Expand Down