Skip to content

Commit

Permalink
ember-cli-update to ember 5.10 (#466)
Browse files Browse the repository at this point in the history
* ember-cli-update to ember 5.10

* Run init
  • Loading branch information
RobbieTheWagner authored Jul 16, 2024
1 parent f89cb77 commit 9f49a5c
Show file tree
Hide file tree
Showing 9 changed files with 215 additions and 248 deletions.
35 changes: 26 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,15 @@ jobs:
timeout-minutes: 10

steps:
- uses: actions/checkout@v4
- uses: wyvox/action-setup-pnpm@v3
with: { node-version: 18 }
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- name: Lint
Expand All @@ -34,9 +40,14 @@ jobs:
timeout-minutes: 10

steps:
- uses: actions/checkout@v4
- uses: wyvox/action-setup-pnpm@v3
with: { node-version: 18 }
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8
- uses: actions/setup-node@v3
with:
node-version: 18
cache: pnpm
- name: Install Dependencies
run: pnpm install --no-lockfile
- name: Run Tests
Expand Down Expand Up @@ -64,9 +75,15 @@ jobs:
- embroider-optimized

steps:
- uses: actions/checkout@v4
- uses: wyvox/action-setup-pnpm@v3
with: { node-version: 18 }
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- name: Run Tests
Expand Down
20 changes: 10 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

## Installation

* `git clone <repository-url>`
* `cd ember-highcharts`
* `pnpm install`
- `git clone <repository-url>`
- `cd ember-highcharts`
- `pnpm install`

## Linting

* `pnpm lint`
* `pnpm lint:fix`
- `pnpm lint`
- `pnpm lint:fix`

## Running tests

* `pnpm test` – Runs the test suite on the current Ember version
* `pnpm test:ember --server` – Runs the test suite in "watch mode"
* `pnpm test:ember-compatibility` – Runs the test suite against multiple Ember versions
- `pnpm test` – Runs the test suite on the current Ember version
- `pnpm test:ember --server` – Runs the test suite in "watch mode"
- `pnpm test:ember-compatibility` – Runs the test suite against multiple Ember versions

## Running the dummy application

* `pnpm start`
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
- `pnpm start`
- Visit the dummy application at [http://localhost:4200](http://localhost:4200).

For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
15 changes: 0 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,21 +124,6 @@ Check out more chart examples in the [tests/dummy app](tests/dummy/app) in this

## Configuration

This addon will load Highcharts by default. Highcharts has many optional features like Highstock and Highmaps.
You can add the `emberHighCharts` option to your `ember-cli-build.js` file to load these optional features:

```js
// all possible options
var app = new EmberApp({
emberHighCharts: {
includeHighCharts: false,
includeHighChartsMore: true,
includeHighCharts3D: true,
}
});
```
All modules can be found [here](https://github.com/highcharts/highcharts/tree/master/ts/masters/modules).

### Highstock, Highmaps, etc

We now use dynamic imports to import the Highcharts packages you need based on the `mode` argument passed.
Expand Down
4 changes: 0 additions & 4 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ module.exports = function (defaults) {
'ember-cli-babel': {
enableTypeScriptTransform: true,
},
emberHighCharts: {
includeHighChartsMore: true,
includeHighCharts3D: true,
},
});

/*
Expand Down
17 changes: 8 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,27 @@
"ember-highcharts",
"charts"
],
"repository": "https://github.com/ahmadsoe/ember-highcharts.git",
"license": "MIT",
"author": "",
"directories": {
"doc": "doc",
"test": "tests"
},
"repository": "https://github.com/ahmadsoe/ember-highcharts.git",
"scripts": {
"build": "ember build --environment=production",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"**/*.css\"",
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint:css:fix": "concurrently \"pnpm:lint:css -- --fix\"",
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"lint:types": "glint",
"release": "release-it",
"start": "ember serve",
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
"test": "concurrently \"pnpm:lint\" \"pnpm:test:*\" --names \"lint,test:\"",
"test:ember": "ember test",
"test:ember-compatibility": "ember try:each"
},
Expand Down Expand Up @@ -68,17 +68,16 @@
"bootstrap": "^4.6.2",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.2.2",
"ember-cli": "~5.8.1",
"ember-cli-app-version": "^7.0.0",
"ember-cli": "~5.10.0",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-load-initializers": "^2.1.2",
"ember-qunit": "^8.1.0",
"ember-resolver": "^10.1.1",
"ember-source": "~5.8.0",
"ember-resolver": "^11.0.1",
"ember-source": "~5.10.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.13.0",
"ember-try": "^3.0.0",
Expand Down
Loading

0 comments on commit 9f49a5c

Please sign in to comment.