Skip to content

Commit

Permalink
chore(deps): update ember-cli
Browse files Browse the repository at this point in the history
  • Loading branch information
anehx committed Dec 5, 2023
1 parent 271f9b9 commit 8ef07c3
Show file tree
Hide file tree
Showing 16 changed files with 478 additions and 423 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
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
4 changes: 0 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,3 @@ updates:
- dependency-name: ember-data
versions:
- ">= 5"
# https://github.com/villander/ember-engines-router-service/issues/67
- dependency-name: ember-engines-router-service
versions:
- ">= 0.4.0 <= 4.4.1"
69 changes: 69 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
name: CI

on:
push:
branches:
- main
- master
pull_request: {}

concurrency:
group: ci-${{ github.head_ref || github.ref }}
cancel-in-progress: true

jobs:
test:
name: "Tests"
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v3
- uses: wyvox/action-setup-pnpm@v2
with:
node-version: 18
- name: Lint
run: pnpm lint
- name: Run Tests
run: pnpm test:ember

floating:
name: "Floating Dependencies"
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v3
- uses: wyvox/action-setup-pnpm@v2
with:
node-version: 18
args: "--no-lockfile"
- name: Run Tests
run: pnpm test:ember

try-scenarios:
name: ${{ matrix.try-scenario }}
runs-on: ubuntu-latest
needs: "test"
timeout-minutes: 10

strategy:
fail-fast: false
matrix:
try-scenario:
- ember-lts-4.4
- ember-lts-4.8
- ember-lts-4.12
- ember-release
- ember-beta
- ember-canary
- embroider-safe
- embroider-optimized

steps:
- uses: actions/checkout@v3
- uses: wyvox/action-setup-pnpm@v2
with:
node-version: 18
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
99 changes: 0 additions & 99 deletions .github/workflows/test.yml

This file was deleted.

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
13 changes: 13 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# unconventional js
/blueprints/*/files/

# compiled output
/dist/

# misc
/coverage/
!.*
.*/

# ember-try
/.node_modules.ember-try/
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"]
}
5 changes: 2 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@

## Linting

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

## Running tests

Expand Down
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"@babel/core": "^7.23.5",
"@ember/legacy-built-in-components": "^0.5.0",
"@ember/optional-features": "^2.0.0",
"@ember/render-modifiers": "^2.1.0",
Expand Down Expand Up @@ -66,14 +67,14 @@
"@adfinis/semantic-release-config": "4.1.0",
"@babel/eslint-parser": "7.23.3",
"@babel/plugin-proposal-decorators": "7.23.5",
"@ember/string": "3.1.1",
"@ember/test-helpers": "3.2.1",
"@embroider/test-setup": "3.0.3",
"@faker-js/faker": "8.3.1",
"@fortawesome/fontawesome-svg-core": "6.5.1",
"broccoli-asset-rev": "3.0.0",
"concurrently": "8.2.2",
"ember-cli": "4.12.2",
"ember-cli": "5.4.1",
"ember-cli-clean-css": "3.0.0",
"ember-cli-dependency-checker": "3.3.2",
"ember-cli-inject-live-reload": "2.1.0",
"ember-cli-mirage": "3.0.2",
Expand All @@ -86,7 +87,7 @@
"ember-resolver": "11.0.1",
"ember-simple-auth": "6.0.0",
"ember-sinon-qunit": "7.4.0",
"ember-source": "4.12.3",
"ember-source": "5.4.0",
"ember-source-channel-url": "3.0.0",
"ember-template-lint": "5.13.0",
"ember-template-lint-plugin-prettier": "5.0.0",
Expand Down Expand Up @@ -134,7 +135,7 @@
},
"peerDependencies": {
"ember-engines": "^0.9.0",
"ember-source": "^4.0.0"
"ember-source": "^4.0.0 || ^5.0.0"
},
"engines": {
"node": ">= 18"
Expand Down
Loading

0 comments on commit 8ef07c3

Please sign in to comment.