From a9b69dfb63ffad8af342828dbf6bec7ae4739e54 Mon Sep 17 00:00:00 2001 From: mkszepp Date: Mon, 15 Jan 2024 09:04:06 +0100 Subject: [PATCH] Update ember cli to 5.5 (#106) * Remove --ci-provider=travis (we work on github actions) * update ember-cli v5.4.1...v5.5.0 --- pnpm-lock.yaml | 105 +++++++++++++++++++------- test-app/README.md | 10 +-- test-app/config/ember-cli-update.json | 5 +- test-app/package.json | 20 ++--- 4 files changed, 94 insertions(+), 46 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 62ff446..142de4f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -155,8 +155,8 @@ importers: specifier: 8.0.0-beta.4 version: 8.0.0-beta.4(@ember/string@3.1.1)(@ember/test-helpers@3.2.1)(ember-source@5.5.0)(webpack@5.89.0) ember-cli: - specifier: ~5.4.1 - version: 5.4.1 + specifier: ~5.5.0 + version: 5.5.0 ember-cli-app-version: specifier: ^6.0.1 version: 6.0.1(ember-source@5.5.0) @@ -168,7 +168,7 @@ importers: version: 3.0.0 ember-cli-dependency-checker: specifier: ^3.3.2 - version: 3.3.2(ember-cli@5.4.1) + version: 3.3.2(ember-cli@5.5.0) ember-cli-htmlbars: specifier: ^6.3.0 version: 6.3.0 @@ -336,6 +336,16 @@ packages: semver: 6.3.1 dev: true + /@babel/generator@7.23.0: + resolution: {integrity: sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.23.0 + '@jridgewell/gen-mapping': 0.3.3 + '@jridgewell/trace-mapping': 0.3.21 + jsesc: 2.5.2 + dev: true + /@babel/generator@7.23.6: resolution: {integrity: sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==} engines: {node: '>=6.9.0'} @@ -1460,6 +1470,24 @@ packages: '@babel/parser': 7.23.6 '@babel/types': 7.23.6 + /@babel/traverse@7.23.0: + resolution: {integrity: sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.23.5 + '@babel/generator': 7.23.0 + '@babel/helper-environment-visitor': 7.22.20 + '@babel/helper-function-name': 7.23.0 + '@babel/helper-hoist-variables': 7.22.5 + '@babel/helper-split-export-declaration': 7.22.6 + '@babel/parser': 7.23.6 + '@babel/types': 7.23.0 + debug: 4.3.4 + globals: 11.12.0 + transitivePeerDependencies: + - supports-color + dev: true + /@babel/traverse@7.23.7: resolution: {integrity: sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==} engines: {node: '>=6.9.0'} @@ -1477,6 +1505,15 @@ packages: transitivePeerDependencies: - supports-color + /@babel/types@7.23.0: + resolution: {integrity: sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-string-parser': 7.23.4 + '@babel/helper-validator-identifier': 7.22.20 + to-fast-properties: 2.0.0 + dev: true + /@babel/types@7.23.6: resolution: {integrity: sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==} engines: {node: '>=6.9.0'} @@ -2589,7 +2626,7 @@ packages: resolution: {integrity: sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==} dependencies: '@types/connect': 3.4.38 - '@types/node': 20.11.0 + '@types/node': 20.11.1 dev: true /@types/chai-as-promised@7.1.8: @@ -2605,7 +2642,7 @@ packages: /@types/connect@3.4.38: resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==} dependencies: - '@types/node': 20.11.0 + '@types/node': 20.11.1 dev: true /@types/cookie@0.4.1: @@ -2615,7 +2652,7 @@ packages: /@types/cors@2.8.17: resolution: {integrity: sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==} dependencies: - '@types/node': 20.11.0 + '@types/node': 20.11.1 dev: true /@types/debug@4.1.12: @@ -2642,7 +2679,7 @@ packages: /@types/express-serve-static-core@4.17.41: resolution: {integrity: sha512-OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA==} dependencies: - '@types/node': 20.11.0 + '@types/node': 20.11.1 '@types/qs': 6.9.11 '@types/range-parser': 1.2.7 '@types/send': 0.17.4 @@ -2660,26 +2697,26 @@ packages: /@types/fs-extra@5.1.0: resolution: {integrity: sha512-AInn5+UBFIK9FK5xc9yP5e3TQSPNNgjHByqYcj9g5elVBnDQcQL7PlO1CIRy2gWlbwK7UPYqi7vRvFA44dCmYQ==} dependencies: - '@types/node': 20.11.0 + '@types/node': 20.11.1 /@types/fs-extra@8.1.5: resolution: {integrity: sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==} dependencies: - '@types/node': 20.11.0 + '@types/node': 20.11.1 dev: true /@types/glob@7.2.0: resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} dependencies: '@types/minimatch': 5.1.2 - '@types/node': 20.11.0 + '@types/node': 20.11.1 dev: true /@types/glob@8.1.0: resolution: {integrity: sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==} dependencies: '@types/minimatch': 5.1.2 - '@types/node': 20.11.0 + '@types/node': 20.11.1 /@types/http-cache-semantics@4.0.4: resolution: {integrity: sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==} @@ -2695,7 +2732,7 @@ packages: /@types/keyv@3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} dependencies: - '@types/node': 20.11.0 + '@types/node': 20.11.1 dev: true /@types/mdast@3.0.15: @@ -2722,8 +2759,8 @@ packages: resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==} dev: true - /@types/node@20.11.0: - resolution: {integrity: sha512-o9bjXmDNcF7GbM4CNQpmi+TutCgap/K3w1JyKgxAjqx41zp9qlIAVFi0IhCNsJcXolEqLWhbFbEeL0PvYm4pcQ==} + /@types/node@20.11.1: + resolution: {integrity: sha512-DsXojJUES2M+FE8CpptJTKpg+r54moV9ZEncPstni1WHFmTcCzeFLnMFfyhCVS8XNOy/OQG+8lVxRLRrVHmV5A==} dependencies: undici-types: 5.26.5 @@ -2742,20 +2779,20 @@ packages: /@types/responselike@1.0.3: resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==} dependencies: - '@types/node': 20.11.0 + '@types/node': 20.11.1 dev: true /@types/rimraf@2.0.5: resolution: {integrity: sha512-YyP+VfeaqAyFmXoTh3HChxOQMyjByRMsHU7kc5KOJkSlXudhMhQIALbYV7rHh/l8d2lX3VUQzprrcAgWdRuU8g==} dependencies: '@types/glob': 8.1.0 - '@types/node': 20.11.0 + '@types/node': 20.11.1 /@types/send@0.17.4: resolution: {integrity: sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==} dependencies: '@types/mime': 1.3.5 - '@types/node': 20.11.0 + '@types/node': 20.11.1 dev: true /@types/serve-static@1.15.5: @@ -2763,7 +2800,7 @@ packages: dependencies: '@types/http-errors': 2.0.4 '@types/mime': 3.0.4 - '@types/node': 20.11.0 + '@types/node': 20.11.1 dev: true /@types/symlink-or-copy@1.2.2: @@ -4366,7 +4403,7 @@ packages: dependencies: function-bind: 1.1.2 get-intrinsic: 1.2.2 - set-function-length: 1.1.1 + set-function-length: 1.2.0 /callsites@3.1.0: resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} @@ -5665,14 +5702,14 @@ packages: - supports-color dev: true - /ember-cli-dependency-checker@3.3.2(ember-cli@5.4.1): + /ember-cli-dependency-checker@3.3.2(ember-cli@5.5.0): resolution: {integrity: sha512-PwkrW5oYsdPWwt+0Tojufmv/hxVETTjkrEdK7ANQB2VSnqpA5UcYubwpQM9ONuR2J8wyNDMwEHlqIrk/FYtBsQ==} engines: {node: '>= 6'} peerDependencies: ember-cli: ^3.2.0 || >=4.0.0 dependencies: chalk: 2.4.2 - ember-cli: 5.4.1 + ember-cli: 5.5.0 find-yarn-workspace-root: 1.2.1 is-git-url: 1.0.0 resolve: 1.22.8 @@ -5926,8 +5963,8 @@ packages: transitivePeerDependencies: - supports-color - /ember-cli@5.4.1: - resolution: {integrity: sha512-+jwp63OPT0zkUnXP563DkIwb1GiI6kGYHg6DyzJKY48BCdevqcgxsMFn8/RENXoF7krg18A5B9cSa8Y1v15tIw==} + /ember-cli@5.5.0: + resolution: {integrity: sha512-D3Q+mq5yOpZB1pJu4aOnVj5+LTwXmd5sJhXqZxc9Y0JFRYinl4h0HHGUMUvtV7obo811gf13ObDAaUmSfVPQbQ==} engines: {node: '>= 18'} hasBin: true dependencies: @@ -5961,6 +5998,7 @@ packages: ember-cli-normalize-entity-name: 1.0.0 ember-cli-preprocess-registry: 5.0.1 ember-cli-string-utils: 1.1.0 + ember-template-tag: 2.3.15 ensure-posix-path: 1.1.1 execa: 5.1.1 exit: 0.1.2 @@ -6480,6 +6518,17 @@ packages: - supports-color dev: true + /ember-template-tag@2.3.15: + resolution: {integrity: sha512-uvFt+eIE4788Yr3X1wYLrh+PYYmasmREh2IoShIrZvOW2dOfC+elSZeqeEacNhbKJUX3tT9XUKlbpYFVwvSvyA==} + dependencies: + '@babel/generator': 7.23.0 + '@babel/traverse': 7.23.0 + '@babel/types': 7.23.0 + '@glimmer/syntax': 0.84.3 + transitivePeerDependencies: + - supports-color + dev: true + /ember-tracked-storage-polyfill@1.0.0: resolution: {integrity: sha512-eL7lZat68E6P/D7b9UoTB5bB5Oh/0aju0Z7PCMi3aTwhaydRaxloE7TGrTRYU+NdJuyNVZXeGyxFxn2frvd3TA==} engines: {node: 12.* || >= 14} @@ -6580,7 +6629,7 @@ packages: dependencies: '@types/cookie': 0.4.1 '@types/cors': 2.8.17 - '@types/node': 20.11.0 + '@types/node': 20.11.1 accepts: 1.3.8 base64id: 2.0.0 cookie: 0.4.2 @@ -8430,7 +8479,6 @@ packages: /iconv-lite@0.6.3: resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==} engines: {node: '>=0.10.0'} - requiresBuild: true dependencies: safer-buffer: 2.1.2 dev: true @@ -9061,7 +9109,7 @@ packages: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.11.0 + '@types/node': 20.11.1 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -11934,11 +11982,12 @@ packages: resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} dev: true - /set-function-length@1.1.1: - resolution: {integrity: sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==} + /set-function-length@1.2.0: + resolution: {integrity: sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w==} engines: {node: '>= 0.4'} dependencies: define-data-property: 1.1.1 + function-bind: 1.1.2 get-intrinsic: 1.2.2 gopd: 1.0.1 has-property-descriptors: 1.0.1 diff --git a/test-app/README.md b/test-app/README.md index 16ff550..f94122f 100644 --- a/test-app/README.md +++ b/test-app/README.md @@ -20,7 +20,7 @@ You will need the following things properly installed on your computer. ## Running / Development -* `ember serve` +* `npm run start` * Visit your app at [http://localhost:4200](http://localhost:4200). * Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests). @@ -30,8 +30,8 @@ Make use of the many generators for code, try `ember help generate` for more det ### Running Tests -* `ember test` -* `ember test --server` +* `npm run test` +* `npm run test:ember -- --server` ### Linting @@ -40,8 +40,8 @@ Make use of the many generators for code, try `ember help generate` for more det ### Building -* `ember build` (development) -* `ember build --environment production` (production) +* `npm exec ember build` (development) +* `npm run build` (production) ### Deploying diff --git a/test-app/config/ember-cli-update.json b/test-app/config/ember-cli-update.json index f784170..5b2b534 100644 --- a/test-app/config/ember-cli-update.json +++ b/test-app/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "ember-cli", - "version": "5.4.1", + "version": "5.5.0", "blueprints": [ { "name": "app", @@ -11,8 +11,7 @@ "codemodsSource": "ember-app-codemods-manifest@1", "isBaseBlueprint": true, "options": [ - "--no-welcome", - "--ci-provider=travis" + "--no-welcome" ] } ] diff --git a/test-app/package.json b/test-app/package.json index 6f7b346..aad692c 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -35,22 +35,27 @@ "@embroider/test-setup": "^3.0.3", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", + "bootstrap-sass": "^3.4.3", "broccoli-asset-rev": "^3.0.0", "concurrently": "^8.2.2", "ember-auto-import": "^2.7.2", - "ember-cli": "~5.4.1", + "ember-basic-dropdown": "8.0.0-beta.4", + "ember-cli": "~5.5.0", "ember-cli-app-version": "^6.0.1", "ember-cli-babel": "^8.2.0", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.2", "ember-cli-htmlbars": "^6.3.0", "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-fetch": "^8.1.2", "ember-load-initializers": "^2.1.2", "ember-modifier": "^4.1.0", "ember-page-title": "^8.2.0", + "ember-power-calendar": "0.22.0-beta.4", + "ember-power-calendar-moment": "^0.5.0", "ember-qunit": "^8.0.2", "ember-resolver": "^11.0.1", "ember-source": "~5.5.0", @@ -64,22 +69,17 @@ "eslint-plugin-prettier": "^5.1.3", "eslint-plugin-qunit": "^8.0.1", "loader.js": "^4.7.0", + "moment": "^2.30.1", "prettier": "^3.2.2", "qunit": "^2.20.0", "qunit-dom": "^3.0.0", + "sass": "^1.69.7", "stylelint": "^16.1.0", "stylelint-config-standard": "^36.0.0", + "stylelint-config-standard-scss": "^13.0.0", "stylelint-prettier": "^5.0.0", "tracked-built-ins": "^3.3.0", - "webpack": "^5.89.0", - "bootstrap-sass": "^3.4.3", - "ember-basic-dropdown": "8.0.0-beta.4", - "ember-cli-sass": "^11.0.1", - "ember-power-calendar": "0.22.0-beta.4", - "ember-power-calendar-moment": "^0.5.0", - "moment": "^2.30.1", - "sass": "^1.69.7", - "stylelint-config-standard-scss": "^13.0.0" + "webpack": "^5.89.0" }, "engines": { "node": ">= 18"