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

Upgrade command: Version prefix #1261

Closed
wants to merge 1 commit into from
Closed

Upgrade command: Version prefix #1261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions packages/cli/src/generate/file-system.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ import { dirname, join, parse } from 'path';
// 3p
import { cyan, green } from 'colors/safe';

// npm
import { PackageVersionPrefix } from './generators/upgrade/package-version-prefix';

function rmDirAndFiles(path: string) {
const files = readdirSync(path);
for (const file of files) {
Expand Down Expand Up @@ -476,13 +479,13 @@ export class FileSystem {
*
* @returns {this}
*/
setOrUpdateProjectDependency(name: string, version: string): this {
setOrUpdateProjectDependency(name: string, version: string, prefix: PackageVersionPrefix): this {
const initialCurrentDir = this.currentDir;

this.cdProjectRootDir();
const pkg = JSON.parse(readFileSync(this.parse('package.json'), 'utf8'));

pkg.dependencies[name] = version;
pkg.dependencies[name] = `${prefix}${version}`;

writeFileSync(this.parse('package.json'), JSON.stringify(pkg, null, 2));

Expand All @@ -495,9 +498,9 @@ export class FileSystem {
*
* @returns {this}
*/
setOrUpdateProjectDependencyOnlyIf(condition: boolean, name: string, version: string): this {
setOrUpdateProjectDependencyOnlyIf(condition: boolean, name: string, version: string, prefix: PackageVersionPrefix): this {
if (condition) {
this.setOrUpdateProjectDependency(name, version);
this.setOrUpdateProjectDependency(name, version, prefix);
}
return this;
}
Expand All @@ -523,13 +526,13 @@ export class FileSystem {
*
* @returns {this}
*/
setOrUpdateProjectDevDependency(name: string, version: string): this {
setOrUpdateProjectDevDependency(name: string, version: string, prefix: PackageVersionPrefix): this {
const initialCurrentDir = this.currentDir;

this.cdProjectRootDir();
const pkg = JSON.parse(readFileSync(this.parse('package.json'), 'utf8'));

pkg.devDependencies[name] = version;
pkg.devDependencies[name] = `${prefix}${version}`;

writeFileSync(this.parse('package.json'), JSON.stringify(pkg, null, 2));

Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/generate/generators/app/create-app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export async function createApp({ name, autoInstall, initRepo, mongodb = false,
.copy('app/gitignore', '.gitignore')
.renderOnlyIf(!mongodb, 'app/package.json', 'package.json', locals)
.renderOnlyIf(mongodb, 'app/package.mongodb.json', 'package.json', locals)
.setOrUpdateProjectDependencyOnlyIf(yaml, 'yamljs', '~0.3.0')
.setOrUpdateProjectDependencyOnlyIf(yaml, 'yamljs', '0.3.0', '~')
.copy('app/tsconfig.app.json', 'tsconfig.app.json')
.copy('app/tsconfig.e2e.json', 'tsconfig.e2e.json')
.copy('app/tsconfig.json', 'tsconfig.json')
Expand Down
1 change: 1 addition & 0 deletions packages/cli/src/generate/generators/upgrade/package-version-prefix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export type PackageVersionPrefix = '' | '^' | '~';
12 changes: 6 additions & 6 deletions packages/cli/src/generate/generators/upgrade/upgrade.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ describe('upgrade', () => {

const actualDependencies = fs.getProjectDependencies();
const expectedDependencies = [
{ name: '@foal/core', version: '3.0.0' },
{ name: '@foal/foobar', version: '3.0.0' },
{ name: '@foal/core', version: '^3.0.0' },
{ name: '@foal/foobar', version: '^3.0.0' },
{ name: 'another-dependency', version: '^1.0.0' }
];
deepStrictEqual(actualDependencies, expectedDependencies);
Expand All @@ -34,7 +34,7 @@ describe('upgrade', () => {

const actualDevDependencies = fs.getProjectDevDependencies();
const expectedDevDependencies = [
{ name: '@foal/cli', version: '3.0.0' },
{ name: '@foal/cli', version: '^3.0.0' },
{ name: 'another-dependency2', version: '^2.0.0' }
];
deepStrictEqual(actualDevDependencies, expectedDevDependencies);
Expand All @@ -50,8 +50,8 @@ describe('upgrade', () => {

const actualDependencies = fs.getProjectDependencies();
const expectedDependencies = [
{ name: '@foal/core', version: '3.0.0' },
{ name: '@foal/foobar', version: '3.0.0' },
{ name: '@foal/core', version: '^3.0.0' },
{ name: '@foal/foobar', version: '^3.0.0' },
{ name: 'another-dependency', version: '^1.0.0' }
];
deepStrictEqual(actualDependencies, expectedDependencies);
Expand All @@ -65,7 +65,7 @@ describe('upgrade', () => {

const actualDevDependencies = fs.getProjectDevDependencies();
const expectedDevDependencies = [
{ name: '@foal/cli', version: '3.0.0' },
{ name: '@foal/cli', version: '^3.0.0' },
{ name: 'another-dependency2', version: '^2.0.0' }
];
deepStrictEqual(actualDevDependencies, expectedDevDependencies);
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/generate/generators/upgrade/upgrade.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ export async function upgrade(
const dependencies = fs.getProjectDependencies();
for (const dependency of dependencies) {
if (dependency.name.startsWith('@foal/')) {
fs.setOrUpdateProjectDependency(dependency.name, version);
fs.setOrUpdateProjectDependency(dependency.name, version, '^');
}
}

const devDependencies = fs.getProjectDevDependencies();
for (const devDependency of devDependencies) {
if (devDependency.name.startsWith('@foal/')) {
fs.setOrUpdateProjectDevDependency(devDependency.name, version);
fs.setOrUpdateProjectDevDependency(devDependency.name, version, '^');
}
}

Expand Down
Loading