Skip to content

Commit

Permalink
Merge pull request #530 from jrjohnson/various-updates
Browse files Browse the repository at this point in the history
Update ember, node, pnpm
  • Loading branch information
jrjohnson authored Sep 27, 2024
2 parents 9afaa74 + 4d17716 commit 52b4b38
Show file tree
Hide file tree
Showing 11 changed files with 9,465 additions and 7,888 deletions.
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
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/blueprints/*/files/

# compiled output
/declarations/
/dist/

# misc
Expand Down
24 changes: 15 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
- uses: actions/setup-node@v3
- uses: pnpm/action-setup@v4
with:
node-version: 18
version: 9
- uses: actions/setup-node@v4
with:
node-version: 20
cache: pnpm
- run: pnpm install
- name: Lint
Expand All @@ -38,10 +40,12 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
- uses: actions/setup-node@v3
- uses: pnpm/action-setup@v4
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: pnpm
- run: pnpm install
- name: Run Tests
Expand All @@ -53,10 +57,12 @@ jobs:
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v2
- uses: actions/setup-node@v3
- uses: pnpm/action-setup@v4
with:
version: 9
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: pnpm
- run: pnpm install
- name: test build
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
20
43 changes: 22 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,41 +7,42 @@ A short introduction of this app could easily go here.

You will need the following things properly installed on your computer.

* [Git](https://git-scm.com/)
* [Node.js](https://nodejs.org/) (with npm)
* [Ember CLI](https://cli.emberjs.com/release/)
* [Google Chrome](https://google.com/chrome/)
- [Git](https://git-scm.com/)
- [Node.js](https://nodejs.org/)
- [pnpm](https://pnpm.io/)
- [Ember CLI](https://cli.emberjs.com/release/)
- [Google Chrome](https://google.com/chrome/)

## Installation

* `git clone <repository-url>` this repository
* `cd jrjohnson`
* `npm install`
- `git clone <repository-url>` this repository
- `cd jrjohnson`
- `pnpm install`

## Running / Development

* `ember serve`
* Visit your app at [http://localhost:4200](http://localhost:4200).
* Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
- `pnpm start`
- Visit your app at [http://localhost:4200](http://localhost:4200).
- Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).

### Code Generators

Make use of the many generators for code, try `ember help generate` for more details

### Running Tests

* `ember test`
* `ember test --server`
- `pnpm test`
- `pnpm test:ember --server`

### Linting

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

### Building

* `ember build` (development)
* `ember build --environment production` (production)
- `pnpm ember build` (development)
- `pnpm build` (production)

### Deploying

Expand All @@ -55,8 +56,8 @@ Commits to `master` are auto deployed by Netlify.
5. Generate PDF from HTML `npx electron-pdf http://localhost:4200/resume-output.html public/media/resume.pdf -p=Letter -m=0`
6. Remove HTML `rm public/resume-output.html`

* [ember.js](https://emberjs.com/)
* [ember-cli](https://cli.emberjs.com/release/)
* Development Browser Extensions
* [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
* [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
- [ember.js](https://emberjs.com/)
- [ember-cli](https://cli.emberjs.com/release/)
- Development Browser Extensions
- [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
- [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
5 changes: 3 additions & 2 deletions config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
"packages": [
{
"name": "ember-cli",
"version": "5.3.0",
"version": "5.11.0",
"blueprints": [
{
"name": "app",
"outputRepo": "https://github.com/ember-cli/ember-new-output",
"codemodsSource": "ember-app-codemods-manifest@1",
"isBaseBlueprint": true,
"options": [
"--no-welcome"
"--no-welcome",
"--pnpm"
]
}
]
Expand Down
3 changes: 2 additions & 1 deletion config/optional-features.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"application-template-wrapper": false,
"default-async-observers": true,
"jquery-integration": false,
"template-only-glimmer-components": true
"template-only-glimmer-components": true,
"no-implicit-route-model": true
}
4 changes: 3 additions & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ const EmberApp = require('ember-cli/lib/broccoli/ember-app');

module.exports = function (defaults) {
const app = new EmberApp(defaults, {
// Add options here
sassOptions: {
silenceDeprecations: ['mixed-decls'],
},
});
app.import('node_modules/highlight.js/styles/a11y-dark.css');
return app.toTree();
Expand Down
55 changes: 27 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
"preinstall": "npx only-allow pnpm"
},
"devDependencies": {
"@babel/core": "^7.22.20",
"@babel/eslint-parser": "^7.22.15",
"@babel/plugin-proposal-decorators": "^7.22.15",
"@ember/optional-features": "^2.0.0",
"@babel/core": "^7.25.2",
"@babel/eslint-parser": "^7.25.1",
"@babel/plugin-proposal-decorators": "^7.24.7",
"@ember/optional-features": "^2.1.0",
"@ember/render-modifiers": "^2.1.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.2.0",
"@ember/test-helpers": "^3.3.1",
"@fastify/pre-commit": "^2.0.2",
"@fortawesome/ember-fontawesome": "^1.0.3",
"@fortawesome/fontawesome-svg-core": "^6.4.2",
Expand All @@ -44,13 +44,13 @@
"autoprefixer": "^10.4.16",
"broccoli-asset-rev": "^3.0.0",
"broccoli-markdown-resolver": "^0.0.1",
"concurrently": "^8.2.1",
"concurrently": "^8.2.2",
"cssstats": "^4.0.2",
"ember-a11y-testing": "^6.1.1",
"ember-auto-import": "^2.6.3",
"ember-cli": "~5.3.0",
"ember-auto-import": "^2.7.4",
"ember-cli": "~5.11.0",
"ember-cli-app-version": "^6.0.1",
"ember-cli-babel": "^8.0.0",
"ember-cli-babel": "^8.2.0",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-google-fonts": "^2.16.2",
Expand All @@ -62,39 +62,38 @@
"ember-cli-terser": "^4.0.2",
"ember-fetch": "^8.1.2",
"ember-load-initializers": "^2.1.2",
"ember-modifier": "^4.1.0",
"ember-page-title": "^8.0.0",
"ember-qunit": "^8.0.1",
"ember-modifier": "^4.2.0",
"ember-page-title": "^8.2.3",
"ember-qunit": "^8.1.0",
"ember-resolver": "^11.0.1",
"ember-source": "~5.3.0",
"ember-template-lint": "^5.11.2",
"ember-source": "~5.11.0",
"ember-template-lint": "^5.13.0",
"ember-test-selectors": "^6.0.0",
"eslint": "^8.49.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-ember": "^11.11.1",
"eslint-plugin-n": "^16.1.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-qunit": "^8.0.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^11.12.0",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-qunit": "^8.1.1",
"highlight.js": "^11.9.0",
"loader.js": "^4.7.0",
"luxon": "^3.4.3",
"prettier": "^3.0.3",
"qunit": "^2.19.4",
"prettier": "^3.3.3",
"qunit": "^2.22.0",
"qunit-dom": "^2.0.0",
"sass": "^1.69.3",
"stylelint": "^15.10.3",
"stylelint": "^15.11.0",
"stylelint-config-recommended-scss": "^12.0.0",
"stylelint-prettier": "^4.0.2",
"stylelint-prettier": "^4.1.0",
"stylelint-scss": "^4.6.0",
"tracked-built-ins": "^3.2.0",
"webpack": "^5.89.0"
"tracked-built-ins": "^3.3.0",
"webpack": "^5.93.0"
},
"engines": {
"node": ">= 18",
"node": ">= 20",
"yarn": "use pnpm",
"npm": "use pnpm"
},
"packageManager": "[email protected]",
"ember": {
"edition": "octane"
},
Expand Down
Loading

0 comments on commit 52b4b38

Please sign in to comment.