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

Move more files to the files-override/shared folder #99

Merged
merged 4 commits into from
Oct 7, 2024
Merged

Move more files to the files-override/shared folder #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ab0eb1
Move files we want to share between js and ts to the shared files-ove…
NullVoxPopuli Oct 4, 2024
a935767
Prettier bug related to quoting, I think -- we don't want double quot…
NullVoxPopuli Oct 4, 2024
23844d2
Be sure to run copyWithTemplate on the shared directory
NullVoxPopuli Oct 4, 2024
39dec37
Update .prettierrc.cjs
NullVoxPopuli Oct 7, 2024
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
0 files-override/js/.gitignore → files-override/shared/.gitignore
View file
Open in desktop
File renamed without changes.
9 changes: 7 additions & 2 deletions files-override/shared/.prettierrc.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,20 @@

module.exports = {
plugins: ['prettier-plugin-ember-template-tag'],
singleQuote: true,
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

foreshadowing https://github.com/embroider-build/app-blueprint/pull/80/files#r1783208102

Copy link
Member

Choose a reason for hiding this comment

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

can't you remove all the other places in this file that change singleQuote to true in the overrides now that this is setting it as the default?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Hope so 😅

overrides: [
{
files: ['*.js', '*.ts', '*.cjs', '.mjs', '.cts', '.mts', '.cts'],
options: {
singleQuote: true,
trailingComma: 'es5',
},
},
{
files: ['*.html'],
options: {
singleQuote: false,
},
},
{
files: ['*.json'],
options: {
Expand All @@ -25,7 +31,6 @@ module.exports = {
{
files: ['*.gjs', '*.gts'],
options: {
singleQuote: true,
templateSingleQuote: false,
trailingComma: 'es5',
},
Expand Down
0 files/js/app/config/environment.js → ...override/shared/app/config/environment.js
View file
Open in desktop
File renamed without changes.
0 files-override/js/ember-cli-build.js → files-override/shared/ember-cli-build.js
View file
Open in desktop
File renamed without changes.
0 files/js/index.html → files-override/shared/index.html
View file
Open in desktop
File renamed without changes.
0 files-override/js/testem.js → files-override/shared/testem.js
View file
Open in desktop
File renamed without changes.
0 files-override/js/tests/index.html → files-override/shared/tests/index.html
View file
Open in desktop
File renamed without changes.
0 files/js/vite.config.mjs → files-override/shared/vite.config.mjs
View file
Open in desktop
File renamed without changes.
6 changes: 6 additions & 0 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@ module.exports = {

// there doesn't seem to be a way to tell ember-cli to not prompt to override files that were added in the beforeInstall
// so I'm just copying a few over at this stage
copyWithTemplate(
join(__dirname, 'files-override/shared'),
options.target,
options,
);

copyWithTemplate(
join(__dirname, 'files-override/js'),
options.target,
Expand Down