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.

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

Separate addon and test app with into Monorepo #907

Merged
merged 7 commits into from
Oct 20, 2023

Conversation

vstefanovic97
Copy link

No description provided.

Copy link
Collaborator

@SergeAstapov SergeAstapov left a comment

Choose a reason for hiding this comment

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

this is great first step toward v2 addon conversion!

test-app/package.json Show resolved Hide resolved
@SergeAstapov
Copy link
Collaborator

looks great! I'll let @elwayman02 weigh in if any concerns, otherwise merge by EOD tomorrow.

@@ -38,7 +38,6 @@ module.exports = {
'./testem.js',
'./blueprints/*/index.js',
'./config/**/*.js',
'./tests/dummy/config/**/*.js',
Copy link
Owner

Choose a reason for hiding this comment

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

Does this file still need the "test fles" section on lines 51-58?

Copy link
Collaborator

Choose a reason for hiding this comment

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

@elwayman02 we indeed do not need. Also there bunch of other things that could be cleaned up, but my thought process is to get this land with minimal actual changes in file and focus on moving files into locations where they should be.

as next step, we'll sync test-app with latest ember-cli app blueprint and sync addon folder setup with https://github.com/embroider-build/addon-blueprint after we conver the actual addon to v2 format.

Sorry didn't communicate this plan before, hope this makes sense as with such approach we should have more or less easily reviewable PRs.

Copy link
Owner

Choose a reason for hiding this comment

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

Yup, makes sense!

Copy link
Author

Choose a reason for hiding this comment

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

@elwayman02 I removed the test file overrides

package.json Outdated
"ember-sinon"
]
"concurrently": "^8.2.1",
"@release-it-plugins/lerna-changelog": "^6.0.0"
Copy link
Owner

Choose a reason for hiding this comment

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

What's the reasoning to split up this plugin dependency from the release-it dependency?

Copy link
Collaborator

Choose a reason for hiding this comment

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

ah good catch! We indeed need to have release-it in root level package.json in devDependencies.

Copy link
Author

Choose a reason for hiding this comment

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

@SergeAstapov, @elwayman02 my mistake, it should be fixed now

},
"ember-addon": {
"after": [
"ember-sinon"
Copy link
Owner

Choose a reason for hiding this comment

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

Can you go ahead and drop this? We should have dropped it before, but we no longer rely on ember-sinon so this block is useless.

Copy link
Owner

Choose a reason for hiding this comment

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

It's also ok for this to be a follow-up, just wanted to call it out while I noticed it.

Copy link
Author

Choose a reason for hiding this comment

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

@elwayman02 I removed it

@@ -6,8 +6,8 @@
"version": "4.11.0",
"blueprints": [
{
"name": "addon",
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
"name": "app",
Copy link
Owner

Choose a reason for hiding this comment

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

Hmm, I'm not sure about this change. How exactly does ember-cli-update work with v2 addons? We still want to be able to apply the v2 addon blueprint with this config and have it affect both the addon and test-app directories.

Copy link
Collaborator

Choose a reason for hiding this comment

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

@elwayman02 this is actually correct change.
this file will be used only for test app so we could do npx ember-cli-update in the test-app folder.

for the addon and everything, there will be separate config/ember-cli-update.json file which we would be able to use to run npx ember-cli-update in the root folder (you could see the template for that file in https://github.com/embroider-build/addon-blueprint/blob/main/files/config/ember-cli-update.json)

Copy link
Owner

Choose a reason for hiding this comment

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

Ok, so this file is fine but we need to add a new config/ember-cli-update.json as well then, right?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yeap, but I would do in another PR as it would not make any sense just yet

Copy link
Owner

Choose a reason for hiding this comment

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

Yup, seems fine!

@elwayman02
Copy link
Owner

Let's fix the release-it dependency and the other 3 comments can be follow-up PR(s). This looks great, thanks for putting in the hard work!

@SergeAstapov SergeAstapov merged commit 6e52e7e into elwayman02:master Oct 20, 2023
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants