-
Notifications
You must be signed in to change notification settings - Fork 88
[WIP] Modernise ember-leaflet #704
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
Closed
MichalBryxi
wants to merge
18
commits into
miguelcobain:master
from
MichalBryxi:mb/hotfixes-from-abefordisc
Closed
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
1f3059c
fix: Bump dependencies & package index file
MichalBryxi 7a7040c
fix: Bump ember-source compatibility
MichalBryxi df0c2ed
fix: Bring in @embroider/util
MichalBryxi bc45136
fix: Bump node version requirement
MichalBryxi 8de459c
chore: npm install
MichalBryxi aa05349
fix: Bump ember-cli-addon-docs to solve @ember/string compat issues
MichalBryxi 6dd05ac
fix: All peerDependency issues resolved
MichalBryxi 4bc36c6
fix: This directory is necessary for ember-try
MichalBryxi 38d2a9d
fix: Needed ember-inflector
MichalBryxi ebd1495
fix: Testem was not detected
MichalBryxi 96cb2df
fix: Downgrade ember-qunit to not introduce more incompatibilities
MichalBryxi f4193f3
fix: ember-router-scroll
MichalBryxi 3b1b741
tmp: Keep this
MichalBryxi be02dd3
v4.12.1...v5.12.0
MichalBryxi 2804195
fix: Something triggered this?
MichalBryxi a4066ae
fix: Add sharp
MichalBryxi e0dc2f0
fix: pnpm build dependencies
MichalBryxi 0cef031
fix: Bump version of node
MichalBryxi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,14 @@ | ||
| # unconventional js | ||
| /blueprints/*/files/ | ||
| /vendor/ | ||
|
|
||
| # compiled output | ||
| /declarations/ | ||
| /dist/ | ||
| /tmp/ | ||
|
|
||
| # dependencies | ||
| /bower_components/ | ||
| /node_modules/ | ||
|
|
||
| # misc | ||
| /coverage/ | ||
| !.* | ||
| .*/ | ||
| .eslintcache | ||
|
|
||
| # ember-try | ||
| /.node_modules.ember-try/ | ||
| /bower.json.ember-try | ||
| /npm-shrinkwrap.json.ember-try | ||
| /package.json.ember-try | ||
| /package-lock.json.ember-try | ||
| /yarn.lock.ember-try |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,62 +7,64 @@ on: | |
| - master | ||
| pull_request: {} | ||
|
|
||
| env: | ||
| NODE_VERSION: 14 | ||
|
|
||
| concurrency: | ||
| group: ci-${{ github.head_ref || github.ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| test: | ||
| name: 'Tests' | ||
| name: "Tests" | ||
| runs-on: ubuntu-latest | ||
| timeout-minutes: 10 | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: pnpm/action-setup@v2 | ||
| with: | ||
| version: 8 | ||
| - name: Install Node | ||
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: ${{ env.NODE_VERSION }} | ||
| cache: npm | ||
| node-version: 18 | ||
| cache: pnpm | ||
| - name: Install Dependencies | ||
| run: npm ci | ||
| run: pnpm install --frozen-lockfile | ||
| - name: Lint | ||
| run: npm run lint | ||
| run: pnpm lint | ||
| - name: Run Tests | ||
| run: npm run test:ember | ||
| run: pnpm test:ember | ||
|
|
||
| floating: | ||
| name: 'Floating Dependencies' | ||
| name: "Floating Dependencies" | ||
| runs-on: ubuntu-latest | ||
| timeout-minutes: 10 | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: pnpm/action-setup@v2 | ||
| with: | ||
| version: 8 | ||
| - uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: ${{ env.NODE_VERSION }} | ||
| cache: npm | ||
| node-version: 18 | ||
| cache: pnpm | ||
| - name: Install Dependencies | ||
| run: npm install --no-shrinkwrap | ||
| run: pnpm install --no-lockfile | ||
| - name: Run Tests | ||
| run: npm run test:ember | ||
| run: pnpm test:ember | ||
|
|
||
| try-scenarios: | ||
| name: ${{ matrix.try-scenario }} | ||
| runs-on: ubuntu-latest | ||
| needs: 'test' | ||
| needs: "test" | ||
| timeout-minutes: 10 | ||
|
|
||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| try-scenario: | ||
| - ember-lts-3.28-leaflet-0.7.7 | ||
| - ember-lts-4.4 | ||
| - ember-lts-4.8 | ||
| - ember-lts-4.12 | ||
| - ember-lts-5.4 | ||
| - ember-release | ||
| - ember-beta | ||
| - ember-canary | ||
|
|
@@ -71,48 +73,15 @@ jobs: | |
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: pnpm/action-setup@v2 | ||
| with: | ||
| version: 8 | ||
| - name: Install Node | ||
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: ${{ env.NODE_VERSION }} | ||
| cache: npm | ||
| node-version: 18 | ||
| cache: pnpm | ||
| - name: Install Dependencies | ||
| run: npm ci | ||
| run: pnpm install --frozen-lockfile | ||
| - name: Run Tests | ||
| run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }} | ||
|
|
||
| deploy-app: | ||
| name: 'Deploy app' | ||
| runs-on: ubuntu-latest | ||
| needs: [test, floating, try-scenarios] | ||
| timeout-minutes: 7 | ||
| # Only run on pushes to the default branch | ||
| if: github.event_name == 'push' && github.ref == 'refs/heads/master' | ||
| steps: | ||
| - name: Check out a copy of the repo | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Set up Git user | ||
| run: | | ||
| # Set up a Git user for committing | ||
| git config --global user.name "GitHub Actions" | ||
| git config --global user.email "[email protected]" | ||
| # Copy the Git Auth from the local config | ||
| git config --global "http.https://github.com/.extraheader" \ | ||
| "$(git config --local --get http.https://github.com/.extraheader)" | ||
| - name: Install Node | ||
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: ${{ env.NODE_VERSION }} | ||
| cache: npm | ||
|
|
||
| - name: Install Dependencies | ||
| run: npm ci | ||
| - name: Set ENV | ||
| # 'master' or 'v1.2.3' | ||
| # https://github.com/ember-learn/ember-cli-addon-docs/issues/454#issuecomment-584129324 | ||
| # https://github.com/ember-learn/ember-cli-addon-docs/issues/437 | ||
| run: echo "ADDON_DOCS_VERSION_PATH=${GITHUB_REF##*/}" >> $GITHUB_ENV | ||
|
|
||
| - name: Deploy | ||
| run: npm run-script deploy | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,13 @@ | ||
| # unconventional js | ||
| /blueprints/*/files/ | ||
| /vendor/ | ||
|
|
||
| # compiled output | ||
| /dist/ | ||
| /tmp/ | ||
|
|
||
| # dependencies | ||
| /bower_components/ | ||
| /node_modules/ | ||
|
|
||
| # misc | ||
| /coverage/ | ||
| !.* | ||
| .eslintcache | ||
| .lint-todo/ | ||
| .*/ | ||
|
|
||
| # ember-try | ||
| /.node_modules.ember-try/ | ||
| /bower.json.ember-try | ||
| /npm-shrinkwrap.json.ember-try | ||
| /package.json.ember-try | ||
| /package-lock.json.ember-try | ||
| /yarn.lock.ember-try |
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not sure what this file is, but probably we shouldn't include files for very specific tools. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| node = "20.19.0" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| "ignore_dirs": ["tmp", "dist"] | ||
| "ignore_dirs": ["dist"] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We shouldn't remove the deploy-app job.