Skip to content

Commit

Permalink
Run ember-cli-update
Browse files Browse the repository at this point in the history
  • Loading branch information
amk221 committed Jan 26, 2023
1 parent 1871938 commit 1242188
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 45 deletions.
4 changes: 2 additions & 2 deletions .ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"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.
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.
*/
"isTypeScriptProject": false
}
25 changes: 14 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@ jobs:
test:
name: 'Tests'
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 14.x
cache: npm
- name: Install Dependencies
run: npm ci
Expand All @@ -33,12 +34,13 @@ jobs:
floating:
name: 'Floating Dependencies'
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 14.x
cache: npm
- name: Install Dependencies
run: npm install --no-shrinkwrap
Expand All @@ -48,14 +50,15 @@ jobs:
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.24
- ember-lts-3.28
- ember-lts-4.4
- ember-release
- ember-beta
- ember-canary
Expand All @@ -64,11 +67,11 @@ jobs:
- embroider-optimized

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 14.x
cache: npm
- name: Install Dependencies
run: npm ci
Expand Down
1 change: 0 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
/.travis.yml
/.watchmanconfig
/bower.json
/config/ember-try.js
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
Expand Down
5 changes: 0 additions & 5 deletions config/environment.js

This file was deleted.

40 changes: 22 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
},
"scripts": {
"build": "ember build --environment=production",
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint:css": "stylelint '**/*.{css,scss}'",
"lint:css:fix": "stylelint '**/*.{css,scss}' --fix",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"start": "ember serve",
"test": "npm-run-all lint test:ember",
"test": "concurrently \"npm:lint\" \"npm:test:ember\" --names \"lint,test:\"",
"test:ember": "ember test",
"test:ember-compatibility": "ember try:each",
"prettier": "prettier . --write",
Expand All @@ -41,14 +41,15 @@
"@ember/test-waiters": "^3.0.2",
"@zestia/animation-utils": "^4.1.0",
"body-scroll-lock": "^3.1.5",
"ember-auto-import": "^2.4.1",
"ember-auto-import": "^2.5.0",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.0.1"
"ember-cli-htmlbars": "^6.2.0"
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.8.0",
"@embroider/test-setup": "^1.6.0",
"@ember/string": "^3.0.1",
"@ember/test-helpers": "^2.9.3",
"@embroider/test-setup": "^2.0.2",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@zestia/ember-auto-focus": "^4.3.0",
Expand All @@ -58,35 +59,38 @@
"@zestia/template-lint-config": "^5.3.0",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "^4.3.0",
"concurrently": "^7.6.0",
"ember-cli": "^4.10.0",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-github-pages": "^0.2.2",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sass": "^11.0.1",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-load-initializers": "^2.1.2",
"ember-modifier": "^3.2.7",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "~4.4.0",
"ember-qunit": "^6.1.1",
"ember-resolver": "^10.0.0",
"ember-source": "~4.10.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^4.8.0",
"ember-template-lint": "^5.3.1",
"ember-try": "^2.0.0",
"eslint": "^7.32.0",
"eslint-plugin-n": "^15.6.1",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.6.2",
"qunit": "^2.19.1",
"prettier": "^2.8.3",
"qunit": "^2.19.3",
"qunit-dom": "^2.0.0",
"release-it": "^15.0.0",
"sass": "^1.51.0",
"stylelint": "^14.8.2",
"webpack": "^5.72.1"
"webpack": "^5.75.0"
},
"peerDependencies": {
"ember-source": "^3.28.0 || ^4.0.0"
},
"engines": {
"node": "12.* || 14.* || >= 16"
"node": "14.* || 16.* || >= 18"
},
"ember": {
"edition": "octane"
Expand Down
20 changes: 20 additions & 0 deletions tests/dummy/config/ember-cli-update.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"schemaVersion": "1.0.0",
"packages": [
{
"name": "ember-cli",
"version": "4.10.0",
"blueprints": [
{
"name": "addon",
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
"codemodsSource": "ember-addon-codemods-manifest@1",
"isBaseBlueprint": true,
"options": [
"--no-welcome"
]
}
]
}
]
}
8 changes: 4 additions & 4 deletions config/ember-try.js → tests/dummy/config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ module.exports = async function () {
return {
scenarios: [
{
name: 'ember-lts-3.24',
name: 'ember-lts-3.28',
npm: {
devDependencies: {
'ember-source': '~3.24.3'
'ember-source': '~3.28.0'
}
}
},
{
name: 'ember-lts-3.28',
name: 'ember-lts-4.4',
npm: {
devDependencies: {
'ember-source': '~3.28.0'
'ember-source': '~4.4.0'
}
}
},
Expand Down
7 changes: 3 additions & 4 deletions tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ module.exports = function (environment) {
rootURL: '/',
locationType: 'history',
EmberENV: {
EXTEND_PROTOTYPES: false,
FEATURES: {
// Here you can enable experimental features on an ember canary build
// e.g. 'with-controller': true
},
EXTEND_PROTOTYPES: false
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
}
},

APP: {
Expand Down Expand Up @@ -41,7 +41,6 @@ module.exports = function (environment) {
}

if (environment === 'production') {
ENV.locationType = 'hash';
ENV.rootURL = '/ember-modal-dialog/';
}

Expand Down
Empty file removed vendor/.gitkeep
Empty file.

0 comments on commit 1242188

Please sign in to comment.