Skip to content

[WIP] Modernise ember-leaflet #705

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

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions .ember-cli
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
{
/**
Ember CLI sends analytics information by default. The data is completely
anonymous, but there are times when you might want to disable this behavior.

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
Expand Down
12 changes: 0 additions & 12 deletions .eslintignore
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

# 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
33 changes: 11 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,13 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Install Node
uses: actions/setup-node@v3
- uses: wyvox/action-setup-pnpm@v2
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
- name: Install Dependencies
run: npm ci
node-version: 18
- 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'
Expand All @@ -41,14 +37,12 @@ jobs:

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: wyvox/action-setup-pnpm@v2
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
- name: Install Dependencies
run: npm install --no-shrinkwrap
node-version: 18
no-lockfile: true
- name: Run Tests
run: npm run test:ember
run: pnpm test:ember

try-scenarios:
name: ${{ matrix.try-scenario }}
Expand All @@ -60,9 +54,8 @@ jobs:
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-release
- ember-beta
- ember-canary
Expand All @@ -71,13 +64,9 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Install Node
uses: actions/setup-node@v3
- uses: wyvox/action-setup-pnpm@v2
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
- name: Install Dependencies
run: npm ci
node-version: 18
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

Expand Down
9 changes: 1 addition & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/
/declarations/

# dependencies
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log
Expand All @@ -24,7 +18,6 @@

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
Expand Down
6 changes: 0 additions & 6 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
Expand All @@ -23,7 +19,6 @@
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
Expand All @@ -34,7 +29,6 @@

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
Expand Down
14 changes: 1 addition & 13 deletions .prettierignore
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
1 change: 1 addition & 0 deletions .prototools
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node = "~20.19"
2 changes: 1 addition & 1 deletion .watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
9 changes: 4 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
## Installation

* `git clone <repository-url>`
* `cd my-addon`
* `npm install`
* `cd ember-leaflet`
* `pnpm install`

## Linting

* `npm run lint:hbs`
* `npm run lint:js`
* `npm run lint:js -- --fix`
* `pnpm lint`
* `pnpm lint:fix`

## Running tests

Expand Down
67 changes: 35 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@
},
"homepage": "https://miguelcobain.github.io/ember-leaflet/",
"devDependencies": {
"@babel/eslint-parser": "^7.21.3",
"@babel/plugin-proposal-decorators": "^7.21.0",
"@babel/eslint-parser": "^7.22.15",
"@babel/plugin-proposal-decorators": "^7.23.2",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.0.1",
"@ember/test-helpers": "^2.9.3",
"@embroider/test-setup": "^2.1.1",
"@ember/test-helpers": "^3.2.0",
"@embroider/test-setup": "^3.0.2",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.0.1",
"concurrently": "^8.2.2",
"ember-auto-import": "^2.6.3",
"ember-cli": "~4.12.1",
"ember-cli-addon-docs": "^5.1.0",
"ember-cli-addon-docs-yuidoc": "^1.0.0",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli": "~5.4.2",
"ember-cli-addon-docs": "github:MichalBryxi/ember-cli-addon-docs#2e6c1a52f95d1e69fd3cfb5115b25741d22778aa",
"ember-cli-addon-docs-yuidoc": "^1.1.0",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-dependency-lint": "^2.0.1",
"ember-cli-deploy": "^2.0.0",
"ember-cli-deploy-build": "^2.0.0",
Expand All @@ -47,47 +47,50 @@
"ember-cli-sass": "^10.0.1",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-data": "~4.11.0",
"ember-data": "~5.4.1",
"ember-inflector": "5.0.0",
"ember-fetch": "^8.1.1",
"ember-leaflet-marker-cluster": "^1.1.1",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^7.0.0",
"ember-qunit": "^6.2.0",
"ember-resolver": "^10.0.0",
"ember-source": "~4.12.0",
"ember-page-title": "^8.0.0",
"ember-qunit": "^8.0.1",
"ember-resolver": "^11.0.1",
"ember-source": "~5.4.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.7.2",
"ember-template-lint": "^5.11.2",
"ember-template-lint-plugin-prettier": "^4.1.0",
"ember-try": "^2.0.0",
"eslint": "^8.37.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-ember": "^11.5.0",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.4",
"ember-try": "^3.0.0",
"eslint": "^8.52.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-ember": "^11.11.1",
"eslint-plugin-n": "^16.2.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-qunit": "^8.0.1",
"leaflet": "^1.9.4",
"loader.js": "^4.7.0",
"prettier": "^2.8.7",
"qunit": "^2.19.4",
"prettier": "^3.0.3",
"qunit": "^2.20.0",
"qunit-dom": "^2.0.0",
"sass": "^1.49.7",
"stylelint": "^15.4.0",
"stylelint": "^15.11.0",
"stylelint-config-standard-scss": "^8.0.0",
"stylelint-prettier": "^3.0.0",
"webpack": "^5.78.0"
"stylelint-prettier": "^4.0.2",
"webpack": "^5.89.0"
},
"dependencies": {
"@babel/core": "^7.23.2",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"broccoli-funnel": "^3.0.8",
"broccoli-merge-trees": "^4.2.0",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.2.0",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0",
"ember-composability-tools": "^1.2.0",
"ember-in-element-polyfill": "^1.0.0",
"ember-render-helpers": "^0.2.0",
"fastboot-transform": "^0.1.3",
"resolve": "^1.21.0"
"resolve": "^1.21.0",
"@ember/string": "^4.0.1"
},
"peerDependencies": {
"ember-source": "^4.0.0 || ^5.0.0",
Expand All @@ -97,7 +100,7 @@
"crypto"
],
"engines": {
"node": "14.* || 16.* || >= 18"
"node": ">= 18"
},
"keywords": [
"ember-addon",
Expand Down
Loading