From 1242188ad6f40755546423fa8d464c8a5eabb173 Mon Sep 17 00:00:00 2001 From: Andrew Kirwin Date: Thu, 26 Jan 2023 23:58:32 +0000 Subject: [PATCH] Run ember-cli-update --- .ember-cli | 4 +-- .github/workflows/ci.yml | 25 +++++++------ .npmignore | 1 - config/environment.js | 5 --- package.json | 40 +++++++++++---------- tests/dummy/config/ember-cli-update.json | 20 +++++++++++ {config => tests/dummy/config}/ember-try.js | 8 ++--- tests/dummy/config/environment.js | 7 ++-- vendor/.gitkeep | 0 9 files changed, 65 insertions(+), 45 deletions(-) delete mode 100644 config/environment.js create mode 100644 tests/dummy/config/ember-cli-update.json rename {config => tests/dummy/config}/ember-try.js (95%) delete mode 100644 vendor/.gitkeep diff --git a/.ember-cli b/.ember-cli index 4ccb4bf..8c1812c 100644 --- a/.ember-cli +++ b/.ember-cli @@ -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 } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b7c815..1b313f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/.npmignore b/.npmignore index 7dd9b77..988b29b 100644 --- a/.npmignore +++ b/.npmignore @@ -23,7 +23,6 @@ /.travis.yml /.watchmanconfig /bower.json -/config/ember-try.js /CONTRIBUTING.md /ember-cli-build.js /testem.js diff --git a/config/environment.js b/config/environment.js deleted file mode 100644 index 331ab30..0000000 --- a/config/environment.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -module.exports = function (/* environment, appConfig */) { - return {}; -}; diff --git a/package.json b/package.json index 981604b..e42b7cf 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,8 @@ }, "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 .", @@ -30,7 +30,7 @@ "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", @@ -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", @@ -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" diff --git a/tests/dummy/config/ember-cli-update.json b/tests/dummy/config/ember-cli-update.json new file mode 100644 index 0000000..4695338 --- /dev/null +++ b/tests/dummy/config/ember-cli-update.json @@ -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" + ] + } + ] + } + ] +} diff --git a/config/ember-try.js b/tests/dummy/config/ember-try.js similarity index 95% rename from config/ember-try.js rename to tests/dummy/config/ember-try.js index 480acd2..e8bfa70 100644 --- a/config/ember-try.js +++ b/tests/dummy/config/ember-try.js @@ -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' } } }, diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index 633854a..27548f7 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -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: { @@ -41,7 +41,6 @@ module.exports = function (environment) { } if (environment === 'production') { - ENV.locationType = 'hash'; ENV.rootURL = '/ember-modal-dialog/'; } diff --git a/vendor/.gitkeep b/vendor/.gitkeep deleted file mode 100644 index e69de29..0000000