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

Align integration to work with self-service for premium features. #454

Merged
merged 1 commit into from
Nov 13, 2024

Conversation

Mati365
Copy link
Member

@Mati365 Mati365 commented Nov 4, 2024

Suggested merge commit message (convention)

Feature: Align integration to work with self-service for premium features.


Additional information

More details: ckeditor/ckeditor5#17317

@Mati365 Mati365 force-pushed the editor-integration/angular/add-usage-data branch from 0a5fd5a to 7036f06 Compare November 4, 2024 13:47
@Mati365 Mati365 requested review from arkflpc and pomek November 4, 2024 13:47
@coveralls
Copy link

coveralls commented Nov 4, 2024

Pull Request Test Coverage Report for Build 80309925-b790-4fc6-ae21-adaf81440a58

Details

  • 6 of 6 (100.0%) changed or added relevant lines in 3 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 100.0%

Totals Coverage Status
Change from base Build e62939bb-7648-41a5-a87b-f8d6d81de556: 0.0%
Covered Lines: 164
Relevant Lines: 164

💛 - Coveralls

arkflpc
arkflpc previously approved these changes Nov 12, 2024
@Mati365 Mati365 force-pushed the editor-integration/angular/add-usage-data branch from 96ff89d to 037d1b8 Compare November 12, 2024 15:21
@pomek pomek requested review from psmyrek and removed request for pomek November 12, 2024 15:27
arkflpc
arkflpc previously approved these changes Nov 12, 2024
Copy link
Collaborator

@psmyrek psmyrek left a comment

Choose a reason for hiding this comment

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

Script for preparing the release (yarn release:prepare-packages) modifies one file outside the release directory:

$ git status
On branch editor-integration/angular/add-usage-data
Your branch is up to date with 'origin/editor-integration/angular/add-usage-data'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   src/ckeditor/package.json

no changes added to commit (use "git add" and/or "git commit -a")

Also, in the generated release directory, there are two package.json files:

  • release/ckeditor5-angular/package.json
  • release/ckeditor5-angular/esm2022/package.json

Is it expected?

obraz

@Mati365
Copy link
Member Author

Mati365 commented Nov 13, 2024

@psmyrek 🤔 I'll check that.

edit: You are right, that esm2022/package.json file should not be there, I'll fix that.

@Mati365 Mati365 force-pushed the editor-integration/angular/add-usage-data branch from 7043c63 to 970b9af Compare November 13, 2024 08:28
@Mati365
Copy link
Member Author

Mati365 commented Nov 13, 2024

@psmyrek This package.json was used by ESM import to determine version of integration. You are correct, we can get rid of it, as it may be problematic in older installations. I updated the release script, as it's quite hard to import environment files without compiler changes, and replaced the version during the release process. It minimizes amount of changes in deployment flow. Can you take a look again?

@Mati365 Mati365 requested a review from psmyrek November 13, 2024 08:31
Copy link
Collaborator

@psmyrek psmyrek left a comment

Choose a reason for hiding this comment

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

LGTM 🎉

@Mati365 Mati365 merged commit 2833d50 into master Nov 13, 2024
5 checks passed
@Mati365 Mati365 deleted the editor-integration/angular/add-usage-data branch November 13, 2024 09:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants