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

chore(deps-dev): bump prettier from 2.8.8 to 3.0.0 #1730

Merged
merged 2 commits into from
Jul 6, 2023
Merged

chore(deps-dev): bump prettier from 2.8.8 to 3.0.0 #1730

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
49f1054
chore(deps-dev): bump prettier from 2.8.8 to 3.0.0
dependabot[bot] Jul 5, 2023
a45ae41
fix: apply prettier-3.0 formatter
svor Jul 6, 2023
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"eslint-plugin-no-unsanitized": "^4.0.2",
"import-sort-style-eslint": "^6.0.0",
"jest": "^29.6.0",
"prettier": "^2.8.8",
"prettier": "^3.0.0",
"prettier-plugin-import-sort": "^0.0.7",
"rimraf": "^5.0.1",
"ts-jest": "^29.1.1",
Expand Down
2 changes: 1 addition & 1 deletion tools/build/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"if-env": "^1.0.4",
"import-sort-style-eslint": "^6.0.0",
"jest": "^29.6.0",
"prettier": "^2.8.8",
"prettier": "^3.0.0",
"prettier-plugin-import-sort": "^0.0.7",
"rimraf": "^5.0.1",
"ts-jest": "^29.1.1",
Expand Down
10 changes: 5 additions & 5 deletions tools/build/src/build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export class Build {
cheEditorsYaml.editors.map(async (cheEditorYaml: CheEditorYaml) => {
const cheEditorMetaInfo: CheEditorMetaInfo = { ...cheEditorYaml };
return cheEditorMetaInfo;
})
}),
);

return cheEditors;
Expand All @@ -101,7 +101,7 @@ export class Build {
if (promise) {
promise.then(
() => task.success(),
() => task.error()
() => task.error(),
);
}
return promise;
Expand All @@ -113,7 +113,7 @@ export class Build {
const cheEditors = await this.wrapIntoTask('Analyze che-editors.yaml file', this.analyzeCheEditorsYaml());
const cheEditorsMetaYaml = await this.wrapIntoTask(
'Compute meta.yaml for che-editors',
this.cheEditorsMetaYamlGenerator.compute(cheEditors)
this.cheEditorsMetaYamlGenerator.compute(cheEditors),
);

const computedYamls = [...cheEditorsMetaYaml];
Expand All @@ -123,7 +123,7 @@ export class Build {
// update all images to use digest instead of tags
allMetaYamls = await this.wrapIntoTask(
'Update tags by digests for OCI images',
this.digestImagesHelper.updateImages(computedYamls)
this.digestImagesHelper.updateImages(computedYamls),
);
}

Expand All @@ -133,7 +133,7 @@ export class Build {
// generate v3/plugins folder
const generatedYamls = await this.wrapIntoTask(
'Write meta.yamls in v3/plugins folder',
this.metaYamlWriter.write(allMetaYamls)
this.metaYamlWriter.write(allMetaYamls),
);

// generate index.json
Expand Down
2 changes: 1 addition & 1 deletion tools/build/src/editor/che-editors-meta-yaml-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export class CheEditorsMetaYamlGenerator {
spec,
skipMetaYaml,
} as MetaYamlPluginInfo;
})
}),
);

return metaYamlPluginInfos;
Expand Down
10 changes: 5 additions & 5 deletions tools/build/src/meta-yaml/digest-images-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,20 @@ export class DigestImagesHelper {
if (spec.containers) {
await Promise.all(
spec.containers.map(
async container => (container.image = await this.registryHelper.getImageDigest(container.image))
)
async container => (container.image = await this.registryHelper.getImageDigest(container.image)),
),
);
}
if (spec.initContainers) {
await Promise.all(
spec.initContainers.map(
async container => (container.image = await this.registryHelper.getImageDigest(container.image))
)
async container => (container.image = await this.registryHelper.getImageDigest(container.image)),
),
);
}
}
return plugin;
})
}),
);
}
}
4 changes: 2 additions & 2 deletions tools/build/src/meta-yaml/meta-yaml-writer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,10 @@ export class MetaYamlWriter {
const devfileYamlString = jsyaml.dump(devfileYaml, { noRefs: true, lineWidth: -1 });
promises.push(fs.writeFile(devfilePath, devfileYamlString));
}
})
}),
);
return Promise.all(promises);
})
}),
);
return metaYamlPluginGenerated;
}
Expand Down
2 changes: 1 addition & 1 deletion tools/build/src/registry/registry-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export class RegistryHelper {
// do not grab digest of an image that is being published (if tag contains the current sha1)
if (dockerImageName.tag && dockerImageName.tag.includes(this.shortSha1)) {
console.log(
`Do not fetch digest for ${imageName} as the tag ${dockerImageName.tag} includes the current sha1 ${this.shortSha1}`
`Do not fetch digest for ${imageName} as the tag ${dockerImageName.tag} includes the current sha1 ${this.shortSha1}`,
);
return imageName;
}
Expand Down
2 changes: 1 addition & 1 deletion tools/build/tests/editor/che-editor-meta-yaml-generator.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ describe('Test ChePluginsMetaYamlGenerator', () => {
const cheEditorMetaInfo = await generateEditorMetaInfo('my/incomplete');
const cheEditorMetaInfos: CheEditorMetaInfo[] = [cheEditorMetaInfo];
await expect(cheEditorsMetaYamlGenerator.compute(cheEditorMetaInfos)).rejects.toThrow(
'is not composed of 3 parts separated by /'
'is not composed of 3 parts separated by /',
);
});

Expand Down
16 changes: 8 additions & 8 deletions tools/build/tests/meta-yaml/meta-yaml-writer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ describe('Test MetaYamlWriter', () => {

expect(fsCopyFileSpy).toHaveBeenCalledWith(
'/fake-dir/icon.png',
'/fake-output/v3/images/my-publisher-my-name-icon.png'
'/fake-output/v3/images/my-publisher-my-name-icon.png',
);
expect(fsEnsureDirSpy).toHaveBeenNthCalledWith(1, '/fake-output/v3/plugins');
expect(fsEnsureDirSpy).toHaveBeenNthCalledWith(2, '/fake-output/v3/images');
Expand All @@ -110,7 +110,7 @@ spec:
expect(fsWriteFileSpy).toHaveBeenNthCalledWith(
1,
'/fake-output/v3/plugins/custom-publisher/custom-name/latest/meta.yaml',
content
content,
);

// check that alias is also being written (and alias is deprecated)
Expand All @@ -121,7 +121,7 @@ spec:
expect(fsWriteFileSpy).toHaveBeenNthCalledWith(
2,
'/fake-output/v3/plugins/first/alias/latest/meta.yaml',
aliasContent
aliasContent,
);
});

Expand All @@ -145,7 +145,7 @@ spec:
expect(fsEnsureDirSpy).toHaveBeenNthCalledWith(3, '/fake-output/v3/resources');
expect(fsEnsureDirSpy).toHaveBeenNthCalledWith(
4,
'/fake-output/v3/plugins/custom-publisher/custom-name/my-version'
'/fake-output/v3/plugins/custom-publisher/custom-name/my-version',
);
// icon is the default one
const content = `apiVersion: v2
Expand All @@ -169,7 +169,7 @@ spec:
expect(fsWriteFileSpy).toHaveBeenNthCalledWith(
1,
'/fake-output/v3/plugins/custom-publisher/custom-name/my-version/meta.yaml',
content
content,
);
// no version written with disable Latest
expect(fsWriteFileSpy).toHaveBeenCalledTimes(1);
Expand Down Expand Up @@ -229,7 +229,7 @@ spec:
expect(fsWriteFileSpy).toHaveBeenNthCalledWith(
1,
'/fake-output/v3/plugins/foo/bar/latest/devfile.yaml',
'devfileFakeResult: dummy\n'
'devfileFakeResult: dummy\n',
);
});

Expand Down Expand Up @@ -271,7 +271,7 @@ spec:
expect(fsWriteFileSpy).toHaveBeenNthCalledWith(
2,
'/fake-output/v3/plugins/foo/bar/latest/devfile.yaml',
'devfileFakeResult: dummy\n'
'devfileFakeResult: dummy\n',
);
});

Expand Down Expand Up @@ -320,7 +320,7 @@ spec:
expect(fsWriteFileSpy).toHaveBeenNthCalledWith(
2,
'/fake-output/v3/plugins/foo/bar/latest/devfile.yaml',
'devfileFakeResult: dummy\n'
'devfileFakeResult: dummy\n',
);
});
});
8 changes: 4 additions & 4 deletions tools/build/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4378,10 +4378,10 @@ prettier-plugin-import-sort@^0.0.7:
import-sort-parser-babylon "^6.0.0"
import-sort-parser-typescript "^6.0.0"

prettier@^2.8.8:
version "2.8.8"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
prettier@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.0.tgz#e7b19f691245a21d618c68bc54dc06122f6105ae"
integrity sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==

pretty-format@^29.0.0, pretty-format@^29.5.0:
version "29.5.0"
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4378,10 +4378,10 @@ prettier-plugin-import-sort@^0.0.7:
import-sort-parser-babylon "^6.0.0"
import-sort-parser-typescript "^6.0.0"

prettier@^2.8.8:
version "2.8.8"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
prettier@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.0.tgz#e7b19f691245a21d618c68bc54dc06122f6105ae"
integrity sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==

pretty-format@^29.0.0, pretty-format@^29.5.0:
version "29.5.0"
Expand Down