From d201190c8dd204abe69ef838380d53ffe728bd99 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Tue, 12 Dec 2023 11:16:19 +0000 Subject: [PATCH] update to v5.4 with ember-cli-update --- .ember-cli | 8 ---- .eslintignore | 12 +----- .github/workflows/ci.yml | 1 + .gitignore | 9 +---- .npmignore | 6 --- .prettierignore | 14 +------ .watchmanconfig | 2 +- README.md | 3 +- package.json | 51 ++++++++++++------------ tests/dummy/config/ember-cli-update.json | 2 +- tests/dummy/config/ember-try.js | 8 ++++ tests/helpers/index.js | 2 +- tsconfig.declarations.json | 10 +++++ 13 files changed, 52 insertions(+), 76 deletions(-) create mode 100644 tsconfig.declarations.json diff --git a/.ember-cli b/.ember-cli index 8c1812c..465c405 100644 --- a/.ember-cli +++ b/.ember-cli @@ -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. diff --git a/.eslintignore b/.eslintignore index e128f3c..2f1ee50 100644 --- a/.eslintignore +++ b/.eslintignore @@ -2,25 +2,15 @@ /blueprints /fastboot-tests /vendor/ +/blueprints/*/files/ # 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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ea9753..4b50751 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,6 +69,7 @@ jobs: - ember-lts-3.28 - ember-lts-4.4 - ember-lts-4.8 + - ember-lts-4.12 - ember-release - ember-beta - ember-canary diff --git a/.gitignore b/.gitignore index f1e859b..71ad79d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1,21 @@ -# 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 # ember-try /.node_modules.ember-try/ -/bower.json.ember-try /npm-shrinkwrap.json.ember-try /package.json.ember-try /package-lock.json.ember-try diff --git a/.npmignore b/.npmignore index 27849b1..69beb28 100644 --- a/.npmignore +++ b/.npmignore @@ -2,11 +2,7 @@ /dist/ /tmp/ -# dependencies -/bower_components/ - # misc -/.bowerrc /.editorconfig /.ember-cli /.env* @@ -23,7 +19,6 @@ /.template-lintrc.js /.travis.yml /.watchmanconfig -/bower.json /CONTRIBUTING.md /ember-cli-build.js /testem.js @@ -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 diff --git a/.prettierignore b/.prettierignore index 4178fd5..9385391 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,25 +1,13 @@ # unconventional js /blueprints/*/files/ -/vendor/ # compiled output /dist/ -/tmp/ - -# dependencies -/bower_components/ -/node_modules/ # misc /coverage/ !.* -.eslintcache -.lint-todo/ +.*/ # 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 diff --git a/.watchmanconfig b/.watchmanconfig index e7834e3..f9c3d8f 100644 --- a/.watchmanconfig +++ b/.watchmanconfig @@ -1,3 +1,3 @@ { - "ignore_dirs": ["tmp", "dist"] + "ignore_dirs": ["dist"] } diff --git a/README.md b/README.md index b5d2178..3317ce9 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,7 @@ The hope is that, in the future, Ember will provide a mechanism for populating ` * Ember.js v3.16 or above * Ember CLI v3.16 or above -* Node.js v12 or above - +* Node.js v16 or above ## Installation diff --git a/package.json b/package.json index 92f2abc..4139c32 100644 --- a/package.json +++ b/package.json @@ -32,53 +32,54 @@ "ember-compatibility-tests": "ember try:each" }, "dependencies": { - "ember-cli-babel": "^7.26.11", - "ember-cli-htmlbars": "^6.2.0", + "@babel/core": "^7.23.2", + "ember-cli-babel": "^8.2.0", + "ember-cli-htmlbars": "^6.3.0", "ember-in-element-polyfill": "^1.0.0" }, "devDependencies": { - "@babel/eslint-parser": "^7.21.3", - "@babel/plugin-proposal-decorators": "^7.21.0", + "@babel/eslint-parser": "^7.22.15", + "@babel/plugin-proposal-decorators": "^7.23.2", "@ember/optional-features": "^2.0.0", - "@ember/string": "^3.0.1", - "@ember/test-helpers": "^2.9.3", - "@embroider/test-setup": "^2.1.1", + "@ember/test-helpers": "^3.2.0", + "@embroider/test-setup": "^3.0.2", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "chai": "^4.2.0", - "concurrently": "^8.0.1", + "concurrently": "^8.2.2", "ember-auto-import": "^2.6.3", - "ember-cli": "~4.12.1", - "ember-cli-dependency-checker": "^3.3.1", + "ember-cli": "~5.4.1", + "ember-cli-clean-css": "^3.0.0", + "ember-cli-dependency-checker": "^3.3.2", "ember-cli-fastboot": "^4.1.1", "ember-cli-fastboot-testing": "^0.6.1", "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-page-title": "^7.0.0", - "ember-qunit": "^6.2.0", - "ember-resolver": "^10.0.0", - "ember-source": "~4.12.0", + "ember-page-title": "^8.0.0", + "ember-qunit": "^8.0.1", + "ember-resolver": "^11.0.1", + "ember-source": "~5.4.0", "ember-source-channel-url": "^3.0.0", - "ember-template-lint": "^5.7.2", + "ember-template-lint": "^5.11.2", "ember-try": "^3.0.0", - "eslint": "^8.37.0", - "eslint-config-prettier": "^8.8.0", - "eslint-plugin-ember": "^11.5.0", - "eslint-plugin-n": "^15.7.0", - "eslint-plugin-prettier": "^4.2.1", - "eslint-plugin-qunit": "^7.3.4", + "eslint": "^8.52.0", + "eslint-config-prettier": "^9.0.0", + "eslint-plugin-ember": "^11.11.1", + "eslint-plugin-n": "^16.2.0", + "eslint-plugin-prettier": "^5.0.1", + "eslint-plugin-qunit": "^8.0.1", "loader.js": "^4.7.0", - "prettier": "^2.8.7", - "qunit": "^2.19.4", + "prettier": "^3.0.3", + "qunit": "^2.20.0", "qunit-dom": "^2.0.0", "release-plan": "^0.5.1", - "webpack": "^5.85.0" + "webpack": "^5.89.0" }, "engines": { - "node": "12.* || 14.* || 16.* || >= 18" + "node": ">= 18" }, "publishConfig": { "registry": "https://registry.npmjs.org" diff --git a/tests/dummy/config/ember-cli-update.json b/tests/dummy/config/ember-cli-update.json index 694f9e0..34579dd 100644 --- a/tests/dummy/config/ember-cli-update.json +++ b/tests/dummy/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "ember-cli", - "version": "4.12.1", + "version": "5.4.1", "blueprints": [ { "name": "addon", diff --git a/tests/dummy/config/ember-try.js b/tests/dummy/config/ember-try.js index 170b934..a981a68 100644 --- a/tests/dummy/config/ember-try.js +++ b/tests/dummy/config/ember-try.js @@ -66,6 +66,14 @@ module.exports = async function () { }, }, }, + { + name: 'ember-lts-4.12', + npm: { + devDependencies: { + 'ember-source': '~4.12.0', + }, + }, + }, { name: 'ember-release', npm: { diff --git a/tests/helpers/index.js b/tests/helpers/index.js index 7f70de8..d37dd68 100644 --- a/tests/helpers/index.js +++ b/tests/helpers/index.js @@ -4,7 +4,7 @@ import { setupTest as upstreamSetupTest, } from 'ember-qunit'; -// This file exists to provide wrappers around ember-qunit's / ember-mocha's +// This file exists to provide wrappers around ember-qunit's // test setup functions. This way, you can easily extend the setup that is // needed per test type. diff --git a/tsconfig.declarations.json b/tsconfig.declarations.json new file mode 100644 index 0000000..5a21df7 --- /dev/null +++ b/tsconfig.declarations.json @@ -0,0 +1,10 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "declarationDir": "declarations", + "emitDeclarationOnly": true, + "noEmit": false, + "rootDir": "." + }, + "include": ["addon", "addon-test-support"] +}