From 142f0a5429cfc3dbf4c2dd466d3ec2fa766cc919 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Tue, 17 Oct 2023 08:28:21 -0400 Subject: [PATCH 01/23] do not auto install peer dependencies do not auto install peer dependencies --- .npmrc | 1 + package.json | 8 +- pnpm-lock.yaml | 1253 +++++++++++++++++++++++++++++++++++++----------- 3 files changed, 975 insertions(+), 287 deletions(-) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 00000000..f301fedf --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +auto-install-peers=false diff --git a/package.json b/package.json index 41f9b4cc..b9919849 100644 --- a/package.json +++ b/package.json @@ -54,8 +54,14 @@ }, "npm": false }, + "pnpm": { + "peerDependencyRules": { + "ignoreMissing": ["@babel/*", "@eslint/*"] + } + }, "volta": { "node": "16.18.1", - "yarn": "1.22.19" + "yarn": "1.22.19", + "pnpm": "7.33.5" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8ba3ca08..0e07e226 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,5 +1,9 @@ lockfileVersion: '6.0' +settings: + autoInstallPeers: false + excludeLinksFromLockfile: false + importers: .: @@ -39,7 +43,7 @@ importers: version: 4.1.2 ember-cli-babel: specifier: ^7.26.6 - version: 7.26.6 + version: 7.26.11 ember-cli-lodash-subset: specifier: ^2.0.1 version: 2.0.1 @@ -79,19 +83,19 @@ importers: version: 2.0.0 '@ember/test-helpers': specifier: ^2.6.0 - version: 2.6.0(@babel/core@7.21.8) + version: 2.9.4(ember-source@3.26.2) '@embroider/test-setup': specifier: ^0.37.0 version: 0.37.0 '@glimmer/component': specifier: ^1.0.4 - version: 1.0.4(@babel/core@7.21.8) + version: 1.1.2 '@glimmer/tracking': specifier: ^1.0.4 version: 1.0.4 babel-eslint: specifier: ^10.1.0 - version: 10.1.0(eslint@7.23.0) + version: 10.1.0(eslint@7.32.0) body-parser: specifier: ^1.18.3 version: 1.18.3 @@ -127,16 +131,16 @@ importers: version: 3.2.0 ember-cli-htmlbars: specifier: ^5.7.1 - version: 5.7.1 + version: 5.7.2 ember-cli-inject-live-reload: specifier: ^2.0.2 - version: 2.0.2 + version: 2.1.0 ember-cli-sri: specifier: ^2.1.1 version: 2.1.1 ember-cli-terser: specifier: ^4.0.1 - version: 4.0.1 + version: 4.0.2 ember-disable-prototype-extensions: specifier: ^1.1.3 version: 1.1.3 @@ -145,49 +149,49 @@ importers: version: 2.0.1 ember-load-initializers: specifier: ^2.1.2 - version: 2.1.2(@babel/core@7.21.8) + version: 2.1.2 ember-maybe-import-regenerator-for-testing: specifier: ^1.0.0 - version: 1.0.0(@babel/core@7.21.8) + version: 1.0.0 ember-page-title: specifier: ^7.0.0 version: 7.0.0 ember-qunit: specifier: ^5.1.5 - version: 5.1.5(@ember/test-helpers@2.6.0)(qunit@2.14.1) + version: 5.1.5(@ember/test-helpers@2.9.4)(qunit@2.20.0) ember-resolver: specifier: ^8.0.2 - version: 8.0.2(@babel/core@7.21.8) + version: 8.1.0 ember-sinon: specifier: ^2.2.0 - version: 2.2.0(@babel/core@7.21.8) + version: 2.2.0 ember-source: specifier: ~3.26.1 - version: 3.26.1(@babel/core@7.21.8) + version: 3.26.2 ember-source-channel-url: specifier: ^3.0.0 version: 3.0.0 ember-template-lint: specifier: ^3.2.0 - version: 3.2.0 + version: 3.16.0 ember-try: specifier: ^2.0.0 version: 2.0.0 eslint: specifier: ^7.23.0 - version: 7.23.0 + version: 7.32.0 eslint-config-prettier: specifier: ^8.1.0 - version: 8.1.0(eslint@7.23.0) + version: 8.10.0(eslint@7.32.0) eslint-plugin-ember: specifier: ^10.3.0 - version: 10.3.0(eslint@7.23.0) + version: 10.6.1(eslint@7.32.0) eslint-plugin-node: specifier: ^11.1.0 - version: 11.1.0(eslint@7.23.0) + version: 11.1.0(eslint@7.32.0) eslint-plugin-prettier: specifier: ^3.3.1 - version: 3.3.1(eslint-config-prettier@8.1.0)(eslint@7.23.0)(prettier@2.2.1) + version: 3.4.1(eslint-config-prettier@8.10.0)(eslint@7.32.0)(prettier@2.8.8) glob: specifier: ^7.1.3 version: 7.1.3 @@ -196,7 +200,7 @@ importers: version: 2.0.0 lint-to-the-future-eslint: specifier: ^2.0.1 - version: 2.0.1(eslint@7.23.0) + version: 2.0.1(eslint@7.32.0) loader.js: specifier: ^4.7.0 version: 4.7.0 @@ -208,10 +212,10 @@ importers: version: 4.1.5 prettier: specifier: ^2.2.1 - version: 2.2.1 + version: 2.8.8 qunit: specifier: ^2.14.1 - version: 2.14.1 + version: 2.20.0 qunit-dom: specifier: ^1.6.0 version: 1.6.0 @@ -488,7 +492,7 @@ importers: version: 1.3.0 '@glimmer/component': specifier: ^1.0.0 - version: 1.0.4(@babel/core@7.21.8) + version: 1.1.2 '@glimmer/tracking': specifier: ^1.0.0 version: 1.0.4 @@ -515,7 +519,7 @@ importers: version: 4.1.0 ember-cli-app-version: specifier: ^3.2.0 - version: 3.2.0(@babel/core@7.21.8) + version: 3.2.0 ember-cli-babel: specifier: ^7.20.5 version: 7.26.6 @@ -542,28 +546,28 @@ importers: version: 3.0.0 ember-data: specifier: ~3.19.0 - version: 3.19.0(@babel/core@7.21.8) + version: 3.19.0 ember-export-application-global: specifier: ^2.0.1 version: 2.0.1 ember-fetch: specifier: ^8.0.1 - version: 8.0.1(@babel/core@7.21.8) + version: 8.0.1 ember-load-initializers: specifier: ^2.1.1 - version: 2.1.2(@babel/core@7.21.8) + version: 2.1.2 ember-maybe-import-regenerator: specifier: ^0.1.6 - version: 0.1.6(@babel/core@7.21.8) + version: 0.1.6 ember-qunit: specifier: ^4.6.0 - version: 4.6.0(@babel/core@7.21.8) + version: 4.6.0 ember-resolver: specifier: ^8.0.0 - version: 8.0.2(@babel/core@7.21.8) + version: 8.0.2 ember-source: specifier: ~3.19.0 - version: 3.19.0(@babel/core@7.21.8) + version: 3.19.0 ember-template-lint: specifier: ^2.8.0 version: 2.8.0 @@ -608,7 +612,7 @@ importers: version: 1.3.0 '@glimmer/component': specifier: ^1.0.0 - version: 1.0.4(@babel/core@7.21.8) + version: 1.1.2 '@glimmer/tracking': specifier: ^1.0.0 version: 1.0.4 @@ -635,7 +639,7 @@ importers: version: 4.1.0 ember-cli-app-version: specifier: ^3.2.0 - version: 3.2.0(@babel/core@7.21.8) + version: 3.2.0 ember-cli-babel: specifier: ^7.20.5 version: 7.26.6 @@ -659,34 +663,34 @@ importers: version: 3.0.0 ember-data: specifier: ~3.19.0 - version: 3.19.0(@babel/core@7.21.8) + version: 3.19.0 ember-export-application-global: specifier: ^2.0.1 version: 2.0.1 ember-fetch: specifier: ^8.0.1 - version: 8.0.1(@babel/core@7.21.8) + version: 8.0.1 ember-load-initializers: specifier: ^2.1.1 - version: 2.1.2(@babel/core@7.21.8) + version: 2.1.2 ember-maybe-import-regenerator: specifier: ^0.1.6 - version: 0.1.6(@babel/core@7.21.8) + version: 0.1.6 ember-qunit: specifier: ^4.6.0 - version: 4.6.0(@babel/core@7.21.8) + version: 4.6.0 ember-resolver: specifier: ^8.0.0 - version: 8.0.2(@babel/core@7.21.8) + version: 8.0.2 ember-source: specifier: ~3.19.0 - version: 3.19.0(@babel/core@7.21.8) + version: 3.19.0 ember-template-lint: specifier: ^2.8.0 version: 2.8.0 ember-welcome-page: specifier: ^4.0.0 - version: 4.0.0(@babel/core@7.21.8) + version: 4.0.0 eslint: specifier: ^7.1.0 version: 7.23.0 @@ -716,7 +720,7 @@ importers: version: 1.3.0 '@glimmer/component': specifier: ^1.0.0 - version: 1.0.4(@babel/core@7.21.8) + version: 1.1.2 '@glimmer/tracking': specifier: ^1.0.0 version: 1.0.4 @@ -734,7 +738,7 @@ importers: version: 4.1.0 ember-cli-app-version: specifier: ^3.2.0 - version: 3.2.0(@babel/core@7.21.8) + version: 3.2.0 ember-cli-babel: specifier: ^7.20.5 version: 7.26.6 @@ -758,28 +762,28 @@ importers: version: 3.0.0 ember-data: specifier: ~3.19.0 - version: 3.19.0(@babel/core@7.21.8) + version: 3.19.0 ember-export-application-global: specifier: ^2.0.1 version: 2.0.1 ember-fetch: specifier: ^8.0.1 - version: 8.0.1(@babel/core@7.21.8) + version: 8.0.1 ember-load-initializers: specifier: ^2.1.1 - version: 2.1.2(@babel/core@7.21.8) + version: 2.1.2 ember-maybe-import-regenerator: specifier: ^0.1.6 - version: 0.1.6(@babel/core@7.21.8) + version: 0.1.6 ember-qunit: specifier: ^4.6.0 - version: 4.6.0(@babel/core@7.21.8) + version: 4.6.0 ember-resolver: specifier: ^8.0.0 - version: 8.0.2(@babel/core@7.21.8) + version: 8.0.2 ember-source: specifier: ~3.19.0 - version: 3.19.0(@babel/core@7.21.8) + version: 3.19.0 ember-template-lint: specifier: ^2.8.0 version: 2.8.0 @@ -815,13 +819,13 @@ importers: version: 3.0.0 ember-auto-import: specifier: ^1.5.3 - version: 1.5.3 + version: 1.12.2 ember-cli: specifier: ~4.1.0 version: 4.1.0 ember-cli-app-version: specifier: ^3.2.0 - version: 3.2.0(@babel/core@7.21.8) + version: 3.2.0 ember-cli-babel: specifier: ^7.20.5 version: 7.26.6 @@ -848,28 +852,28 @@ importers: version: 3.0.0 ember-data: specifier: ~3.19.0 - version: 3.19.0(@babel/core@7.21.8) + version: 3.19.0 ember-export-application-global: specifier: ^2.0.1 version: 2.0.1 ember-fetch: specifier: ^8.0.1 - version: 8.0.1(@babel/core@7.21.8) + version: 8.0.1 ember-load-initializers: specifier: ^2.1.1 - version: 2.1.2(@babel/core@7.21.8) + version: 2.1.2 ember-maybe-import-regenerator: specifier: ^0.1.6 - version: 0.1.6(@babel/core@7.21.8) + version: 0.1.6 ember-qunit: specifier: ^4.6.0 - version: 4.6.0(@babel/core@7.21.8) + version: 4.6.0 ember-resolver: specifier: ^8.0.0 - version: 8.0.2(@babel/core@7.21.8) + version: 8.0.2 ember-source: specifier: ~3.19.0 - version: 3.19.0(@babel/core@7.21.8) + version: 3.19.0 ember-template-lint: specifier: ^2.8.0 version: 2.8.0 @@ -892,6 +896,8 @@ importers: specifier: ^1.2.0 version: 1.6.0 + test-packages/ember-cli-fastboot-testing-app/dist: {} + test-packages/example-addon: dependencies: ember-cli-babel: @@ -906,7 +912,7 @@ importers: version: 1.3.0 '@glimmer/component': specifier: ^1.0.0 - version: 1.0.4(@babel/core@7.21.8) + version: 1.1.2 '@glimmer/tracking': specifier: ^1.0.0 version: 1.0.4 @@ -942,19 +948,19 @@ importers: version: 2.0.1 ember-load-initializers: specifier: ^2.1.1 - version: 2.1.2(@babel/core@7.21.8) + version: 2.1.2 ember-maybe-import-regenerator: specifier: ^0.1.6 - version: 0.1.6(@babel/core@7.21.8) + version: 0.1.6 ember-qunit: specifier: ^4.6.0 - version: 4.6.0(@babel/core@7.21.8) + version: 4.6.0 ember-resolver: specifier: ^8.0.0 - version: 8.0.2(@babel/core@7.21.8) + version: 8.0.2 ember-source: specifier: ~3.19.0 - version: 3.19.0(@babel/core@7.21.8) + version: 3.19.0 ember-source-channel-url: specifier: ^2.0.1 version: 2.0.1 @@ -1010,7 +1016,7 @@ importers: version: 1.3.0 '@glimmer/component': specifier: ^1.0.0 - version: 1.0.4(@babel/core@7.21.8) + version: 1.1.2 '@glimmer/tracking': specifier: ^1.0.0 version: 1.0.4 @@ -1028,7 +1034,7 @@ importers: version: 4.1.0 ember-cli-app-version: specifier: ^3.2.0 - version: 3.2.0(@babel/core@7.21.8) + version: 3.2.0 ember-cli-babel: specifier: ^7.20.5 version: 7.26.6 @@ -1052,28 +1058,28 @@ importers: version: 3.0.0 ember-data: specifier: ~3.19.0 - version: 3.19.0(@babel/core@7.21.8) + version: 3.19.0 ember-export-application-global: specifier: ^2.0.1 version: 2.0.1 ember-fetch: specifier: ^8.0.1 - version: 8.0.1(@babel/core@7.21.8) + version: 8.0.1 ember-load-initializers: specifier: ^2.1.1 - version: 2.1.2(@babel/core@7.21.8) + version: 2.1.2 ember-maybe-import-regenerator: specifier: ^0.1.6 - version: 0.1.6(@babel/core@7.21.8) + version: 0.1.6 ember-qunit: specifier: ^4.6.0 - version: 4.6.0(@babel/core@7.21.8) + version: 4.6.0 ember-resolver: specifier: ^8.0.0 - version: 8.0.2(@babel/core@7.21.8) + version: 8.0.2 ember-source: specifier: ~3.19.0 - version: 3.19.0(@babel/core@7.21.8) + version: 3.19.0 ember-template-lint: specifier: ^2.8.0 version: 2.8.0 @@ -1184,6 +1190,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/compat-data': 7.21.9 '@babel/core': 7.21.8 @@ -1197,6 +1206,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-annotate-as-pure': 7.18.6 @@ -1216,6 +1228,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-annotate-as-pure': 7.18.6 @@ -1226,6 +1241,9 @@ packages: resolution: {integrity: sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==} peerDependencies: '@babel/core': ^7.4.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.8) @@ -1296,6 +1314,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-annotate-as-pure': 7.18.6 @@ -1389,6 +1410,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1398,6 +1422,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.13.0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1409,6 +1436,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-environment-visitor': 7.21.5 @@ -1423,6 +1453,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.21.8) @@ -1435,6 +1468,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.12.0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.21.8) @@ -1448,6 +1484,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.21.8) @@ -1463,6 +1502,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1473,6 +1515,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1483,6 +1528,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1493,6 +1541,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1503,6 +1554,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1513,6 +1567,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1523,6 +1580,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/compat-data': 7.21.9 '@babel/core': 7.21.8 @@ -1536,6 +1596,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1546,6 +1609,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1555,8 +1621,12 @@ packages: /@babel/plugin-proposal-private-methods@7.18.6(@babel/core@7.21.8): resolution: {integrity: sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==} engines: {node: '>=6.9.0'} + deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-methods instead. peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.21.8) @@ -1567,8 +1637,12 @@ packages: /@babel/plugin-proposal-private-property-in-object@7.21.0(@babel/core@7.21.8): resolution: {integrity: sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==} engines: {node: '>=6.9.0'} + deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead. peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-annotate-as-pure': 7.18.6 @@ -1583,6 +1657,9 @@ packages: engines: {node: '>=4'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-create-regexp-features-plugin': 7.21.8(@babel/core@7.21.8) @@ -1592,6 +1669,9 @@ packages: resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1600,6 +1680,9 @@ packages: resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1609,6 +1692,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1618,6 +1704,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1626,6 +1715,9 @@ packages: resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1634,6 +1726,9 @@ packages: resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1643,6 +1738,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1651,6 +1749,9 @@ packages: resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1659,6 +1760,9 @@ packages: resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1667,6 +1771,9 @@ packages: resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1675,6 +1782,9 @@ packages: resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1683,6 +1793,9 @@ packages: resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1691,6 +1804,9 @@ packages: resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1699,6 +1815,9 @@ packages: resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1707,6 +1826,9 @@ packages: resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1716,6 +1838,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1725,6 +1850,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1734,6 +1862,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1743,6 +1874,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1752,6 +1886,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-module-imports': 7.21.4 @@ -1765,6 +1902,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1774,6 +1914,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1783,6 +1926,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-annotate-as-pure': 7.18.6 @@ -1802,6 +1948,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1812,6 +1961,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1821,6 +1973,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-create-regexp-features-plugin': 7.21.8(@babel/core@7.21.8) @@ -1831,6 +1986,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1840,6 +1998,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-builder-binary-assignment-operator-visitor': 7.21.5 @@ -1850,6 +2011,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1859,6 +2023,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.8) @@ -1870,6 +2037,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1879,6 +2049,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1888,6 +2061,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-module-transforms': 7.21.5 @@ -1900,6 +2076,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-module-transforms': 7.21.5 @@ -1913,6 +2092,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-hoist-variables': 7.18.6 @@ -1927,6 +2109,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-module-transforms': 7.21.5 @@ -1939,6 +2124,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-create-regexp-features-plugin': 7.21.8(@babel/core@7.21.8) @@ -1949,17 +2137,22 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 - /@babel/plugin-transform-object-assign@7.18.6(@babel/core@7.21.8): + /@babel/plugin-transform-object-assign@7.18.6: resolution: {integrity: sha512-mQisZ3JfqWh2gVXvfqYCAAyRs6+7oev+myBsTwW5RnPhYXOTuCEw2oe3YgxlXMViXUS53lG8koulI7mJ+8JE+A==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: - '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 dev: true @@ -1968,6 +2161,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1980,6 +2176,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1989,6 +2188,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -1998,6 +2200,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -2008,6 +2213,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -2017,6 +2225,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-module-imports': 7.21.4 @@ -2033,6 +2244,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -2042,6 +2256,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -2052,6 +2269,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -2061,6 +2281,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -2070,6 +2293,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -2079,6 +2305,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-annotate-as-pure': 7.18.6 @@ -2088,22 +2317,26 @@ packages: transitivePeerDependencies: - supports-color - /@babel/plugin-transform-typescript@7.4.5(@babel/core@7.21.8): + /@babel/plugin-transform-typescript@7.4.5: resolution: {integrity: sha512-RPB/YeGr4ZrFKNwfuQRlMf2lxoCUaU01MTw39/OFE/RiL8HDjtn68BwEPft1P7JN4akyEmjGWAMNldOV7o9V2g==} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: - '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 '@babel/plugin-syntax-typescript': 7.21.4(@babel/core@7.21.8) dev: true - /@babel/plugin-transform-typescript@7.5.5(@babel/core@7.21.8): + /@babel/plugin-transform-typescript@7.5.5: resolution: {integrity: sha512-pehKf4m640myZu5B2ZviLaiBlxMCjSZ1qTEO459AXKX5GnPueyulJeCqZFs1nz/Ya2dDzXQ1NxZ/kKNWyD4h6w==} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: - '@babel/core': 7.21.8 '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.21.8) '@babel/helper-plugin-utils': 7.21.5 '@babel/plugin-syntax-typescript': 7.21.4(@babel/core@7.21.8) @@ -2111,12 +2344,14 @@ packages: - supports-color dev: true - /@babel/plugin-transform-typescript@7.8.7(@babel/core@7.21.8): + /@babel/plugin-transform-typescript@7.8.7: resolution: {integrity: sha512-7O0UsPQVNKqpHeHLpfvOG4uXmlw+MOxYvUv6Otc9uH5SYMIxvF6eBdjkWvC3f9G+VXe0RsNExyAQBeTRug/wqQ==} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: - '@babel/core': 7.21.8 '@babel/helper-create-class-features-plugin': 7.21.8(@babel/core@7.21.8) '@babel/helper-plugin-utils': 7.21.5 '@babel/plugin-syntax-typescript': 7.21.4(@babel/core@7.21.8) @@ -2129,6 +2364,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -2138,6 +2376,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-create-regexp-features-plugin': 7.21.8(@babel/core@7.21.8) @@ -2155,6 +2396,9 @@ packages: engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/compat-data': 7.21.9 '@babel/core': 7.21.8 @@ -2240,6 +2484,9 @@ packages: resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-plugin-utils': 7.21.5 @@ -2311,71 +2558,71 @@ packages: dev: true optional: true - /@ember-data/adapter@3.19.0(@babel/core@7.21.8): + /@ember-data/adapter@3.19.0: resolution: {integrity: sha512-XELDnxcp6ZOxBrr5abebWeHrEbapSvszolQhuGVoCvl7EAr0IEWeJ8JGrAd6IhTt+XAHNzQ7rr28XVw7FA4Vtw==} engines: {node: 10.* || >= 12.*} dependencies: - '@ember-data/private-build-infra': 3.19.0(@babel/core@7.21.8) - '@ember-data/store': 3.19.0(@babel/core@7.21.8) + '@ember-data/private-build-infra': 3.19.0 + '@ember-data/store': 3.19.0 '@ember/edition-utils': 1.2.0 - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 ember-cli-test-info: 1.0.0 - ember-cli-typescript: 3.1.4(@babel/core@7.21.8) + ember-cli-typescript: 3.1.4 transitivePeerDependencies: - '@babel/core' - supports-color dev: true - /@ember-data/canary-features@3.19.0(@babel/core@7.21.8): + /@ember-data/canary-features@3.19.0: resolution: {integrity: sha512-AVrWEP4fARk2ee/CWGOEjLJwK2h+Un37CNIkxEFK9JG5tQh7yzBnbw74ZqDK7Ue9qqjF1fMwDOQUmvstm8SokA==} engines: {node: 10.* || >= 12.*} dependencies: - ember-cli-babel: 7.26.6 - ember-cli-typescript: 3.1.4(@babel/core@7.21.8) + ember-cli-babel: 7.26.11 + ember-cli-typescript: 3.1.4 transitivePeerDependencies: - '@babel/core' - supports-color dev: true - /@ember-data/debug@3.19.0(@babel/core@7.21.8): + /@ember-data/debug@3.19.0: resolution: {integrity: sha512-cTWKMuOiNa9rPAeY/iB4XznVL5Hs11MwLLJ8LgFP3ksZiveo2PQ4XnpxKmNj+p/QVMHRsdWaydg5MsFM7NH/ZQ==} engines: {node: 10.* || >= 12.*} dependencies: - '@ember-data/private-build-infra': 3.19.0(@babel/core@7.21.8) + '@ember-data/private-build-infra': 3.19.0 '@ember/edition-utils': 1.2.0 - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 ember-cli-test-info: 1.0.0 - ember-cli-typescript: 3.1.4(@babel/core@7.21.8) + ember-cli-typescript: 3.1.4 transitivePeerDependencies: - '@babel/core' - supports-color dev: true - /@ember-data/model@3.19.0(@babel/core@7.21.8): + /@ember-data/model@3.19.0: resolution: {integrity: sha512-OzQwzqk0NQRqHnGT1ZjSQBESfRJdqRFGTXIImxmGv4Mwb3I+3dpVETt/E2wPKP0GyhZqEUCg8X6Z4itY5ATKtw==} engines: {node: 10.* || >= 12.*} dependencies: - '@ember-data/canary-features': 3.19.0(@babel/core@7.21.8) - '@ember-data/private-build-infra': 3.19.0(@babel/core@7.21.8) - '@ember-data/store': 3.19.0(@babel/core@7.21.8) + '@ember-data/canary-features': 3.19.0 + '@ember-data/private-build-infra': 3.19.0 + '@ember-data/store': 3.19.0 '@ember/edition-utils': 1.2.0 - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 ember-cli-string-utils: 1.1.0 ember-cli-test-info: 1.0.0 - ember-cli-typescript: 3.1.4(@babel/core@7.21.8) - ember-compatibility-helpers: 1.2.6(@babel/core@7.21.8) + ember-cli-typescript: 3.1.4 + ember-compatibility-helpers: 1.2.6 inflection: 1.12.0 transitivePeerDependencies: - '@babel/core' - supports-color dev: true - /@ember-data/private-build-infra@3.19.0(@babel/core@7.21.8): + /@ember-data/private-build-infra@3.19.0: resolution: {integrity: sha512-uyXsW7x7ZJSxS1n69llvClfR9uUJ/AgWbghzo7oB7nHUML105W5E+Fp9JmBO/X2w3O7jk2NxNDM4/8xV5wPZVA==} engines: {node: 10.* || >= 12.*} dependencies: '@babel/plugin-transform-block-scoping': 7.21.0(@babel/core@7.21.8) - '@ember-data/canary-features': 3.19.0(@babel/core@7.21.8) + '@ember-data/canary-features': 3.19.0 '@ember/edition-utils': 1.2.0 babel-plugin-debug-macros: 0.3.4(@babel/core@7.21.8) babel-plugin-filter-imports: 4.0.0 @@ -2387,10 +2634,10 @@ packages: broccoli-rollup: 4.1.1 calculate-cache-key-for-tree: 2.0.0 chalk: 4.1.2 - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 ember-cli-path-utils: 1.0.0 ember-cli-string-utils: 1.1.0 - ember-cli-typescript: 3.1.4(@babel/core@7.21.8) + ember-cli-typescript: 3.1.4 ember-cli-version-checker: 5.1.2 esm: 3.2.25 git-repo-info: 2.1.1 @@ -2405,18 +2652,18 @@ packages: - supports-color dev: true - /@ember-data/record-data@3.19.0(@babel/core@7.21.8): + /@ember-data/record-data@3.19.0: resolution: {integrity: sha512-2tjhtJ+SSjzIF2UngSS8BAwxC1j53gxR2ewB9T4W530rqZ/pxLv5JkjLRlbtstFwFq34/okQY6MPCjapgY1k7Q==} engines: {node: 10.* || >= 12.*} dependencies: - '@ember-data/canary-features': 3.19.0(@babel/core@7.21.8) - '@ember-data/private-build-infra': 3.19.0(@babel/core@7.21.8) - '@ember-data/store': 3.19.0(@babel/core@7.21.8) + '@ember-data/canary-features': 3.19.0 + '@ember-data/private-build-infra': 3.19.0 + '@ember-data/store': 3.19.0 '@ember/edition-utils': 1.2.0 - '@ember/ordered-set': 2.0.3(@babel/core@7.21.8) - ember-cli-babel: 7.26.6 + '@ember/ordered-set': 2.0.3 + ember-cli-babel: 7.26.11 ember-cli-test-info: 1.0.0 - ember-cli-typescript: 3.1.4(@babel/core@7.21.8) + ember-cli-typescript: 3.1.4 transitivePeerDependencies: - '@babel/core' - supports-color @@ -2425,37 +2672,37 @@ packages: /@ember-data/rfc395-data@0.0.4: resolution: {integrity: sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ==} - /@ember-data/serializer@3.19.0(@babel/core@7.21.8): + /@ember-data/serializer@3.19.0: resolution: {integrity: sha512-eyUODXfuGWRcDxo37JNsWYnxWGf1uv7oTlC+m0DJHSCZpql24Dc0VfIJ8JtSmi4G7wq3EtCfVx1vni/HKJinfg==} engines: {node: 10.* || >= 12.*} dependencies: - '@ember-data/private-build-infra': 3.19.0(@babel/core@7.21.8) - '@ember-data/store': 3.19.0(@babel/core@7.21.8) - ember-cli-babel: 7.26.6 + '@ember-data/private-build-infra': 3.19.0 + '@ember-data/store': 3.19.0 + ember-cli-babel: 7.26.11 ember-cli-test-info: 1.0.0 - ember-cli-typescript: 3.1.4(@babel/core@7.21.8) + ember-cli-typescript: 3.1.4 transitivePeerDependencies: - '@babel/core' - supports-color dev: true - /@ember-data/store@3.19.0(@babel/core@7.21.8): + /@ember-data/store@3.19.0: resolution: {integrity: sha512-4/sOvUd4oeAzB+k57qkbBy9ssUU7MjyNiQZwqYxmlPU9k/1T2/gUKZVmZtDIab1zInIFzLsFpS0PYv9Gt1mz3Q==} engines: {node: 10.* || >= 12.*} dependencies: - '@ember-data/canary-features': 3.19.0(@babel/core@7.21.8) - '@ember-data/private-build-infra': 3.19.0(@babel/core@7.21.8) - ember-cli-babel: 7.26.6 + '@ember-data/canary-features': 3.19.0 + '@ember-data/private-build-infra': 3.19.0 + ember-cli-babel: 7.26.11 ember-cli-path-utils: 1.0.0 - ember-cli-typescript: 3.1.4(@babel/core@7.21.8) + ember-cli-typescript: 3.1.4 heimdalljs: 0.3.3 transitivePeerDependencies: - '@babel/core' - supports-color dev: true - /@ember-template-lint/todo-utils@8.1.0: - resolution: {integrity: sha512-fnxDli4RfYGVBXc64D0fg7ifkSrNE8J/ee4eqQLzTrsUJbisWMlmU2NTHm990XcZkulYkCnkiLKERU/k1tx5IQ==} + /@ember-template-lint/todo-utils@10.0.0: + resolution: {integrity: sha512-US8VKnetBOl8KfKz+rXGsosz6rIETNwSz2F2frM8hIoJfF/d6ME1Iz1K7tPYZEE6SoKqZFlBs5XZPSmzRnabjA==} engines: {node: 10.* || 12.* || >= 14} dependencies: '@types/eslint': 7.29.0 @@ -2496,12 +2743,12 @@ packages: - supports-color dev: true - /@ember/ordered-set@2.0.3(@babel/core@7.21.8): + /@ember/ordered-set@2.0.3: resolution: {integrity: sha512-F4yfVk6WMc4AUHxeZsC3CaKyTvO0qSZJy7WWHCFTlVDQw6vubn+FvnGdhzpN1F00EiXMI4Tv1tJdSquHcCnYrA==} engines: {node: 6.* || 8.* || >= 10.*} dependencies: ember-cli-babel: 6.18.0(@babel/core@7.21.8) - ember-compatibility-helpers: 1.2.6(@babel/core@7.21.8) + ember-compatibility-helpers: 1.2.6 transitivePeerDependencies: - '@babel/core' - supports-color @@ -2514,25 +2761,32 @@ packages: broccoli-debug: 0.6.5 broccoli-funnel: 2.0.2 ember-assign-polyfill: 2.7.3 - ember-cli-babel: 7.26.6 - ember-cli-htmlbars-inline-precompile: 2.1.0(ember-cli-babel@7.26.6) + ember-cli-babel: 7.26.11 + ember-cli-htmlbars-inline-precompile: 2.1.0(ember-cli-babel@7.26.11) ember-test-waiters: 1.2.0 transitivePeerDependencies: - supports-color dev: true - /@ember/test-helpers@2.6.0(@babel/core@7.21.8): - resolution: {integrity: sha512-N5sr3layWk60wB3maCy+/5hFHQRcTh8aqxcZTSs3Od9QkuHdWBtRgMGLP/35mXpJlgWuu3xqLpt6u3dGHc8gCg==} + /@ember/test-helpers@2.9.4(ember-source@3.26.2): + resolution: {integrity: sha512-z+Qs1NYWyIVDmrY6WdmOS5mdG1lJ5CFfzh6dRhLfs9lq45deDaDrVNcaCYhnNeJZTvUBK2XR2SvPcZm0RloXdA==} engines: {node: 10.* || 12.* || 14.* || 15.* || >= 16.*} + peerDependencies: + ember-source: '>=3.8.0' dependencies: '@ember/test-waiters': 3.0.2 + '@embroider/macros': 1.13.2 + '@embroider/util': 1.12.0(ember-source@3.26.2) broccoli-debug: 0.6.5 broccoli-funnel: 3.0.8 - ember-cli-babel: 7.26.6 - ember-cli-htmlbars: 5.7.1 - ember-destroyable-polyfill: 2.0.3(@babel/core@7.21.8) + ember-cli-babel: 7.26.11 + ember-cli-htmlbars: 6.3.0 + ember-destroyable-polyfill: 2.0.3 + ember-source: 3.26.2 transitivePeerDependencies: - '@babel/core' + - '@glint/environment-ember-loose' + - '@glint/template' - supports-color dev: true @@ -2541,7 +2795,7 @@ packages: engines: {node: 10.* || 12.* || >= 14.*} dependencies: calculate-cache-key-for-tree: 2.0.0 - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 ember-cli-version-checker: 5.1.2 semver: 7.5.1 transitivePeerDependencies: @@ -2573,7 +2827,7 @@ packages: json-stable-stringify: 1.0.1 lodash: 4.17.21 pkg-up: 2.0.0 - resolve: 1.22.0 + resolve: 1.22.2 resolve-package-path: 1.2.7 semver: 5.7.1 strip-bom: 3.0.0 @@ -2600,6 +2854,27 @@ packages: - utf-8-validate dev: true + /@embroider/macros@1.13.2: + resolution: {integrity: sha512-AUgJ71xG8kjuTx8XB1AQNBiebJuXRfhcHr318dCwnQz9VRXdYSnEEqf38XRvGYIoCvIyn/3c72LrSwzaJqknOA==} + engines: {node: 12.* || 14.* || >= 16} + peerDependencies: + '@glint/template': ^1.0.0 + peerDependenciesMeta: + '@glint/template': + optional: true + dependencies: + '@embroider/shared-internals': 2.5.0 + assert-never: 1.2.1 + babel-import-util: 2.0.1 + ember-cli-babel: 7.26.11 + find-up: 5.0.0 + lodash: 4.17.21 + resolve: 1.22.2 + semver: 7.5.1 + transitivePeerDependencies: + - supports-color + dev: true + /@embroider/shared-internals@0.40.0: resolution: {integrity: sha512-Ovr/i0Qgn6W6jdGXMvYJKlRoRpyBY9uhYozDSFKlBjeEmRJ0Plp7OST41+O5Td6Pqp+Rv2jVSnGzhA/MpC++NQ==} engines: {node: 10.* || 12.* || >= 14} @@ -2627,11 +2902,49 @@ packages: typescript-memoize: 1.1.1 dev: true + /@embroider/shared-internals@2.5.0: + resolution: {integrity: sha512-7qzrb7GVIyNqeY0umxoeIvjDC+ay1b+wb2yCVuYTUYrFfLAkLEy9FNI3iWCi3RdQ9OFjgcAxAnwsAiPIMZZ3pQ==} + engines: {node: 12.* || 14.* || >= 16} + dependencies: + babel-import-util: 2.0.1 + debug: 4.3.4 + ember-rfc176-data: 0.3.18 + fs-extra: 9.1.0 + js-string-escape: 1.0.1 + lodash: 4.17.21 + resolve-package-path: 4.0.3 + semver: 7.5.1 + typescript-memoize: 1.1.1 + transitivePeerDependencies: + - supports-color + dev: true + /@embroider/test-setup@0.37.0: resolution: {integrity: sha512-4jme5zEonjGvKeyVRygyXmooMuwmaa3nBiIxwbkRA6KWh0BLyZSqPwlQl93s7IT7S5PO5U9TqNiqI4yp2k5T7Q==} dependencies: lodash: 4.17.21 - resolve: 1.22.0 + resolve: 1.22.2 + dev: true + + /@embroider/util@1.12.0(ember-source@3.26.2): + resolution: {integrity: sha512-P4M1QADEH9ceIYC9mwHeV+6DDgEIQQYFfZi728nVKqTAxakXoiLgu/BCyQmEGyow9fYEPYaC1boDCZxW2JQAXg==} + engines: {node: 14.* || >= 16} + peerDependencies: + '@glint/environment-ember-loose': ^1.0.0 + '@glint/template': ^1.0.0 + ember-source: '*' + peerDependenciesMeta: + '@glint/environment-ember-loose': + optional: true + '@glint/template': + optional: true + dependencies: + '@embroider/macros': 1.13.2 + broccoli-funnel: 3.0.8 + ember-cli-babel: 7.26.11 + ember-source: 3.26.2 + transitivePeerDependencies: + - supports-color dev: true /@eslint/eslintrc@0.4.3: @@ -2639,7 +2952,7 @@ packages: engines: {node: ^10.12.0 || >=12.0.0} dependencies: ajv: 6.12.6 - debug: 4.3.3 + debug: 4.3.4 espree: 7.3.1 globals: 13.20.0 ignore: 4.0.6 @@ -2655,8 +2968,8 @@ packages: resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==} dev: true - /@glimmer/component@1.0.4(@babel/core@7.21.8): - resolution: {integrity: sha512-sS4N8wtcKfYdUJ6O3m8nbTut6NjErdz94Ap8VB1ekcg4WSD+7sI7Nmv6kt2rdPoe363nUdjUbRBzHNWhLzraBw==} + /@glimmer/component@1.1.2: + resolution: {integrity: sha512-XyAsEEa4kWOPy+gIdMjJ8XlzA3qrGH55ZDv6nA16ibalCR17k74BI0CztxuRds+Rm6CtbUVgheCVlcCULuqD7A==} engines: {node: 6.* || 8.* || >= 10.*} dependencies: '@glimmer/di': 0.1.11 @@ -2664,15 +2977,15 @@ packages: '@glimmer/util': 0.44.0 broccoli-file-creator: 2.1.1 broccoli-merge-trees: 3.0.2 - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 ember-cli-get-component-path-option: 1.0.0 ember-cli-is-package-missing: 1.0.0 ember-cli-normalize-entity-name: 1.0.0 ember-cli-path-utils: 1.0.0 ember-cli-string-utils: 1.1.0 - ember-cli-typescript: 3.0.0(@babel/core@7.21.8) + ember-cli-typescript: 3.0.0 ember-cli-version-checker: 3.1.3 - ember-compatibility-helpers: 1.2.6(@babel/core@7.21.8) + ember-compatibility-helpers: 1.2.6 transitivePeerDependencies: - '@babel/core' - supports-color @@ -2710,6 +3023,12 @@ packages: '@simple-dom/interface': 1.4.0 dev: true + /@glimmer/interfaces@0.84.3: + resolution: {integrity: sha512-dk32ykoNojt0mvEaIW6Vli5MGTbQo58uy3Epj7ahCgTHmWOKuw/0G83f2UmFprRwFx689YTXG38I/vbpltEjzg==} + dependencies: + '@simple-dom/interface': 1.4.0 + dev: true + /@glimmer/reference@0.62.5: resolution: {integrity: sha512-d9T5WpKzU+T22MWrnkFaN1IM60TBQbeR6C43x1Cto4QvQfDAh3EImnLfETr8CUyz9WK+jc+IyWKQrpQdgMI+4Q==} dependencies: @@ -2748,6 +3067,15 @@ packages: simple-html-tokenizer: 0.5.11 dev: true + /@glimmer/syntax@0.84.3: + resolution: {integrity: sha512-ioVbTic6ZisLxqTgRBL2PCjYZTFIwobifCustrozRU2xGDiYvVIL0vt25h2c1ioDsX59UgVlDkIK4YTAQQSd2A==} + dependencies: + '@glimmer/interfaces': 0.84.3 + '@glimmer/util': 0.84.3 + '@handlebars/parser': 2.0.0 + simple-html-tokenizer: 0.5.11 + dev: true + /@glimmer/tracking@1.0.4: resolution: {integrity: sha512-F+oT8I55ba2puSGIzInmVrv/8QA2PcK1VD+GWgFMhF6WC97D+uZX7BFg+a3s/2N4FVBq5KHE+QxZzgazM151Yw==} dependencies: @@ -2775,6 +3103,14 @@ packages: '@simple-dom/interface': 1.4.0 dev: true + /@glimmer/util@0.84.3: + resolution: {integrity: sha512-qFkh6s16ZSRuu2rfz3T4Wp0fylFj3HBsONGXQcrAdZjdUaIS6v3pNj6mecJ71qRgcym9Hbaq/7/fefIwECUiKw==} + dependencies: + '@glimmer/env': 0.1.7 + '@glimmer/interfaces': 0.84.3 + '@simple-dom/interface': 1.4.0 + dev: true + /@glimmer/validator@0.44.0: resolution: {integrity: sha512-i01plR0EgFVz69GDrEuFgq1NheIjZcyTy3c7q+w7d096ddPVeVcRzU3LKaqCfovvLJ+6lJx40j45ecycASUUyw==} dev: true @@ -2793,7 +3129,7 @@ packages: '@glimmer/global-context': 0.65.4 dev: true - /@glimmer/vm-babel-plugins@0.77.5(@babel/core@7.21.8): + /@glimmer/vm-babel-plugins@0.77.5: resolution: {integrity: sha512-jTBM7fJMrIEy4/bCeI8e7ypR+AuWYzLA+KORCGbnTJtL/NYg4G8qwhQAZBtg1d3KmoqyqaCsyqE6f4/tzJO4eQ==} dependencies: babel-plugin-debug-macros: 0.3.4(@babel/core@7.21.8) @@ -2805,6 +3141,25 @@ packages: resolution: {integrity: sha512-rR7tJoSwJ2eooOpYGxGGW95sLq6GXUaS1UtWvN7pei6n2/okYvCGld9vsUTvkl2migxbkszsycwtMf/GEc1k1A==} dev: true + /@handlebars/parser@2.0.0: + resolution: {integrity: sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==} + dev: true + + /@humanwhocodes/config-array@0.5.0: + resolution: {integrity: sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==} + engines: {node: '>=10.10.0'} + dependencies: + '@humanwhocodes/object-schema': 1.2.1 + debug: 4.3.4 + minimatch: 3.1.2 + transitivePeerDependencies: + - supports-color + dev: true + + /@humanwhocodes/object-schema@1.2.1: + resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} + dev: true + /@iarna/toml@2.2.5: resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==} dev: true @@ -4204,7 +4559,7 @@ packages: heimdalljs: 0.2.6 istextorbinary: 2.6.0 mkdirp: 0.5.6 - rimraf: 3.0.1 + rimraf: 3.0.2 rsvp: 4.8.5 username-sync: 1.0.3 transitivePeerDependencies: @@ -4212,6 +4567,7 @@ packages: /async-each@1.0.6: resolution: {integrity: sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==} + requiresBuild: true dev: true optional: true @@ -4320,6 +4676,24 @@ packages: - supports-color dev: true + /babel-eslint@10.1.0(eslint@7.32.0): + resolution: {integrity: sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==} + engines: {node: '>=6'} + deprecated: babel-eslint is now @babel/eslint-parser. This package will no longer receive updates. + peerDependencies: + eslint: '>= 4.12.1' + dependencies: + '@babel/code-frame': 7.21.4 + '@babel/parser': 7.21.9 + '@babel/traverse': 7.21.5 + '@babel/types': 7.21.5 + eslint: 7.32.0 + eslint-visitor-keys: 1.3.0 + resolve: 1.22.0 + transitivePeerDependencies: + - supports-color + dev: true + /babel-generator@6.26.1: resolution: {integrity: sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==} dependencies: @@ -4455,12 +4829,20 @@ packages: engines: {node: '>= 12.*'} dev: true + /babel-import-util@2.0.1: + resolution: {integrity: sha512-N1ZfNprtf/37x0R05J0QCW/9pCAcuI+bjZIK9tlu0JEkwEST7ssdD++gxHRbD58AiG5QE5OuNYhRoEFsc1wESw==} + engines: {node: '>= 12.*'} + dev: true + /babel-loader@8.3.0(@babel/core@7.21.8)(webpack@4.28.4): resolution: {integrity: sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==} engines: {node: '>= 8.9'} peerDependencies: '@babel/core': ^7.0.0 webpack: '>=2' + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 find-cache-dir: 3.3.2 @@ -4476,6 +4858,9 @@ packages: peerDependencies: '@babel/core': ^7.0.0 webpack: '>=2' + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 find-cache-dir: 3.3.2 @@ -4491,6 +4876,9 @@ packages: peerDependencies: '@babel/core': ^7.0.0 webpack: '>=2' + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 find-cache-dir: 3.3.2 @@ -4517,6 +4905,9 @@ packages: engines: {node: '>=4'} peerDependencies: '@babel/core': ^7.0.0-beta.42 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 semver: 5.7.1 @@ -4527,6 +4918,9 @@ packages: engines: {node: '>=6'} peerDependencies: '@babel/core': ^7.0.0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 semver: 5.7.1 @@ -4550,6 +4944,14 @@ packages: dependencies: ember-rfc176-data: 0.3.18 + /babel-plugin-ember-template-compilation@2.2.0: + resolution: {integrity: sha512-1I7f5gf06h5wKdKUvaYEIaoSFur5RLUvTMQG4ak0c5Y11DWUxcoX9hrun1xe9fqfY2dtGFK+ZUM6sn6z8sqK/w==} + engines: {node: '>= 12.*'} + dependencies: + '@glimmer/syntax': 0.84.3 + babel-import-util: 2.0.1 + dev: true + /babel-plugin-filter-imports@4.0.0: resolution: {integrity: sha512-jDLlxI8QnfKd7PtieH6pl4tZJzymzfCDCPGdTq/grgbiYAikwDPp/oL0IlFJn0HQjLpcLkyYhPKkUVneRESw5w==} engines: {node: '>=8'} @@ -4586,7 +4988,7 @@ packages: glob: 7.2.3 pkg-up: 2.0.0 reselect: 3.0.1 - resolve: 1.22.0 + resolve: 1.22.2 /babel-plugin-module-resolver@4.1.0: resolution: {integrity: sha512-MlX10UDheRr3lb3P0WcaIdtCSRlxdQsB1sBqL7W0raF070bGl1HQQq5K3T2vf2XAYie+ww+5AKC/WrkjRO2knA==} @@ -4596,13 +4998,16 @@ packages: glob: 7.2.3 pkg-up: 3.1.0 reselect: 4.1.8 - resolve: 1.22.0 + resolve: 1.22.2 dev: true /babel-plugin-polyfill-corejs2@0.3.3(@babel/core@7.21.8): resolution: {integrity: sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/compat-data': 7.21.9 '@babel/core': 7.21.8 @@ -4615,6 +5020,9 @@ packages: resolution: {integrity: sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.21.8) @@ -4626,6 +5034,9 @@ packages: resolution: {integrity: sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==} peerDependencies: '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true dependencies: '@babel/core': 7.21.8 '@babel/helper-define-polyfill-provider': 0.3.3(@babel/core@7.21.8) @@ -5047,6 +5458,7 @@ packages: /binary-extensions@1.13.1: resolution: {integrity: sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==} engines: {node: '>=0.10.0'} + requiresBuild: true dev: true optional: true @@ -5061,6 +5473,7 @@ packages: /bindings@1.5.0: resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==} + requiresBuild: true dependencies: file-uri-to-path: 1.0.0 dev: true @@ -5134,6 +5547,26 @@ packages: transitivePeerDependencies: - supports-color + /body-parser@1.20.2: + resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==} + engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} + dependencies: + bytes: 3.1.2 + content-type: 1.0.5 + debug: 2.6.9 + depd: 2.0.0 + destroy: 1.2.0 + http-errors: 2.0.0 + iconv-lite: 0.4.24 + on-finished: 2.4.1 + qs: 6.11.0 + raw-body: 2.5.2 + type-is: 1.6.18 + unpipe: 1.0.0 + transitivePeerDependencies: + - supports-color + dev: true + /body@5.1.0: resolution: {integrity: sha512-chUsBxGRtuElD6fmw1gHLpvnKdVLK302peeFa9ZqAEk8TyzZ3fygLyUEDDPTJvL9+Bor0dIwn6ePOsRM2y0zQQ==} dependencies: @@ -5628,7 +6061,7 @@ packages: heimdalljs: 0.2.6 heimdalljs-logger: 0.1.10 promise-map-series: 0.2.3 - rimraf: 3.0.1 + rimraf: 3.0.2 symlink-or-copy: 1.3.1 sync-disk-cache: 2.1.0 transitivePeerDependencies: @@ -5777,7 +6210,7 @@ packages: ensure-posix-path: 1.1.1 fs-extra: 5.0.0 minimatch: 3.1.2 - resolve: 1.22.0 + resolve: 1.22.2 rsvp: 4.8.5 symlink-or-copy: 1.3.1 walk-sync: 0.3.4 @@ -5799,7 +6232,7 @@ packages: ensure-posix-path: 1.1.1 fs-extra: 8.1.0 minimatch: 3.1.2 - resolve: 1.22.0 + resolve: 1.22.2 rsvp: 4.8.5 symlink-or-copy: 1.3.1 walk-sync: 1.1.4 @@ -5826,7 +6259,7 @@ packages: dependencies: async-promise-queue: 1.0.5 broccoli-plugin: 4.0.7 - debug: 4.3.3 + debug: 4.3.4 lodash.defaultsdeep: 4.6.1 matcher-collection: 2.0.1 source-map-url: 0.4.1 @@ -6057,6 +6490,11 @@ packages: resolution: {integrity: sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==} engines: {node: '>= 0.8'} + /bytes@3.1.2: + resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} + engines: {node: '>= 0.8'} + dev: true + /cacache@12.0.4: resolution: {integrity: sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==} dependencies: @@ -6219,7 +6657,6 @@ packages: engines: {node: 6.* || 8.* || >= 10.*} dependencies: json-stable-stringify: 1.0.1 - dev: true /call-bind@1.0.2: resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==} @@ -6410,6 +6847,7 @@ packages: /chokidar@2.1.8: resolution: {integrity: sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==} deprecated: Chokidar 2 does not receive security updates since 2019. Upgrade to chokidar 3 with 15x fewer dependencies + requiresBuild: true dependencies: anymatch: 2.0.0 async-each: 1.0.6 @@ -6715,8 +7153,8 @@ packages: engines: {node: '>= 6'} dev: true - /commander@7.1.0: - resolution: {integrity: sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==} + /commander@7.2.0: + resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==} engines: {node: '>= 10'} dev: true @@ -7161,12 +7599,12 @@ packages: webpack: 5.58.1 dev: true - /css-tree@1.1.3: - resolution: {integrity: sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==} - engines: {node: '>=8.0.0'} + /css-tree@2.3.1: + resolution: {integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==} + engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0} dependencies: - mdn-data: 2.0.14 - source-map: 0.6.1 + mdn-data: 2.0.30 + source-map-js: 1.0.2 dev: true /cssesc@3.0.0: @@ -7446,7 +7884,7 @@ packages: engines: {node: '>=10'} dependencies: flat: 5.0.2 - lodash: 4.17.20 + lodash: 4.17.21 dev: true /deprecation@2.3.1: @@ -7468,6 +7906,11 @@ packages: /destroy@1.0.4: resolution: {integrity: sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==} + /destroy@1.2.0: + resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==} + engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} + dev: true + /detect-file@0.1.0: resolution: {integrity: sha512-akiVcMZym+vO3IxctGG9dnuJT4AYQTAhjsGbjeGqqMUr9Ffy7XEAUmfKLSHugr/tGLaAZ4jWROErPPrsfG8+bQ==} engines: {node: '>=0.10.0'} @@ -7618,7 +8061,7 @@ packages: resolution: {integrity: sha512-PINAtHOQf5DKniyecOBZSz8VZVmtIKFvp67853+aw+TL+LWUCji5OjQ13PrAV/GIl3Fp2sZ7IbEPyTobDL7Y8Q==} engines: {node: 6.* || 8.* || 10.* || >= 12} dependencies: - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 ember-cli-version-checker: 2.2.0 transitivePeerDependencies: - supports-color @@ -7642,7 +8085,7 @@ packages: broccoli-plugin: 4.0.7 broccoli-source: 3.0.1 debug: 3.2.7 - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 enhanced-resolve: 4.5.0 fs-extra: 6.0.1 fs-tree-diff: 2.0.1 @@ -7724,7 +8167,7 @@ packages: broccoli-source: 3.0.1 css-loader: 5.2.7(webpack@5.58.1) debug: 4.3.3 - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 fs-extra: 6.0.1 fs-tree-diff: 2.0.1 handlebars: 4.7.7 @@ -7761,7 +8204,7 @@ packages: - supports-color dev: true - /ember-cli-app-version@3.2.0(@babel/core@7.21.8): + /ember-cli-app-version@3.2.0: resolution: {integrity: sha512-fHWOJElSw8JL03FNCHrT0RdWhGpWEQ4VQ10unEwwhVZ+OANNcOLz8O2dA3D5iuB4bb0fMLwjEwYZGM62+TBs1Q==} engines: {node: ^4.5 || 6.* || >= 7.*} dependencies: @@ -7798,6 +8241,43 @@ packages: - supports-color dev: true + /ember-cli-babel@7.26.11: + resolution: {integrity: sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==} + engines: {node: 6.* || 8.* || >= 10.*} + dependencies: + '@babel/core': 7.21.8 + '@babel/helper-compilation-targets': 7.21.5(@babel/core@7.21.8) + '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.21.8) + '@babel/plugin-proposal-decorators': 7.21.0(@babel/core@7.21.8) + '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.21.8) + '@babel/plugin-proposal-private-property-in-object': 7.21.0(@babel/core@7.21.8) + '@babel/plugin-transform-modules-amd': 7.20.11(@babel/core@7.21.8) + '@babel/plugin-transform-runtime': 7.21.4(@babel/core@7.21.8) + '@babel/plugin-transform-typescript': 7.21.3(@babel/core@7.21.8) + '@babel/polyfill': 7.12.1 + '@babel/preset-env': 7.21.5(@babel/core@7.21.8) + '@babel/runtime': 7.12.18 + amd-name-resolver: 1.3.1 + babel-plugin-debug-macros: 0.3.4(@babel/core@7.21.8) + babel-plugin-ember-data-packages-polyfill: 0.1.2 + babel-plugin-ember-modules-api-polyfill: 3.5.0 + babel-plugin-module-resolver: 3.2.0 + broccoli-babel-transpiler: 7.8.1 + broccoli-debug: 0.6.5 + broccoli-funnel: 2.0.2 + broccoli-source: 2.1.2 + calculate-cache-key-for-tree: 2.0.0 + clone: 2.1.2 + ember-cli-babel-plugin-helpers: 1.1.1 + ember-cli-version-checker: 4.1.1 + ensure-posix-path: 1.1.1 + fixturify-project: 1.10.0 + resolve-package-path: 3.1.0 + rimraf: 3.0.2 + semver: 5.7.1 + transitivePeerDependencies: + - supports-color + /ember-cli-babel@7.26.6: resolution: {integrity: sha512-040svtfj2RC35j/WMwdWJFusZaXmNoytLAMyBDGLMSlRvznudTxZjGlPV6UupmtTBApy58cEF8Fq4a+COWoEmQ==} engines: {node: 6.* || 8.* || >= 10.*} @@ -7849,14 +8329,14 @@ packages: resolution: {integrity: sha512-BZmqXSYI9zCDWby9AkpbUnwUK0ubm78a84NUpp5Mv3QSY2HDar6JgEu+XAQA49dKQBfMVuNU4YMq4AGG5dx6yA==} engines: {node: 8.* || >= 10.*} dependencies: - body-parser: 1.18.3 - ember-auto-import: 1.5.3 - ember-cli-babel: 7.26.6 + body-parser: 1.20.2 + ember-auto-import: 1.12.2 + ember-cli-babel: 7.26.11 fastboot: 3.3.2 json-fn: 1.1.1 minimist: 1.2.8 nock: 12.0.3 - resolve: 1.22.0 + resolve: 1.22.2 whatwg-fetch: 3.6.2 transitivePeerDependencies: - bufferutil @@ -7875,14 +8355,14 @@ packages: resolution: {integrity: sha512-7gj8H/KSF+e4pxSKxj9F8hq9PUt2vOjCaOvRdxdmyoHnko4QbiUnv8ASpXuop+m15eNIUGOlaLrJJ3jM8oQEUw==} engines: {node: 10.* || >= 12} dependencies: - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 ember-cli-htmlbars: 4.5.0 ember-in-element-polyfill: 1.0.1 transitivePeerDependencies: - supports-color dev: true - /ember-cli-htmlbars-inline-precompile@2.1.0(ember-cli-babel@7.26.6): + /ember-cli-htmlbars-inline-precompile@2.1.0(ember-cli-babel@7.26.11): resolution: {integrity: sha512-BylIHduwQkncPhnj0ZyorBuljXbTzLgRo6kuHf1W+IHFxThFl2xG+r87BVwsqx4Mn9MTgW9SE0XWjwBJcSWd6Q==} engines: {node: 6.* || 8.* || >= 10.*} deprecated: Use ember-cli-htmlbars instead. @@ -7890,7 +8370,7 @@ packages: ember-cli-babel: ^6.7.1 || ^7.0.0 dependencies: babel-plugin-htmlbars-inline-precompile: 1.0.0 - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 ember-cli-version-checker: 2.2.0 hash-for-dep: 1.5.1 heimdalljs-logger: 0.1.10 @@ -7956,6 +8436,52 @@ packages: transitivePeerDependencies: - supports-color + /ember-cli-htmlbars@5.7.2: + resolution: {integrity: sha512-Uj6R+3TtBV5RZoJY14oZn/sNPnc+UgmC8nb5rI4P3fR/gYoyTFIZSXiIM7zl++IpMoIrocxOrgt+mhonKphgGg==} + engines: {node: 10.* || >= 12.*} + dependencies: + '@ember/edition-utils': 1.2.0 + babel-plugin-htmlbars-inline-precompile: 5.3.1 + broccoli-debug: 0.6.5 + broccoli-persistent-filter: 3.1.3 + broccoli-plugin: 4.0.7 + common-tags: 1.8.2 + ember-cli-babel-plugin-helpers: 1.1.1 + ember-cli-version-checker: 5.1.2 + fs-tree-diff: 2.0.1 + hash-for-dep: 1.5.1 + heimdalljs-logger: 0.1.10 + json-stable-stringify: 1.0.1 + semver: 7.5.1 + silent-error: 1.1.1 + strip-bom: 4.0.0 + walk-sync: 2.2.0 + transitivePeerDependencies: + - supports-color + dev: true + + /ember-cli-htmlbars@6.3.0: + resolution: {integrity: sha512-N9Y80oZfcfWLsqickMfRd9YByVcTGyhYRnYQ2XVPVrp6jyUyOeRWmEAPh7ERSXpp8Ws4hr/JB9QVQrn/yZa+Ag==} + engines: {node: 12.* || 14.* || >= 16} + dependencies: + '@ember/edition-utils': 1.2.0 + babel-plugin-ember-template-compilation: 2.2.0 + babel-plugin-htmlbars-inline-precompile: 5.3.1 + broccoli-debug: 0.6.5 + broccoli-persistent-filter: 3.1.3 + broccoli-plugin: 4.0.7 + ember-cli-version-checker: 5.1.2 + fs-tree-diff: 2.0.1 + hash-for-dep: 1.5.1 + heimdalljs-logger: 0.1.10 + js-string-escape: 1.0.1 + semver: 7.5.1 + silent-error: 1.1.1 + walk-sync: 2.2.0 + transitivePeerDependencies: + - supports-color + dev: true + /ember-cli-inject-live-reload@2.0.2: resolution: {integrity: sha512-HDD6o/kBHT/kUtazklU0OW23q2jigIN42QmcpFdXUSvJ2/2SYA6yIqSUxWfJgISmtn5gTNZ2KPq1p3dLkhJxSQ==} engines: {node: 6.* || 8.* || >= 10.*} @@ -7964,6 +8490,14 @@ packages: ember-cli-version-checker: 3.1.3 dev: true + /ember-cli-inject-live-reload@2.1.0: + resolution: {integrity: sha512-YV5wYRD5PJHmxaxaJt18u6LE6Y+wo455BnmcpN+hGNlChy2piM9/GMvYgTAz/8Vin8RJ5KekqP/w/NEaRndc/A==} + engines: {node: 6.* || 8.* || >= 10.*} + dependencies: + clean-base-url: 1.0.0 + ember-cli-version-checker: 3.1.3 + dev: true + /ember-cli-is-package-missing@1.0.0: resolution: {integrity: sha512-9hEoZj6Au5onlSDdcoBqYEPT8ehlYntZPxH8pBKV0GO7LNel88otSAQsCfXvbi2eKE+MaSeLG/gNaCI5UdWm9g==} dev: true @@ -8007,8 +8541,8 @@ packages: resolution: {integrity: sha512-PlJt4fUDyBrC/0X+4cOpaGCiMawaaB//qD85AXmDRikxhxVzfVdpuoec02HSiTGTTB85qCIzWBIh8lDOiMyyFg==} dev: true - /ember-cli-terser@4.0.1: - resolution: {integrity: sha512-vvp0uVl8reYeW9EZjSXRPR3Bq7y4u9CYlUdI7j/WzMPDj3/gUHU4Z7CHYOCrftrClQvFfqO2eXmHwDA6F7SLug==} + /ember-cli-terser@4.0.2: + resolution: {integrity: sha512-Ej77K+YhCZImotoi/CU2cfsoZaswoPlGaM5TB3LvjvPDlVPRhxUHO2RsaUVC5lsGeRLRiHCOxVtoJ6GyqexzFA==} engines: {node: 10.* || 12.* || >= 14} dependencies: broccoli-terser-sourcemap: 4.1.0 @@ -8022,7 +8556,7 @@ packages: ember-cli-string-utils: 1.1.0 dev: true - /ember-cli-test-loader@2.2.0(@babel/core@7.21.8): + /ember-cli-test-loader@2.2.0: resolution: {integrity: sha512-mlSXX9SciIRwGkFTX6XGyJYp4ry6oCFZRxh5jJ7VH8UXLTNx2ZACtDTwaWtNhYrWXgKyiDUvmD8enD56aePWRA==} engines: {node: '>= 4.0'} dependencies: @@ -8036,23 +8570,23 @@ packages: resolution: {integrity: sha512-wfFRBrfO9gaKScYcdQxTfklx9yp1lWK6zv1rZRpkas9z2SHyJojF7NOQRWQgSB3ypm7vfpiF8VsFFVVr7VBzAQ==} engines: {node: 10.* || >= 12} dependencies: - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 transitivePeerDependencies: - supports-color dev: true - /ember-cli-typescript@2.0.2(@babel/core@7.21.8): + /ember-cli-typescript@2.0.2: resolution: {integrity: sha512-7I5azCTxOgRDN8aSSnJZIKSqr+MGnT+jLTUbBYqF8wu6ojs2DUnTePxUcQMcvNh3Q3B1ySv7Q/uZFSjdU9gSjA==} engines: {node: 6.* || 8.* || >= 10.*} dependencies: '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.21.8) - '@babel/plugin-transform-typescript': 7.4.5(@babel/core@7.21.8) + '@babel/plugin-transform-typescript': 7.4.5 ansi-to-html: 0.6.15 - debug: 4.3.3 + debug: 4.3.4 ember-cli-babel-plugin-helpers: 1.1.1 execa: 1.0.0 fs-extra: 7.0.1 - resolve: 1.22.0 + resolve: 1.22.2 rsvp: 4.8.5 semver: 6.3.0 stagehand: 1.0.1 @@ -8062,17 +8596,17 @@ packages: - supports-color dev: true - /ember-cli-typescript@3.0.0(@babel/core@7.21.8): + /ember-cli-typescript@3.0.0: resolution: {integrity: sha512-lo5YArbJzJi5ssvaGqTt6+FnhTALnSvYVuxM7lfyL1UCMudyNJ94ovH5C7n5il7ATd6WsNiAPRUO/v+s5Jq/aA==} engines: {node: 8.* || >= 10.*} dependencies: - '@babel/plugin-transform-typescript': 7.5.5(@babel/core@7.21.8) + '@babel/plugin-transform-typescript': 7.5.5 ansi-to-html: 0.6.15 - debug: 4.3.3 + debug: 4.3.4 ember-cli-babel-plugin-helpers: 1.1.1 execa: 2.1.0 fs-extra: 8.1.0 - resolve: 1.22.0 + resolve: 1.22.2 rsvp: 4.8.5 semver: 6.3.0 stagehand: 1.0.1 @@ -8082,13 +8616,13 @@ packages: - supports-color dev: true - /ember-cli-typescript@3.1.4(@babel/core@7.21.8): + /ember-cli-typescript@3.1.4: resolution: {integrity: sha512-HJ73kL45OGRmIkPhBNFt31I1SGUvdZND+LCH21+qpq3pPlFpJG8GORyXpP+2ze8PbnITNLzwe5AwUrpyuRswdQ==} engines: {node: 8.* || >= 10.*} dependencies: '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.21.8) '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.21.8) - '@babel/plugin-transform-typescript': 7.8.7(@babel/core@7.21.8) + '@babel/plugin-transform-typescript': 7.8.7 ansi-to-html: 0.6.15 broccoli-stew: 3.0.0 debug: 4.3.4 @@ -8464,7 +8998,7 @@ packages: - whiskers dev: true - /ember-compatibility-helpers@1.2.6(@babel/core@7.21.8): + /ember-compatibility-helpers@1.2.6: resolution: {integrity: sha512-2UBUa5SAuPg8/kRVaiOfTwlXdeVweal1zdNPibwItrhR0IvPrXpaqwJDlEZnWKEoB+h33V0JIfiWleSG6hGkkA==} engines: {node: 10.* || >= 12.*} dependencies: @@ -8478,36 +9012,36 @@ packages: - supports-color dev: true - /ember-data@3.19.0(@babel/core@7.21.8): + /ember-data@3.19.0: resolution: {integrity: sha512-dZwJNevHXOOzeokOnzgmrxPPFjGwNgPidGECuNYjjHxg4CaumbNpbxj6GgfBq4gyF7zHkMAQeHmph56935kR6g==} engines: {node: 10.* || >= 12.*} dependencies: - '@ember-data/adapter': 3.19.0(@babel/core@7.21.8) - '@ember-data/debug': 3.19.0(@babel/core@7.21.8) - '@ember-data/model': 3.19.0(@babel/core@7.21.8) - '@ember-data/private-build-infra': 3.19.0(@babel/core@7.21.8) - '@ember-data/record-data': 3.19.0(@babel/core@7.21.8) - '@ember-data/serializer': 3.19.0(@babel/core@7.21.8) - '@ember-data/store': 3.19.0(@babel/core@7.21.8) + '@ember-data/adapter': 3.19.0 + '@ember-data/debug': 3.19.0 + '@ember-data/model': 3.19.0 + '@ember-data/private-build-infra': 3.19.0 + '@ember-data/record-data': 3.19.0 + '@ember-data/serializer': 3.19.0 + '@ember-data/store': 3.19.0 '@ember/edition-utils': 1.2.0 - '@ember/ordered-set': 2.0.3(@babel/core@7.21.8) + '@ember/ordered-set': 2.0.3 '@glimmer/env': 0.1.7 broccoli-merge-trees: 4.2.0 - ember-cli-babel: 7.26.6 - ember-cli-typescript: 3.1.4(@babel/core@7.21.8) - ember-inflector: 3.0.1(@babel/core@7.21.8) + ember-cli-babel: 7.26.11 + ember-cli-typescript: 3.1.4 + ember-inflector: 3.0.1 transitivePeerDependencies: - '@babel/core' - supports-color dev: true - /ember-destroyable-polyfill@2.0.3(@babel/core@7.21.8): + /ember-destroyable-polyfill@2.0.3: resolution: {integrity: sha512-TovtNqCumzyAiW0/OisSkkVK93xnVF4NRU6+FN0ubpfwEOpRrmM2RqDwXI6YAChCgSHON1cz0DfQStpA1Gjuuw==} engines: {node: 10.* || >= 12} dependencies: - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 ember-cli-version-checker: 5.1.2 - ember-compatibility-helpers: 1.2.6(@babel/core@7.21.8) + ember-compatibility-helpers: 1.2.6 transitivePeerDependencies: - '@babel/core' - supports-color @@ -8523,7 +9057,7 @@ packages: engines: {node: '>= 4'} dev: true - /ember-fetch@8.0.1(@babel/core@7.21.8): + /ember-fetch@8.0.1: resolution: {integrity: sha512-J+knuBFQJlMQUuij2tziMiVcJ+Ss0lCV2XiCQO2cHmG2PUsfvLlTGZ04uUyOXPqrJISxY2W3Et43fQBg4jy7SA==} engines: {node: '>= 10'} dependencies: @@ -8536,12 +9070,13 @@ packages: broccoli-templater: 2.0.2 calculate-cache-key-for-tree: 2.0.0 caniuse-api: 3.0.0 - ember-cli-babel: 7.26.6 - ember-cli-typescript: 3.1.4(@babel/core@7.21.8) - node-fetch: 2.6.0 + ember-cli-babel: 7.26.11 + ember-cli-typescript: 3.1.4 + node-fetch: 2.6.11 whatwg-fetch: 3.6.2 transitivePeerDependencies: - '@babel/core' + - encoding - supports-color dev: true @@ -8549,15 +9084,15 @@ packages: resolution: {integrity: sha512-eHs+7D7PuQr8a1DPqsJTsEyo3FZ1XuH6WEZaEBPDa9s0xLlwByCNKl8hi1EbXOgvgEZNHHi9Rh0vjxyfakrlgg==} engines: {node: 10.* || >= 12} dependencies: - debug: 4.3.3 - ember-cli-babel: 7.26.6 - ember-cli-htmlbars: 5.7.1 + debug: 4.3.4 + ember-cli-babel: 7.26.11 + ember-cli-htmlbars: 5.7.2 ember-cli-version-checker: 5.1.2 transitivePeerDependencies: - supports-color dev: true - /ember-inflector@3.0.1(@babel/core@7.21.8): + /ember-inflector@3.0.1: resolution: {integrity: sha512-fngrwMsnhkBt51KZgwNwQYxgURwV4lxtoHdjxf7RueGZ5zM7frJLevhHw7pbQNGqXZ3N+MRkhfNOLkdDK9kFdA==} engines: {node: ^4.5 || 6.* || >= 7.*} dependencies: @@ -8567,18 +9102,18 @@ packages: - supports-color dev: true - /ember-load-initializers@2.1.2(@babel/core@7.21.8): + /ember-load-initializers@2.1.2: resolution: {integrity: sha512-CYR+U/wRxLbrfYN3dh+0Tb6mFaxJKfdyz+wNql6cqTrA0BBi9k6J3AaKXj273TqvEpyyXegQFFkZEiuZdYtgJw==} engines: {node: 6.* || 8.* || >= 10.*} dependencies: - ember-cli-babel: 7.26.6 - ember-cli-typescript: 2.0.2(@babel/core@7.21.8) + ember-cli-babel: 7.26.11 + ember-cli-typescript: 2.0.2 transitivePeerDependencies: - '@babel/core' - supports-color dev: true - /ember-maybe-import-regenerator-for-testing@1.0.0(@babel/core@7.21.8): + /ember-maybe-import-regenerator-for-testing@1.0.0: resolution: {integrity: sha512-9ZOjrXZ6iO8WnVuk5kLqUZIFEEOx2O/EA08vcedaT/XSna6LzH2knLx5OiOD9f7XiO8jNaYuZoh0Uq3wnm8/oA==} engines: {node: ^4.5 || 6.* || >= 7.*} dependencies: @@ -8590,7 +9125,7 @@ packages: - supports-color dev: true - /ember-maybe-import-regenerator@0.1.6(@babel/core@7.21.8): + /ember-maybe-import-regenerator@0.1.6: resolution: {integrity: sha512-aX9UINiUXIjzsCNNna1ioASB/2lbnFgSHI63bBcd4MOVE9AqoLdOL7h+ocyylYXyYoBj2JDRwCzjWNf2Xbp5wg==} engines: {node: '>= 0.10.0'} dependencies: @@ -8607,12 +9142,12 @@ packages: resolution: {integrity: sha512-oq6+HYbeVD/BnxIO5AkP4gWlsatdgW2HFO10F8+XQiJZrwa7cC7Wm54JNGqQkavkDQTgNSiy1Fe2NILJ14MmAg==} engines: {node: 12.* || 14.* || >= 16} dependencies: - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 transitivePeerDependencies: - supports-color dev: true - /ember-qunit@4.6.0(@babel/core@7.21.8): + /ember-qunit@4.6.0: resolution: {integrity: sha512-i5VOGn0RP8XH+5qkYDOZshbqAvO6lHgF65D0gz8vRx4DszCIvJMJO+bbftBTfYMxp6rqG85etAA6pfNxE0DqsQ==} engines: {node: 6.* || 8.* || >= 10.*} dependencies: @@ -8620,29 +9155,29 @@ packages: broccoli-funnel: 2.0.2 broccoli-merge-trees: 3.0.2 common-tags: 1.8.2 - ember-cli-babel: 7.26.6 - ember-cli-test-loader: 2.2.0(@babel/core@7.21.8) - qunit: 2.14.1 + ember-cli-babel: 7.26.11 + ember-cli-test-loader: 2.2.0 + qunit: 2.20.0 transitivePeerDependencies: - '@babel/core' - supports-color dev: true - /ember-qunit@5.1.5(@ember/test-helpers@2.6.0)(qunit@2.14.1): + /ember-qunit@5.1.5(@ember/test-helpers@2.9.4)(qunit@2.20.0): resolution: {integrity: sha512-2cFA4oMygh43RtVcMaBrr086Tpdhgbn3fVZ2awLkzF/rnSN0D0PSRpd7hAD7OdBPerC/ZYRwzVyGXLoW/Zes4A==} engines: {node: 10.* || 12.* || >= 14.*} peerDependencies: '@ember/test-helpers': ^2.4.0 qunit: ^2.13.0 dependencies: - '@ember/test-helpers': 2.6.0(@babel/core@7.21.8) + '@ember/test-helpers': 2.9.4(ember-source@3.26.2) broccoli-funnel: 3.0.8 broccoli-merge-trees: 3.0.2 common-tags: 1.8.2 ember-auto-import: 1.12.2 - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 ember-cli-test-loader: 3.0.0 - qunit: 2.14.1 + qunit: 2.20.0 resolve-package-path: 3.1.0 silent-error: 1.1.1 validate-peer-dependencies: 1.2.0 @@ -8652,14 +9187,14 @@ packages: - webpack-command dev: true - /ember-resolver@8.0.2(@babel/core@7.21.8): + /ember-resolver@8.0.2: resolution: {integrity: sha512-BmCoPT8nf5uv0g2QkhMsrG1Gmu6MtXd6igfhCVzCTMTwZ97SxhJKqoMY62EP/av5HVSWBC/Sa1uGU5cQvX1Aog==} engines: {node: '>= 10.*'} dependencies: babel-plugin-debug-macros: 0.3.4(@babel/core@7.21.8) broccoli-funnel: 3.0.8 broccoli-merge-trees: 4.2.0 - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 ember-cli-version-checker: 5.1.2 resolve: 1.22.0 transitivePeerDependencies: @@ -8667,6 +9202,21 @@ packages: - supports-color dev: true + /ember-resolver@8.1.0: + resolution: {integrity: sha512-MGD7X2ztZVswGqs1mLgzhZJRhG7XiF6Mg4DgC7xJFWRYQQUHyGJpGdNWY9nXyrYnRIsCrQoL1do41zpxbrB/cg==} + engines: {node: '>= 10.*'} + dependencies: + babel-plugin-debug-macros: 0.3.4(@babel/core@7.21.8) + broccoli-funnel: 3.0.8 + broccoli-merge-trees: 4.2.0 + ember-cli-babel: 7.26.11 + ember-cli-version-checker: 5.1.2 + resolve: 1.22.2 + transitivePeerDependencies: + - '@babel/core' + - supports-color + dev: true + /ember-rfc176-data@0.3.18: resolution: {integrity: sha512-JtuLoYGSjay1W3MQAxt3eINWXNYYQliK90tLwtb8aeCuQK8zKGCRbBodVIrkcTqshULMnRuTOS6t1P7oQk3g6Q==} @@ -8681,7 +9231,7 @@ packages: - supports-color dev: true - /ember-sinon@2.2.0(@babel/core@7.21.8): + /ember-sinon@2.2.0: resolution: {integrity: sha512-BgjHsgy8rli8FaJ1MWkscIKRpoFmzYhNkDtwBWQrUCzQx1bp3+irVpseAPqBnuEB4FPFGGQV5ahDpFcckmIsAw==} engines: {node: 6.* || 8.* || >= 10.*} dependencies: @@ -8712,13 +9262,13 @@ packages: - encoding dev: true - /ember-source@3.19.0(@babel/core@7.21.8): + /ember-source@3.19.0: resolution: {integrity: sha512-WUL8FojIGNJDtCSxI5SjNguMb6axPPm9p/nskRwox9omj6W+hjbzLzl+pZcMbqRePkQtjCbUTAclVMBdBNaRYg==} engines: {node: 10.* || >= 12.*} dependencies: '@babel/helper-module-imports': 7.21.4 '@babel/plugin-transform-block-scoping': 7.21.0(@babel/core@7.21.8) - '@babel/plugin-transform-object-assign': 7.18.6(@babel/core@7.21.8) + '@babel/plugin-transform-object-assign': 7.18.6 '@ember/edition-utils': 1.2.0 babel-plugin-debug-macros: 0.3.4(@babel/core@7.21.8) babel-plugin-filter-imports: 4.0.0 @@ -8727,7 +9277,7 @@ packages: broccoli-funnel: 2.0.2 broccoli-merge-trees: 3.0.2 chalk: 3.0.0 - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 ember-cli-get-component-path-option: 1.0.0 ember-cli-is-package-missing: 1.0.0 ember-cli-normalize-entity-name: 1.0.0 @@ -8737,7 +9287,7 @@ packages: ember-router-generator: 2.0.0 inflection: 1.13.4 jquery: 3.7.0 - resolve: 1.22.0 + resolve: 1.22.2 semver: 6.3.0 silent-error: 1.1.1 transitivePeerDependencies: @@ -8745,15 +9295,15 @@ packages: - supports-color dev: true - /ember-source@3.26.1(@babel/core@7.21.8): - resolution: {integrity: sha512-5/NATBo5h9m1N52ITVksmjtGlYhGHLl4lDErAWv5/DC9zYe9ZR93NtymR6PEqrRilXc2x0KWd3NlOsWUoJRUOw==} + /ember-source@3.26.2: + resolution: {integrity: sha512-s7S+6xVwYYmNCK0rGTAimPw1ahiuOXsFgs0jFMVqwMEndvo+GQvk4rEYDHs0JgN+o5UhQjVpoPqXxkgfPTL38A==} engines: {node: 10.* || >= 12.*} dependencies: '@babel/helper-module-imports': 7.21.4 '@babel/plugin-transform-block-scoping': 7.21.0(@babel/core@7.21.8) - '@babel/plugin-transform-object-assign': 7.18.6(@babel/core@7.21.8) + '@babel/plugin-transform-object-assign': 7.18.6 '@ember/edition-utils': 1.2.0 - '@glimmer/vm-babel-plugins': 0.77.5(@babel/core@7.21.8) + '@glimmer/vm-babel-plugins': 0.77.5 babel-plugin-debug-macros: 0.3.4(@babel/core@7.21.8) babel-plugin-filter-imports: 4.0.0 broccoli-concat: 4.2.5 @@ -8761,7 +9311,7 @@ packages: broccoli-funnel: 2.0.2 broccoli-merge-trees: 4.2.0 chalk: 4.1.2 - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 ember-cli-get-component-path-option: 1.0.0 ember-cli-is-package-missing: 1.0.0 ember-cli-normalize-entity-name: 1.0.0 @@ -8771,7 +9321,7 @@ packages: ember-router-generator: 2.0.0 inflection: 1.13.4 jquery: 3.7.0 - resolve: 1.22.0 + resolve: 1.22.2 semver: 7.5.1 silent-error: 1.1.1 transitivePeerDependencies: @@ -8797,13 +9347,14 @@ packages: - supports-color dev: true - /ember-template-lint@3.2.0: - resolution: {integrity: sha512-X37VYwhi2JdVU7+CQDtLCCSHzK2+CeQ64/WQ4hKt9bx1ZtvxWXDMd2BNeDBckY/YvdviG0Yq2VARCzHpkiElwQ==} + /ember-template-lint@3.16.0: + resolution: {integrity: sha512-hbP4JefkOLx9tMkrZ3UIvdBNoEnrT7rg6c70tIxpB9F+KpPneDbmpGMBsQVhhK4BirTXIFwAIfnwKcwkIk3bPQ==} engines: {node: '>= 10.24 < 11 || 12.* || >= 14.*'} hasBin: true dependencies: - '@ember-template-lint/todo-utils': 8.1.0 + '@ember-template-lint/todo-utils': 10.0.0 chalk: 4.1.2 + ci-info: 3.8.0 date-fns: 2.30.0 ember-template-recast: 5.0.3 find-up: 5.0.0 @@ -8812,7 +9363,8 @@ packages: globby: 11.1.0 is-glob: 4.0.3 micromatch: 4.0.5 - resolve: 1.22.0 + requireindex: 1.2.0 + resolve: 1.22.2 v8-compile-cache: 2.3.0 yargs: 16.2.0 transitivePeerDependencies: @@ -8863,7 +9415,7 @@ packages: resolution: {integrity: sha512-aEw7YuutLuJT4NUuPTNiGFwgTYl23ThqmBxSkfFimQAn+keWjAftykk3dlFELuhsJhYW/S8YoVjN0bSAQRLNtw==} engines: {node: 6.* || 8.* || >= 10.*} dependencies: - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 semver: 6.3.0 transitivePeerDependencies: - supports-color @@ -8901,14 +9453,14 @@ packages: - supports-color dev: true - /ember-welcome-page@4.0.0(@babel/core@7.21.8): + /ember-welcome-page@4.0.0: resolution: {integrity: sha512-2lpElRFDjFVE0LohJn9j7FWYt5rGHZ7TmiPgknsS+9BYFFmaJnBQKAz9KZXxWRmS/mCjVUuUec1YhojtOJJ/Sg==} engines: {node: 6.* || 8.* || >= 10.*} dependencies: broccoli-funnel: 2.0.2 - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 ember-cli-htmlbars: 3.1.0 - ember-compatibility-helpers: 1.2.6(@babel/core@7.21.8) + ember-compatibility-helpers: 1.2.6 transitivePeerDependencies: - '@babel/core' - supports-color @@ -9169,13 +9721,13 @@ packages: get-stdin: 6.0.0 dev: true - /eslint-config-prettier@8.1.0(eslint@7.23.0): - resolution: {integrity: sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw==} + /eslint-config-prettier@8.10.0(eslint@7.32.0): + resolution: {integrity: sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==} hasBin: true peerDependencies: eslint: '>=7.0.0' dependencies: - eslint: 7.23.0 + eslint: 7.32.0 dev: true /eslint-plugin-chai-expect@2.1.0(eslint@6.8.0): @@ -9187,18 +9739,20 @@ packages: eslint: 6.8.0 dev: true - /eslint-plugin-ember@10.3.0(eslint@7.23.0): - resolution: {integrity: sha512-qmUQ6OYs8trr+4h3DPJz76fBgXBJEragLCD4RHV4bcnKd4vtgmJvFTF+UDlIsiZZVd03r5aYzpuQvVa+oH6JXg==} + /eslint-plugin-ember@10.6.1(eslint@7.32.0): + resolution: {integrity: sha512-R+TN3jwhYQ2ytZCA1VkfJDZSGgHFOHjsHU1DrBlRXYRepThe56PpuGxywAyDvQ7inhoAz3e6G6M60PzpvjzmNg==} engines: {node: 10.* || 12.* || >= 14} peerDependencies: eslint: '>= 6' dependencies: '@ember-data/rfc395-data': 0.0.4 - css-tree: 1.1.3 + css-tree: 2.3.1 ember-rfc176-data: 0.3.18 - eslint: 7.23.0 - eslint-utils: 2.1.0 + eslint: 7.32.0 + eslint-utils: 3.0.0(eslint@7.32.0) + estraverse: 5.3.0 lodash.kebabcase: 4.1.1 + requireindex: 1.2.0 snake-case: 3.0.4 dev: true @@ -9234,6 +9788,17 @@ packages: regexpp: 3.2.0 dev: true + /eslint-plugin-es@3.0.1(eslint@7.32.0): + resolution: {integrity: sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==} + engines: {node: '>=8.10.0'} + peerDependencies: + eslint: '>=4.19.1' + dependencies: + eslint: 7.32.0 + eslint-utils: 2.1.0 + regexpp: 3.2.0 + dev: true + /eslint-plugin-mocha@6.2.2(eslint@6.8.0): resolution: {integrity: sha512-oNhPzfkT6Q6CJ0HMVJ2KLxEWG97VWGTmuHOoRcDLE0U88ugUyFNV9wrT2XIt5cGtqc5W9k38m4xTN34L09KhBA==} engines: {node: '>=8.0.0'} @@ -9285,6 +9850,21 @@ packages: semver: 6.3.0 dev: true + /eslint-plugin-node@11.1.0(eslint@7.32.0): + resolution: {integrity: sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==} + engines: {node: '>=8.10.0'} + peerDependencies: + eslint: '>=5.16.0' + dependencies: + eslint: 7.32.0 + eslint-plugin-es: 3.0.1(eslint@7.32.0) + eslint-utils: 2.1.0 + ignore: 5.2.4 + minimatch: 3.1.2 + resolve: 1.22.0 + semver: 6.3.0 + dev: true + /eslint-plugin-prettier@3.3.1(eslint-config-prettier@6.10.0)(eslint@6.8.0)(prettier@1.19.1): resolution: {integrity: sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ==} engines: {node: '>=6.0.0'} @@ -9302,8 +9882,8 @@ packages: prettier-linter-helpers: 1.0.0 dev: true - /eslint-plugin-prettier@3.3.1(eslint-config-prettier@8.1.0)(eslint@7.23.0)(prettier@2.2.1): - resolution: {integrity: sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ==} + /eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0)(eslint@7.32.0)(prettier@2.8.8): + resolution: {integrity: sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==} engines: {node: '>=6.0.0'} peerDependencies: eslint: '>=5.0.0' @@ -9313,9 +9893,9 @@ packages: eslint-config-prettier: optional: true dependencies: - eslint: 7.23.0 - eslint-config-prettier: 8.1.0(eslint@7.23.0) - prettier: 2.2.1 + eslint: 7.32.0 + eslint-config-prettier: 8.10.0(eslint@7.32.0) + prettier: 2.8.8 prettier-linter-helpers: 1.0.0 dev: true @@ -9349,6 +9929,16 @@ packages: eslint-visitor-keys: 1.3.0 dev: true + /eslint-utils@3.0.0(eslint@7.32.0): + resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==} + engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0} + peerDependencies: + eslint: '>=5' + dependencies: + eslint: 7.32.0 + eslint-visitor-keys: 2.1.0 + dev: true + /eslint-visitor-keys@1.3.0: resolution: {integrity: sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==} engines: {node: '>=4'} @@ -9451,6 +10041,55 @@ packages: - supports-color dev: true + /eslint@7.32.0: + resolution: {integrity: sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==} + engines: {node: ^10.12.0 || >=12.0.0} + hasBin: true + dependencies: + '@babel/code-frame': 7.12.11 + '@eslint/eslintrc': 0.4.3 + '@humanwhocodes/config-array': 0.5.0 + ajv: 6.12.6 + chalk: 4.1.2 + cross-spawn: 7.0.3 + debug: 4.3.4 + doctrine: 3.0.0 + enquirer: 2.3.6 + escape-string-regexp: 4.0.0 + eslint-scope: 5.1.1 + eslint-utils: 2.1.0 + eslint-visitor-keys: 2.1.0 + espree: 7.3.1 + esquery: 1.5.0 + esutils: 2.0.3 + fast-deep-equal: 3.1.3 + file-entry-cache: 6.0.1 + functional-red-black-tree: 1.0.1 + glob-parent: 5.1.2 + globals: 13.20.0 + ignore: 4.0.6 + import-fresh: 3.3.0 + imurmurhash: 0.1.4 + is-glob: 4.0.3 + js-yaml: 3.14.1 + json-stable-stringify-without-jsonify: 1.0.1 + levn: 0.4.1 + lodash.merge: 4.6.2 + minimatch: 3.1.2 + natural-compare: 1.4.0 + optionator: 0.9.1 + progress: 2.0.3 + regexpp: 3.2.0 + semver: 7.5.1 + strip-ansi: 6.0.1 + strip-json-comments: 3.1.1 + table: 6.8.1 + text-table: 0.2.0 + v8-compile-cache: 2.3.0 + transitivePeerDependencies: + - supports-color + dev: true + /esm@3.2.25: resolution: {integrity: sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==} engines: {node: '>=6'} @@ -9876,7 +10515,7 @@ packages: cookie: 0.4.1 debug: 4.3.4 jsdom: 19.0.0 - resolve: 1.22.0 + resolve: 1.22.2 simple-dom: 1.4.0 source-map-support: 0.5.21 transitivePeerDependencies: @@ -9939,6 +10578,7 @@ packages: /file-uri-to-path@1.0.0: resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==} + requiresBuild: true dev: true optional: true @@ -10630,6 +11270,7 @@ packages: /glob-parent@3.1.0: resolution: {integrity: sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==} + requiresBuild: true dependencies: is-glob: 3.1.0 path-dirname: 1.0.2 @@ -11165,6 +11806,17 @@ packages: statuses: 1.5.0 toidentifier: 1.0.1 + /http-errors@2.0.0: + resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==} + engines: {node: '>= 0.8'} + dependencies: + depd: 2.0.0 + inherits: 2.0.4 + setprototypeof: 1.2.0 + statuses: 2.0.1 + toidentifier: 1.0.1 + dev: true + /http-parser-js@0.5.8: resolution: {integrity: sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==} dev: true @@ -11452,7 +12104,7 @@ packages: cli-width: 3.0.0 external-editor: 3.1.0 figures: 3.2.0 - lodash: 4.17.20 + lodash: 4.17.21 mute-stream: 0.0.8 run-async: 2.4.1 rxjs: 6.6.7 @@ -11544,6 +12196,7 @@ packages: /is-binary-path@1.0.1: resolution: {integrity: sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==} engines: {node: '>=0.10.0'} + requiresBuild: true dependencies: binary-extensions: 1.13.1 dev: true @@ -12008,10 +12661,6 @@ packages: resolution: {integrity: sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==} dev: true - /js-reporters@1.2.3: - resolution: {integrity: sha512-2YzWkHbbRu6LueEs5ZP3P1LqbECvAeUJYrjw3H4y1ofW06hqCS0AbzBtLwbr+Hke51bt9CUepJ/Fj1hlCRIF6A==} - dev: true - /js-string-escape@1.0.1: resolution: {integrity: sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==} engines: {node: '>= 0.8'} @@ -12393,13 +13042,13 @@ packages: uc.micro: 1.0.6 dev: true - /lint-to-the-future-eslint@2.0.1(eslint@7.23.0): + /lint-to-the-future-eslint@2.0.1(eslint@7.32.0): resolution: {integrity: sha512-p9I4Z8ncSroU6fPZfZ6d/qnbUqLbJJLg8Lzub0db/02rdO3TXMuP+/P4dFWs0VVVAC1wL+ctSZ3Z0bJttK6oKg==} engines: {node: 10.* || >= 12.*} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - eslint: 7.23.0 + eslint: 7.32.0 import-cwd: 3.0.0 semver: 7.5.1 walk-sync: 3.0.0 @@ -12952,8 +13601,8 @@ packages: '@types/mdast': 3.0.11 dev: true - /mdn-data@2.0.14: - resolution: {integrity: sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==} + /mdn-data@2.0.30: + resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==} dev: true /mdurl@1.0.1: @@ -13545,6 +14194,7 @@ packages: /nan@2.17.0: resolution: {integrity: sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==} + requiresBuild: true dev: true optional: true @@ -13624,11 +14274,6 @@ packages: - supports-color dev: true - /node-fetch@2.6.0: - resolution: {integrity: sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==} - engines: {node: 4.x || >=6.0.0} - dev: true - /node-fetch@2.6.11: resolution: {integrity: sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==} engines: {node: 4.x || >=6.0.0} @@ -13690,8 +14335,8 @@ packages: /node-releases@2.0.12: resolution: {integrity: sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==} - /node-watch@0.7.1: - resolution: {integrity: sha512-UWblPYuZYrkCQCW5PxAwYSxaELNBLUckrTBBk8xr1/bUgyOkYYTsUcV4e3ytcazFEOyiRyiUrsG37pu6I0I05g==} + /node-watch@0.7.3: + resolution: {integrity: sha512-3l4E8uMPY1HdMMryPRUAl+oIHtXtyiTlIiESNSVSNxcPfzAFzeTbXFQkZfAwBbo0B1qMSG8nUABx+Gd+YrbKrQ==} engines: {node: '>=6'} dev: true @@ -13885,6 +14530,13 @@ packages: dependencies: ee-first: 1.1.1 + /on-finished@2.4.1: + resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==} + engines: {node: '>= 0.8'} + dependencies: + ee-first: 1.1.1 + dev: true + /on-headers@1.0.2: resolution: {integrity: sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==} engines: {node: '>= 0.8'} @@ -14259,6 +14911,7 @@ packages: /path-dirname@1.0.2: resolution: {integrity: sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==} + requiresBuild: true dev: true optional: true @@ -14516,8 +15169,8 @@ packages: hasBin: true dev: true - /prettier@2.2.1: - resolution: {integrity: sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==} + /prettier@2.8.8: + resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} engines: {node: '>=10.13.0'} hasBin: true dev: true @@ -14677,6 +15330,13 @@ packages: escape-goat: 2.1.1 dev: true + /qs@6.11.0: + resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} + engines: {node: '>=0.6'} + dependencies: + side-channel: 1.0.4 + dev: true + /qs@6.11.2: resolution: {integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==} engines: {node: '>=0.6'} @@ -14753,21 +15413,20 @@ packages: dependencies: broccoli-funnel: 3.0.8 broccoli-merge-trees: 4.2.0 - ember-cli-babel: 7.26.6 + ember-cli-babel: 7.26.11 ember-cli-version-checker: 5.1.2 transitivePeerDependencies: - supports-color dev: true - /qunit@2.14.1: - resolution: {integrity: sha512-jtFw8bf8+GjzY8UpnwbjqTOdK/rvrjcafUFTNpRc6/9N4q5dBwcwSMlcC76kAn5BRiSFj5Ssn2dfHtEYvtsXSw==} + /qunit@2.20.0: + resolution: {integrity: sha512-N8Fp1J55waE+QG1KwX2LOyqulZUToRrrPBqDOfYfuAMkEglFL15uwvmH1P4Tq/omQ/mGbBI8PEB3PhIfvUb+jg==} engines: {node: '>=10'} hasBin: true dependencies: - commander: 7.1.0 - js-reporters: 1.2.3 - node-watch: 0.7.1 - tiny-glob: 0.2.8 + commander: 7.2.0 + node-watch: 0.7.3 + tiny-glob: 0.2.9 dev: true /ramda@0.26.1: @@ -14831,6 +15490,16 @@ packages: iconv-lite: 0.4.24 unpipe: 1.0.0 + /raw-body@2.5.2: + resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==} + engines: {node: '>= 0.8'} + dependencies: + bytes: 3.1.2 + http-errors: 2.0.0 + iconv-lite: 0.4.24 + unpipe: 1.0.0 + dev: true + /rc@1.2.8: resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} hasBin: true @@ -14890,6 +15559,7 @@ packages: /readdirp@2.2.1: resolution: {integrity: sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==} engines: {node: '>=0.10'} + requiresBuild: true dependencies: graceful-fs: 4.2.11 micromatch: 3.1.10 @@ -15234,6 +15904,11 @@ packages: resolution: {integrity: sha512-AKGr4qvHiryxRb19m3PsLRGuKVAbJLUD7E6eOaHkfKhwc+vSgVOCY5xNvm9EkolBKTOf0GrQAZKLimOCz81Khg==} dev: true + /requireindex@1.2.0: + resolution: {integrity: sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==} + engines: {node: '>=0.10.5'} + dev: true + /requires-port@1.0.0: resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==} @@ -15292,7 +15967,7 @@ packages: engines: {node: 10.* || >= 12} dependencies: path-root: 0.1.1 - resolve: 1.22.0 + resolve: 1.22.2 /resolve-package-path@4.0.3: resolution: {integrity: sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==} @@ -16149,7 +16824,7 @@ packages: resolution: {integrity: sha512-GqXBq2SPWv9hTXDFKS8WrKK1aISB0aKGHZzH+uD4ShAgs+Fz20ZfoerLOm8U+f62iRWLrw6nimOY/uYuTcVhvg==} engines: {node: 6.* || 8.* || >= 10.*} dependencies: - debug: 4.3.3 + debug: 4.3.4 transitivePeerDependencies: - supports-color dev: true @@ -16166,6 +16841,11 @@ packages: resolution: {integrity: sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==} engines: {node: '>= 0.6'} + /statuses@2.0.1: + resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} + engines: {node: '>= 0.8'} + dev: true + /stealthy-require@1.1.1: resolution: {integrity: sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==} engines: {node: '>=0.10.0'} @@ -16732,8 +17412,8 @@ packages: setimmediate: 1.0.5 dev: true - /tiny-glob@0.2.8: - resolution: {integrity: sha512-vkQP7qOslq63XRX9kMswlby99kyO5OvKptw7AMwBVMjXEI7Tb61eoI5DydyEMOseyGS5anDN1VPoVxEvH01q8w==} + /tiny-glob@0.2.9: + resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==} dependencies: globalyzer: 0.1.0 globrex: 0.1.2 @@ -17129,6 +17809,7 @@ packages: /upath@1.2.0: resolution: {integrity: sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==} engines: {node: '>=4'} + requiresBuild: true dev: true optional: true From 88711ef77a55c04b5bc88be020ff0cbf893f6823 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Fri, 3 Feb 2023 17:02:03 -0500 Subject: [PATCH 02/23] Update ember-source to 3.28 across the board When running against Ember 4.4 our CI was failing, because ember-cli-babel incorrectly gets confused about which actual ember-source is in use. --- Without this change, the various ember-cli-babel processes were identifying that ember-source@3.26 was in use and was therefore transpiling all `@ember/***` module usage to `Ember` global usage. This is "fine" for Ember 3.26, but under 3.27+ "real" modules exist and globals rewriting is no longer needed. --- packages/ember-cli-fastboot/package.json | 2 +- test-packages/basic-app/package.json | 2 +- test-packages/custom-fastboot-app/package.json | 2 +- test-packages/custom-sandbox-app/package.json | 2 +- test-packages/ember-cli-fastboot-testing-app/package.json | 2 +- test-packages/example-addon/package.json | 2 +- test-packages/hot-swap-app/package.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/ember-cli-fastboot/package.json b/packages/ember-cli-fastboot/package.json index aa2fafbd..0becc85b 100644 --- a/packages/ember-cli-fastboot/package.json +++ b/packages/ember-cli-fastboot/package.json @@ -78,7 +78,7 @@ "ember-qunit": "^5.1.5", "ember-resolver": "^8.0.2", "ember-sinon": "^2.2.0", - "ember-source": "~3.26.1", + "ember-source": "~3.28.11", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^3.2.0", "ember-try": "^2.0.0", diff --git a/test-packages/basic-app/package.json b/test-packages/basic-app/package.json index 869b9c0b..23199221 100644 --- a/test-packages/basic-app/package.json +++ b/test-packages/basic-app/package.json @@ -50,7 +50,7 @@ "ember-maybe-import-regenerator": "^0.1.6", "ember-qunit": "^4.6.0", "ember-resolver": "^8.0.0", - "ember-source": "~3.19.0", + "ember-source": "~3.28.11", "ember-template-lint": "^2.8.0", "eslint": "^7.1.0", "eslint-plugin-ember": "^8.6.0", diff --git a/test-packages/custom-fastboot-app/package.json b/test-packages/custom-fastboot-app/package.json index bd99e44b..31bd712f 100644 --- a/test-packages/custom-fastboot-app/package.json +++ b/test-packages/custom-fastboot-app/package.json @@ -46,7 +46,7 @@ "ember-maybe-import-regenerator": "^0.1.6", "ember-qunit": "^4.6.0", "ember-resolver": "^8.0.0", - "ember-source": "~3.19.0", + "ember-source": "~3.28.11", "ember-template-lint": "^2.8.0", "ember-welcome-page": "^4.0.0", "eslint": "^7.1.0", diff --git a/test-packages/custom-sandbox-app/package.json b/test-packages/custom-sandbox-app/package.json index f6398f66..f399b99f 100644 --- a/test-packages/custom-sandbox-app/package.json +++ b/test-packages/custom-sandbox-app/package.json @@ -41,7 +41,7 @@ "ember-maybe-import-regenerator": "^0.1.6", "ember-qunit": "^4.6.0", "ember-resolver": "^8.0.0", - "ember-source": "~3.19.0", + "ember-source": "~3.28.11", "ember-template-lint": "^2.8.0", "eslint": "^7.1.0", "eslint-plugin-ember": "^8.6.0", diff --git a/test-packages/ember-cli-fastboot-testing-app/package.json b/test-packages/ember-cli-fastboot-testing-app/package.json index bede3acc..369b346c 100644 --- a/test-packages/ember-cli-fastboot-testing-app/package.json +++ b/test-packages/ember-cli-fastboot-testing-app/package.json @@ -42,7 +42,7 @@ "ember-maybe-import-regenerator": "^0.1.6", "ember-qunit": "^4.6.0", "ember-resolver": "^8.0.0", - "ember-source": "~3.19.0", + "ember-source": "~3.28.11", "ember-template-lint": "^2.8.0", "eslint": "^7.1.0", "eslint-plugin-ember": "^8.6.0", diff --git a/test-packages/example-addon/package.json b/test-packages/example-addon/package.json index 4f3310f7..38c3e897 100644 --- a/test-packages/example-addon/package.json +++ b/test-packages/example-addon/package.json @@ -45,7 +45,7 @@ "ember-maybe-import-regenerator": "^0.1.6", "ember-qunit": "^4.6.0", "ember-resolver": "^8.0.0", - "ember-source": "~3.19.0", + "ember-source": "~3.28.11", "ember-source-channel-url": "^2.0.1", "ember-template-lint": "^2.8.0", "ember-try": "^2.0.0", diff --git a/test-packages/hot-swap-app/package.json b/test-packages/hot-swap-app/package.json index 97759cb8..8818e000 100644 --- a/test-packages/hot-swap-app/package.json +++ b/test-packages/hot-swap-app/package.json @@ -42,7 +42,7 @@ "ember-maybe-import-regenerator": "^0.1.6", "ember-qunit": "^4.6.0", "ember-resolver": "^8.0.0", - "ember-source": "~3.19.0", + "ember-source": "~3.28.11", "ember-template-lint": "^2.8.0", "eslint": "^7.1.0", "eslint-plugin-ember": "^8.6.0", From 63bae3805857a7ed0bc0d16da38a1ea65d1d32a4 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Fri, 3 Feb 2023 17:01:26 -0500 Subject: [PATCH 03/23] Update minimum version of @glimmer/component to 1.1.2 --- packages/ember-cli-fastboot/package.json | 2 +- pnpm-lock.yaml | 118 +++++------------- test-packages/basic-app/package.json | 2 +- .../custom-fastboot-app/package.json | 2 +- test-packages/custom-sandbox-app/package.json | 2 +- test-packages/example-addon/package.json | 2 +- test-packages/hot-swap-app/package.json | 2 +- 7 files changed, 39 insertions(+), 91 deletions(-) diff --git a/packages/ember-cli-fastboot/package.json b/packages/ember-cli-fastboot/package.json index 0becc85b..591770ca 100644 --- a/packages/ember-cli-fastboot/package.json +++ b/packages/ember-cli-fastboot/package.json @@ -52,7 +52,7 @@ "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.6.0", "@embroider/test-setup": "^0.37.0", - "@glimmer/component": "^1.0.4", + "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", "body-parser": "^1.18.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0e07e226..37b9b19a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -83,12 +83,12 @@ importers: version: 2.0.0 '@ember/test-helpers': specifier: ^2.6.0 - version: 2.9.4(ember-source@3.26.2) + version: 2.9.4(ember-source@3.28.12) '@embroider/test-setup': specifier: ^0.37.0 version: 0.37.0 '@glimmer/component': - specifier: ^1.0.4 + specifier: ^1.1.2 version: 1.1.2 '@glimmer/tracking': specifier: ^1.0.4 @@ -166,8 +166,8 @@ importers: specifier: ^2.2.0 version: 2.2.0 ember-source: - specifier: ~3.26.1 - version: 3.26.2 + specifier: ~3.28.11 + version: 3.28.12 ember-source-channel-url: specifier: ^3.0.0 version: 3.0.0 @@ -491,7 +491,7 @@ importers: specifier: ^1.3.0 version: 1.3.0 '@glimmer/component': - specifier: ^1.0.0 + specifier: ^1.1.2 version: 1.1.2 '@glimmer/tracking': specifier: ^1.0.0 @@ -566,8 +566,8 @@ importers: specifier: ^8.0.0 version: 8.0.2 ember-source: - specifier: ~3.19.0 - version: 3.19.0 + specifier: ~3.28.11 + version: 3.28.12 ember-template-lint: specifier: ^2.8.0 version: 2.8.0 @@ -611,7 +611,7 @@ importers: specifier: ^1.3.0 version: 1.3.0 '@glimmer/component': - specifier: ^1.0.0 + specifier: ^1.1.2 version: 1.1.2 '@glimmer/tracking': specifier: ^1.0.0 @@ -683,8 +683,8 @@ importers: specifier: ^8.0.0 version: 8.0.2 ember-source: - specifier: ~3.19.0 - version: 3.19.0 + specifier: ~3.28.11 + version: 3.28.12 ember-template-lint: specifier: ^2.8.0 version: 2.8.0 @@ -719,7 +719,7 @@ importers: specifier: ^1.3.0 version: 1.3.0 '@glimmer/component': - specifier: ^1.0.0 + specifier: ^1.1.2 version: 1.1.2 '@glimmer/tracking': specifier: ^1.0.0 @@ -782,8 +782,8 @@ importers: specifier: ^8.0.0 version: 8.0.2 ember-source: - specifier: ~3.19.0 - version: 3.19.0 + specifier: ~3.28.11 + version: 3.28.12 ember-template-lint: specifier: ^2.8.0 version: 2.8.0 @@ -872,8 +872,8 @@ importers: specifier: ^8.0.0 version: 8.0.2 ember-source: - specifier: ~3.19.0 - version: 3.19.0 + specifier: ~3.28.11 + version: 3.28.12 ember-template-lint: specifier: ^2.8.0 version: 2.8.0 @@ -911,7 +911,7 @@ importers: specifier: ^1.3.0 version: 1.3.0 '@glimmer/component': - specifier: ^1.0.0 + specifier: ^1.1.2 version: 1.1.2 '@glimmer/tracking': specifier: ^1.0.0 @@ -959,8 +959,8 @@ importers: specifier: ^8.0.0 version: 8.0.2 ember-source: - specifier: ~3.19.0 - version: 3.19.0 + specifier: ~3.28.11 + version: 3.28.12 ember-source-channel-url: specifier: ^2.0.1 version: 2.0.1 @@ -1015,7 +1015,7 @@ importers: specifier: ^1.3.0 version: 1.3.0 '@glimmer/component': - specifier: ^1.0.0 + specifier: ^1.1.2 version: 1.1.2 '@glimmer/tracking': specifier: ^1.0.0 @@ -1078,8 +1078,8 @@ importers: specifier: ^8.0.0 version: 8.0.2 ember-source: - specifier: ~3.19.0 - version: 3.19.0 + specifier: ~3.28.11 + version: 3.28.12 ember-template-lint: specifier: ^2.8.0 version: 2.8.0 @@ -2768,7 +2768,7 @@ packages: - supports-color dev: true - /@ember/test-helpers@2.9.4(ember-source@3.26.2): + /@ember/test-helpers@2.9.4(ember-source@3.28.12): resolution: {integrity: sha512-z+Qs1NYWyIVDmrY6WdmOS5mdG1lJ5CFfzh6dRhLfs9lq45deDaDrVNcaCYhnNeJZTvUBK2XR2SvPcZm0RloXdA==} engines: {node: 10.* || 12.* || 14.* || 15.* || >= 16.*} peerDependencies: @@ -2776,13 +2776,13 @@ packages: dependencies: '@ember/test-waiters': 3.0.2 '@embroider/macros': 1.13.2 - '@embroider/util': 1.12.0(ember-source@3.26.2) + '@embroider/util': 1.12.0(ember-source@3.28.12) broccoli-debug: 0.6.5 broccoli-funnel: 3.0.8 ember-cli-babel: 7.26.11 ember-cli-htmlbars: 6.3.0 ember-destroyable-polyfill: 2.0.3 - ember-source: 3.26.2 + ember-source: 3.28.12 transitivePeerDependencies: - '@babel/core' - '@glint/environment-ember-loose' @@ -2926,7 +2926,7 @@ packages: resolve: 1.22.2 dev: true - /@embroider/util@1.12.0(ember-source@3.26.2): + /@embroider/util@1.12.0(ember-source@3.28.12): resolution: {integrity: sha512-P4M1QADEH9ceIYC9mwHeV+6DDgEIQQYFfZi728nVKqTAxakXoiLgu/BCyQmEGyow9fYEPYaC1boDCZxW2JQAXg==} engines: {node: 14.* || >= 16} peerDependencies: @@ -2942,7 +2942,7 @@ packages: '@embroider/macros': 1.13.2 broccoli-funnel: 3.0.8 ember-cli-babel: 7.26.11 - ember-source: 3.26.2 + ember-source: 3.28.12 transitivePeerDependencies: - supports-color dev: true @@ -3129,8 +3129,8 @@ packages: '@glimmer/global-context': 0.65.4 dev: true - /@glimmer/vm-babel-plugins@0.77.5: - resolution: {integrity: sha512-jTBM7fJMrIEy4/bCeI8e7ypR+AuWYzLA+KORCGbnTJtL/NYg4G8qwhQAZBtg1d3KmoqyqaCsyqE6f4/tzJO4eQ==} + /@glimmer/vm-babel-plugins@0.80.3: + resolution: {integrity: sha512-9ej6xlm5MzHBJ5am2l0dbbn8Z0wJoYoMpM8FcrGMlUP6SPMLWxvxpMsApgQo8u6dvZRCjR3/bw3fdf7GOy0AFw==} dependencies: babel-plugin-debug-macros: 0.3.4(@babel/core@7.21.8) transitivePeerDependencies: @@ -5764,26 +5764,6 @@ packages: transitivePeerDependencies: - supports-color - /broccoli-concat@3.7.5: - resolution: {integrity: sha512-rDs1Mej3Ej0Cy5yIO9oIQq5+BCv0opAwS2NW7M0BeCsAMeFM42Z/zacDUC6jKc5OV5wiHvGTyCPLnZkMe0h6kQ==} - engines: {node: '>= 4'} - dependencies: - broccoli-debug: 0.6.5 - broccoli-kitchen-sink-helpers: 0.3.1 - broccoli-plugin: 1.3.1 - ensure-posix-path: 1.1.1 - fast-sourcemap-concat: 1.4.0 - find-index: 1.1.1 - fs-extra: 4.0.3 - fs-tree-diff: 0.5.9 - lodash.merge: 4.6.2 - lodash.omit: 4.5.0 - lodash.uniq: 4.5.0 - walk-sync: 0.3.4 - transitivePeerDependencies: - - supports-color - dev: true - /broccoli-concat@4.2.5: resolution: {integrity: sha512-dFB5ATPwOyV8S2I7a07HxCoutoq23oY//LhM6Mou86cWUTB174rND5aQLR7Fu8FjFFLxoTbkk7y0VPITJ1IQrw==} engines: {node: 10.* || >= 12.*} @@ -9170,7 +9150,7 @@ packages: '@ember/test-helpers': ^2.4.0 qunit: ^2.13.0 dependencies: - '@ember/test-helpers': 2.9.4(ember-source@3.26.2) + '@ember/test-helpers': 2.9.4(ember-source@3.28.12) broccoli-funnel: 3.0.8 broccoli-merge-trees: 3.0.2 common-tags: 1.8.2 @@ -9262,52 +9242,20 @@ packages: - encoding dev: true - /ember-source@3.19.0: - resolution: {integrity: sha512-WUL8FojIGNJDtCSxI5SjNguMb6axPPm9p/nskRwox9omj6W+hjbzLzl+pZcMbqRePkQtjCbUTAclVMBdBNaRYg==} + /ember-source@3.28.12: + resolution: {integrity: sha512-HGrBpY6TN+MAi7F6BS8XYtNFG6vtbKE9ttPcyj0Ps+76kP7isCHyN0hk8ecKciLq7JYDqiPDNWjdIXAn2JfhZA==} engines: {node: 10.* || >= 12.*} dependencies: '@babel/helper-module-imports': 7.21.4 '@babel/plugin-transform-block-scoping': 7.21.0(@babel/core@7.21.8) '@babel/plugin-transform-object-assign': 7.18.6 '@ember/edition-utils': 1.2.0 - babel-plugin-debug-macros: 0.3.4(@babel/core@7.21.8) - babel-plugin-filter-imports: 4.0.0 - broccoli-concat: 3.7.5 - broccoli-debug: 0.6.5 - broccoli-funnel: 2.0.2 - broccoli-merge-trees: 3.0.2 - chalk: 3.0.0 - ember-cli-babel: 7.26.11 - ember-cli-get-component-path-option: 1.0.0 - ember-cli-is-package-missing: 1.0.0 - ember-cli-normalize-entity-name: 1.0.0 - ember-cli-path-utils: 1.0.0 - ember-cli-string-utils: 1.1.0 - ember-cli-version-checker: 3.1.3 - ember-router-generator: 2.0.0 - inflection: 1.13.4 - jquery: 3.7.0 - resolve: 1.22.2 - semver: 6.3.0 - silent-error: 1.1.1 - transitivePeerDependencies: - - '@babel/core' - - supports-color - dev: true - - /ember-source@3.26.2: - resolution: {integrity: sha512-s7S+6xVwYYmNCK0rGTAimPw1ahiuOXsFgs0jFMVqwMEndvo+GQvk4rEYDHs0JgN+o5UhQjVpoPqXxkgfPTL38A==} - engines: {node: 10.* || >= 12.*} - dependencies: - '@babel/helper-module-imports': 7.21.4 - '@babel/plugin-transform-block-scoping': 7.21.0(@babel/core@7.21.8) - '@babel/plugin-transform-object-assign': 7.18.6 - '@ember/edition-utils': 1.2.0 - '@glimmer/vm-babel-plugins': 0.77.5 + '@glimmer/vm-babel-plugins': 0.80.3 babel-plugin-debug-macros: 0.3.4(@babel/core@7.21.8) babel-plugin-filter-imports: 4.0.0 broccoli-concat: 4.2.5 broccoli-debug: 0.6.5 + broccoli-file-creator: 2.1.1 broccoli-funnel: 2.0.2 broccoli-merge-trees: 4.2.0 chalk: 4.1.2 diff --git a/test-packages/basic-app/package.json b/test-packages/basic-app/package.json index 23199221..31c0b79d 100644 --- a/test-packages/basic-app/package.json +++ b/test-packages/basic-app/package.json @@ -25,7 +25,7 @@ }, "devDependencies": { "@ember/optional-features": "^1.3.0", - "@glimmer/component": "^1.0.0", + "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.0.0", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", diff --git a/test-packages/custom-fastboot-app/package.json b/test-packages/custom-fastboot-app/package.json index 31bd712f..9c279d20 100644 --- a/test-packages/custom-fastboot-app/package.json +++ b/test-packages/custom-fastboot-app/package.json @@ -22,7 +22,7 @@ }, "devDependencies": { "@ember/optional-features": "^1.3.0", - "@glimmer/component": "^1.0.0", + "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.0.0", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", diff --git a/test-packages/custom-sandbox-app/package.json b/test-packages/custom-sandbox-app/package.json index f399b99f..7a6e86e4 100644 --- a/test-packages/custom-sandbox-app/package.json +++ b/test-packages/custom-sandbox-app/package.json @@ -20,7 +20,7 @@ }, "devDependencies": { "@ember/optional-features": "^1.3.0", - "@glimmer/component": "^1.0.0", + "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.0.0", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", diff --git a/test-packages/example-addon/package.json b/test-packages/example-addon/package.json index 38c3e897..fb14858c 100644 --- a/test-packages/example-addon/package.json +++ b/test-packages/example-addon/package.json @@ -29,7 +29,7 @@ }, "devDependencies": { "@ember/optional-features": "^1.3.0", - "@glimmer/component": "^1.0.0", + "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.0.0", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", diff --git a/test-packages/hot-swap-app/package.json b/test-packages/hot-swap-app/package.json index 8818e000..f004f377 100644 --- a/test-packages/hot-swap-app/package.json +++ b/test-packages/hot-swap-app/package.json @@ -21,7 +21,7 @@ }, "devDependencies": { "@ember/optional-features": "^1.3.0", - "@glimmer/component": "^1.0.0", + "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.0.0", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", From 2b043449ad1debede9920905ac27a02d420fdb07 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Tue, 9 May 2023 17:29:09 +0100 Subject: [PATCH 04/23] update to v3.28.6 with ember-cli-update --- packages/ember-cli-fastboot/.eslintignore | 1 + packages/ember-cli-fastboot/.eslintrc.js | 31 ++++++------- packages/ember-cli-fastboot/.npmignore | 1 + .../ember-cli-fastboot/.template-lintrc.js | 2 +- .../ember-cli-fastboot/ember-cli-build.js | 8 +++- packages/ember-cli-fastboot/package.json | 29 ++++++------ .../tests/dummy/config/ember-cli-update.json | 2 +- .../tests/dummy/config/targets.js | 20 +++++--- packages/ember-cli-fastboot/tests/index.html | 2 +- pnpm-lock.yaml | 46 ++++++++++++------- 10 files changed, 85 insertions(+), 57 deletions(-) diff --git a/packages/ember-cli-fastboot/.eslintignore b/packages/ember-cli-fastboot/.eslintignore index 92216555..701947ed 100644 --- a/packages/ember-cli-fastboot/.eslintignore +++ b/packages/ember-cli-fastboot/.eslintignore @@ -13,6 +13,7 @@ # misc /coverage/ !.* +.*/ .eslintcache # ember-try diff --git a/packages/ember-cli-fastboot/.eslintrc.js b/packages/ember-cli-fastboot/.eslintrc.js index 577f12b9..c05f425c 100644 --- a/packages/ember-cli-fastboot/.eslintrc.js +++ b/packages/ember-cli-fastboot/.eslintrc.js @@ -29,23 +29,15 @@ module.exports = { // node files { files: [ - '.eslintrc.js', - '.prettierrc.js', - '.template-lintrc.js', - 'ember-cli-build.js', - 'index.js', - 'testem.js', - 'blueprints/*/index.js', - 'config/**/*.js', - 'tests/dummy/config/**/*.js', - 'lib/**/*.js' - ], - excludedFiles: [ - 'app/**', - 'addon/**', - 'addon-test-support/**', - 'app/**', - 'tests/dummy/app/**', + './.eslintrc.js', + './.prettierrc.js', + './.template-lintrc.js', + './ember-cli-build.js', + './index.js', + './testem.js', + './blueprints/*/index.js', + './config/**/*.js', + './tests/dummy/config/**/*.js', ], parserOptions: { sourceType: 'script', @@ -57,5 +49,10 @@ module.exports = { plugins: ['node'], extends: ['plugin:node/recommended'], }, + { + // Test files: + files: ['tests/**/*-test.{js,ts}'], + extends: ['plugin:qunit/recommended'], + }, ], }; diff --git a/packages/ember-cli-fastboot/.npmignore b/packages/ember-cli-fastboot/.npmignore index eb8e610c..7f9fb326 100644 --- a/packages/ember-cli-fastboot/.npmignore +++ b/packages/ember-cli-fastboot/.npmignore @@ -27,6 +27,7 @@ /testem.js /test/ /tests/ +/yarn-error.log /yarn.lock .gitkeep diff --git a/packages/ember-cli-fastboot/.template-lintrc.js b/packages/ember-cli-fastboot/.template-lintrc.js index 3b0b9af9..f35f61c7 100644 --- a/packages/ember-cli-fastboot/.template-lintrc.js +++ b/packages/ember-cli-fastboot/.template-lintrc.js @@ -1,5 +1,5 @@ 'use strict'; module.exports = { - extends: 'octane', + extends: 'recommended', }; diff --git a/packages/ember-cli-fastboot/ember-cli-build.js b/packages/ember-cli-fastboot/ember-cli-build.js index a778499b..e211c633 100644 --- a/packages/ember-cli-fastboot/ember-cli-build.js +++ b/packages/ember-cli-fastboot/ember-cli-build.js @@ -15,5 +15,11 @@ module.exports = function (defaults) { */ const { maybeEmbroider } = require('@embroider/test-setup'); - return maybeEmbroider(app); + return maybeEmbroider(app, { + skipBabel: [ + { + package: 'qunit', + }, + ], + }); }; diff --git a/packages/ember-cli-fastboot/package.json b/packages/ember-cli-fastboot/package.json index 591770ca..b4cf01fc 100644 --- a/packages/ember-cli-fastboot/package.json +++ b/packages/ember-cli-fastboot/package.json @@ -14,7 +14,7 @@ }, "scripts": { "build": "ember build --environment=production", - "lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'", + "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:hbs": "ember-template-lint .", "lint:hbs:fix": "ember-template-lint . --fix", @@ -35,7 +35,7 @@ "broccoli-merge-trees": "^4.2.0", "broccoli-plugin": "^4.0.7", "chalk": "^4.1.2", - "ember-cli-babel": "^7.26.6", + "ember-cli-babel": "^7.26.10", "ember-cli-lodash-subset": "^2.0.1", "ember-cli-preprocess-registry": "^3.3.0", "ember-cli-version-checker": "^5.1.2", @@ -51,7 +51,7 @@ "devDependencies": { "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.6.0", - "@embroider/test-setup": "^0.37.0", + "@embroider/test-setup": "^0.48.1", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.0.4", "babel-eslint": "^10.1.0", @@ -66,35 +66,36 @@ "ember-cli": "~4.1.0", "ember-cli-addon-tests": "^0.11.1", "ember-cli-dependency-checker": "^3.2.0", - "ember-cli-htmlbars": "^5.7.1", - "ember-cli-inject-live-reload": "^2.0.2", + "ember-cli-htmlbars": "^5.7.2", + "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", - "ember-cli-terser": "^4.0.1", + "ember-cli-terser": "^4.0.2", "ember-disable-prototype-extensions": "^1.1.3", "ember-export-application-global": "^2.0.1", "ember-load-initializers": "^2.1.2", "ember-maybe-import-regenerator-for-testing": "^1.0.0", "ember-page-title": "^7.0.0", "ember-qunit": "^5.1.5", - "ember-resolver": "^8.0.2", + "ember-resolver": "^8.0.3", "ember-sinon": "^2.2.0", "ember-source": "~3.28.11", "ember-source-channel-url": "^3.0.0", - "ember-template-lint": "^3.2.0", + "ember-template-lint": "^3.15.0", "ember-try": "^2.0.0", - "eslint": "^7.23.0", - "eslint-config-prettier": "^8.1.0", - "eslint-plugin-ember": "^10.3.0", + "eslint": "^7.32.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-ember": "^10.5.8", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^3.3.1", + "eslint-plugin-prettier": "^3.4.1", + "eslint-plugin-qunit": "^6.2.0", "glob": "^7.1.3", "lint-to-the-future": "^2.0.0", "lint-to-the-future-eslint": "^2.0.1", "loader.js": "^4.7.0", "mocha": "^9.1.2", "npm-run-all": "^4.1.5", - "prettier": "^2.2.1", - "qunit": "^2.14.1", + "prettier": "^2.5.1", + "qunit": "^2.17.2", "qunit-dom": "^1.6.0", "release-it": "^14.2.2", "release-it-lerna-changelog": "^3.1.0", diff --git a/packages/ember-cli-fastboot/tests/dummy/config/ember-cli-update.json b/packages/ember-cli-fastboot/tests/dummy/config/ember-cli-update.json index 3a4ab322..871e6e48 100644 --- a/packages/ember-cli-fastboot/tests/dummy/config/ember-cli-update.json +++ b/packages/ember-cli-fastboot/tests/dummy/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "ember-cli", - "version": "3.26.1", + "version": "3.28.6", "blueprints": [ { "name": "addon", diff --git a/packages/ember-cli-fastboot/tests/dummy/config/targets.js b/packages/ember-cli-fastboot/tests/dummy/config/targets.js index 4b33327e..3cd797ab 100644 --- a/packages/ember-cli-fastboot/tests/dummy/config/targets.js +++ b/packages/ember-cli-fastboot/tests/dummy/config/targets.js @@ -6,12 +6,20 @@ const browsers = [ 'last 1 Safari versions', ]; -const isCI = Boolean(process.env.CI); -const isProduction = process.env.EMBER_ENV === 'production'; - -if (isCI || isProduction) { - browsers.push('ie 11'); -} +// Ember's browser support policy is changing, and IE11 support will end in +// v4.0 onwards. +// +// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy +// +// If you need IE11 support on a version of Ember that still offers support +// for it, uncomment the code block below. +// +// const isCI = Boolean(process.env.CI); +// const isProduction = process.env.EMBER_ENV === 'production'; +// +// if (isCI || isProduction) { +// browsers.push('ie 11'); +// } module.exports = { browsers, diff --git a/packages/ember-cli-fastboot/tests/index.html b/packages/ember-cli-fastboot/tests/index.html index f5efd816..c4bb4117 100644 --- a/packages/ember-cli-fastboot/tests/index.html +++ b/packages/ember-cli-fastboot/tests/index.html @@ -28,7 +28,7 @@ - + diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 37b9b19a..9523f849 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -42,7 +42,7 @@ importers: specifier: ^4.1.2 version: 4.1.2 ember-cli-babel: - specifier: ^7.26.6 + specifier: ^7.26.10 version: 7.26.11 ember-cli-lodash-subset: specifier: ^2.0.1 @@ -85,8 +85,8 @@ importers: specifier: ^2.6.0 version: 2.9.4(ember-source@3.28.12) '@embroider/test-setup': - specifier: ^0.37.0 - version: 0.37.0 + specifier: ^0.48.1 + version: 0.48.1 '@glimmer/component': specifier: ^1.1.2 version: 1.1.2 @@ -130,16 +130,16 @@ importers: specifier: ^3.2.0 version: 3.2.0 ember-cli-htmlbars: - specifier: ^5.7.1 + specifier: ^5.7.2 version: 5.7.2 ember-cli-inject-live-reload: - specifier: ^2.0.2 + specifier: ^2.1.0 version: 2.1.0 ember-cli-sri: specifier: ^2.1.1 version: 2.1.1 ember-cli-terser: - specifier: ^4.0.1 + specifier: ^4.0.2 version: 4.0.2 ember-disable-prototype-extensions: specifier: ^1.1.3 @@ -160,7 +160,7 @@ importers: specifier: ^5.1.5 version: 5.1.5(@ember/test-helpers@2.9.4)(qunit@2.20.0) ember-resolver: - specifier: ^8.0.2 + specifier: ^8.0.3 version: 8.1.0 ember-sinon: specifier: ^2.2.0 @@ -172,26 +172,29 @@ importers: specifier: ^3.0.0 version: 3.0.0 ember-template-lint: - specifier: ^3.2.0 + specifier: ^3.15.0 version: 3.16.0 ember-try: specifier: ^2.0.0 version: 2.0.0 eslint: - specifier: ^7.23.0 + specifier: ^7.32.0 version: 7.32.0 eslint-config-prettier: - specifier: ^8.1.0 + specifier: ^8.3.0 version: 8.10.0(eslint@7.32.0) eslint-plugin-ember: - specifier: ^10.3.0 + specifier: ^10.5.8 version: 10.6.1(eslint@7.32.0) eslint-plugin-node: specifier: ^11.1.0 version: 11.1.0(eslint@7.32.0) eslint-plugin-prettier: - specifier: ^3.3.1 + specifier: ^3.4.1 version: 3.4.1(eslint-config-prettier@8.10.0)(eslint@7.32.0)(prettier@2.8.8) + eslint-plugin-qunit: + specifier: ^6.2.0 + version: 6.2.0(eslint@7.32.0) glob: specifier: ^7.1.3 version: 7.1.3 @@ -211,10 +214,10 @@ importers: specifier: ^4.1.5 version: 4.1.5 prettier: - specifier: ^2.2.1 + specifier: ^2.5.1 version: 2.8.8 qunit: - specifier: ^2.14.1 + specifier: ^2.17.2 version: 2.20.0 qunit-dom: specifier: ^1.6.0 @@ -2919,8 +2922,9 @@ packages: - supports-color dev: true - /@embroider/test-setup@0.37.0: - resolution: {integrity: sha512-4jme5zEonjGvKeyVRygyXmooMuwmaa3nBiIxwbkRA6KWh0BLyZSqPwlQl93s7IT7S5PO5U9TqNiqI4yp2k5T7Q==} + /@embroider/test-setup@0.48.1: + resolution: {integrity: sha512-MmYTgQMDVDrZPvxeT27LTUD/BOum21ip1tEYv5H/StSeTZyZQ861Q+8HXQUFTVF/HFjGAB1c/BAgnw+8hO1ueA==} + engines: {node: 12.* || 14.* || >= 16} dependencies: lodash: 4.17.21 resolve: 1.22.2 @@ -9847,6 +9851,16 @@ packages: prettier-linter-helpers: 1.0.0 dev: true + /eslint-plugin-qunit@6.2.0(eslint@7.32.0): + resolution: {integrity: sha512-KvPmkIC2MHpfRxs/r8WUeeGkG6y+3qwSi2AZIBtjcM/YG6Z3k0GxW5Hbu3l7X0TDhljVCeBb9Q5puUkHzl83Mw==} + engines: {node: 10.x || 12.x || >=14.0.0} + dependencies: + eslint-utils: 3.0.0(eslint@7.32.0) + requireindex: 1.2.0 + transitivePeerDependencies: + - eslint + dev: true + /eslint-scope@4.0.3: resolution: {integrity: sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==} engines: {node: '>=4.0.0'} From 220e65ff3e5a651a7ae212a4f8aa7593a205bdb2 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Tue, 9 May 2023 17:29:27 +0100 Subject: [PATCH 05/23] add fail-fast: false and timeouts to github CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ef7d9c6..2a757b75 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -145,7 +145,7 @@ jobs: try-scenarios: name: "ember-try for ember-cli-fastboot: ${{ matrix.ember-try-scenario }}" runs-on: ubuntu-latest - timeout-minutes: 7 + timeout-minutes: 10 strategy: fail-fast: false From 649299366b49b5dc2e90b155c3ac9b9f349be01d Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Mon, 16 Oct 2023 10:27:48 -0400 Subject: [PATCH 06/23] fix lint --- packages/ember-cli-fastboot/.eslintrc.js | 5 +++-- .../lib/build-utilities/migrate-initializers.js | 3 ++- .../ember-cli-fastboot/tests/unit/services/fastboot-test.js | 4 ++-- packages/fastboot-express-middleware/test/middleware-test.js | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/ember-cli-fastboot/.eslintrc.js b/packages/ember-cli-fastboot/.eslintrc.js index c05f425c..e4af717f 100644 --- a/packages/ember-cli-fastboot/.eslintrc.js +++ b/packages/ember-cli-fastboot/.eslintrc.js @@ -29,14 +29,15 @@ module.exports = { // node files { files: [ - './.eslintrc.js', + './**/.eslintrc.js', './.prettierrc.js', './.template-lintrc.js', - './ember-cli-build.js', + './**/ember-cli-build.js', './index.js', './testem.js', './blueprints/*/index.js', './config/**/*.js', + './**/lib/**/*.js', './tests/dummy/config/**/*.js', ], parserOptions: { diff --git a/packages/ember-cli-fastboot/lib/build-utilities/migrate-initializers.js b/packages/ember-cli-fastboot/lib/build-utilities/migrate-initializers.js index 9658b329..b48342bf 100644 --- a/packages/ember-cli-fastboot/lib/build-utilities/migrate-initializers.js +++ b/packages/ember-cli-fastboot/lib/build-utilities/migrate-initializers.js @@ -1,4 +1,5 @@ -/* eslint-disable prettier/prettier */ +/* eslint-disable no-undef, prettier/prettier */ +/* eslint-env node */ 'use strict'; const path = require('path'); diff --git a/packages/ember-cli-fastboot/tests/unit/services/fastboot-test.js b/packages/ember-cli-fastboot/tests/unit/services/fastboot-test.js index b0b92922..9906f4af 100644 --- a/packages/ember-cli-fastboot/tests/unit/services/fastboot-test.js +++ b/packages/ember-cli-fastboot/tests/unit/services/fastboot-test.js @@ -7,8 +7,8 @@ module('Unit | Service | fastboot in the browser', function(hooks) { test('isFastBoot', function(assert) { let service = this.owner.lookup('service:fastboot'); - assert.equal(service.isFastBoot, false, `it should be false`); - assert.equal(service.get('isFastBoot'), false, `it should be false`); + assert.false(service.isFastBoot, `it should be false`); + assert.false(service.get('isFastBoot'), `it should be false`); }); test('isFastboot', function(assert) { diff --git a/packages/fastboot-express-middleware/test/middleware-test.js b/packages/fastboot-express-middleware/test/middleware-test.js index eb78eb0e..abbf2657 100644 --- a/packages/fastboot-express-middleware/test/middleware-test.js +++ b/packages/fastboot-express-middleware/test/middleware-test.js @@ -111,6 +111,7 @@ describe('FastBoot', function() { // FIXME: // TODO: // https://github.com/ember-fastboot/ember-cli-fastboot/pull/840#issuecomment-894329631 + // eslint-disable-next-line mocha/no-skipped-tests it.skip('works without metadata passed', async function() { let middleware = fastbootMiddleware({ distPath: fixture('app-with-metadata'), From bb1c468b0aa0073dad355e57ba153503481325e3 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Sat, 13 May 2023 08:30:18 -0400 Subject: [PATCH 07/23] update ember-data to 3.28 --- pnpm-lock.yaml | 262 ++++++++++-------- test-packages/basic-app/package.json | 2 +- .../custom-fastboot-app/package.json | 2 +- test-packages/custom-sandbox-app/package.json | 2 +- .../package.json | 2 +- test-packages/hot-swap-app/package.json | 2 +- 6 files changed, 155 insertions(+), 117 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9523f849..be722fed 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -548,8 +548,8 @@ importers: specifier: ^3.0.0 version: 3.0.0 ember-data: - specifier: ~3.19.0 - version: 3.19.0 + specifier: ~3.28.0 + version: 3.28.13 ember-export-application-global: specifier: ^2.0.1 version: 2.0.1 @@ -665,8 +665,8 @@ importers: specifier: ^3.0.0 version: 3.0.0 ember-data: - specifier: ~3.19.0 - version: 3.19.0 + specifier: ~3.28.0 + version: 3.28.13 ember-export-application-global: specifier: ^2.0.1 version: 2.0.1 @@ -764,8 +764,8 @@ importers: specifier: ^3.0.0 version: 3.0.0 ember-data: - specifier: ~3.19.0 - version: 3.19.0 + specifier: ~3.28.0 + version: 3.28.13 ember-export-application-global: specifier: ^2.0.1 version: 2.0.1 @@ -854,8 +854,8 @@ importers: specifier: ^3.0.0 version: 3.0.0 ember-data: - specifier: ~3.19.0 - version: 3.19.0 + specifier: ~3.28.0 + version: 3.28.13 ember-export-application-global: specifier: ^2.0.1 version: 2.0.1 @@ -1060,8 +1060,8 @@ importers: specifier: ^3.0.0 version: 3.0.0 ember-data: - specifier: ~3.19.0 - version: 3.19.0 + specifier: ~3.28.0 + version: 3.28.13 ember-export-application-global: specifier: ^2.0.1 version: 2.0.1 @@ -2561,86 +2561,89 @@ packages: dev: true optional: true - /@ember-data/adapter@3.19.0: - resolution: {integrity: sha512-XELDnxcp6ZOxBrr5abebWeHrEbapSvszolQhuGVoCvl7EAr0IEWeJ8JGrAd6IhTt+XAHNzQ7rr28XVw7FA4Vtw==} - engines: {node: 10.* || >= 12.*} + /@ember-data/adapter@3.28.13: + resolution: {integrity: sha512-AwLJTs+GvxX72vfP3edV0hoMLD9oPWJNbnqxakXVN9xGTuk6/TeGQLMrVU3222GCoMMNrJ357Nip7kZeFo4IdA==} + engines: {node: 12.* || >= 14.*} dependencies: - '@ember-data/private-build-infra': 3.19.0 - '@ember-data/store': 3.19.0 + '@ember-data/private-build-infra': 3.28.13 + '@ember-data/store': 3.28.13 '@ember/edition-utils': 1.2.0 + '@ember/string': 3.1.1 ember-cli-babel: 7.26.11 ember-cli-test-info: 1.0.0 - ember-cli-typescript: 3.1.4 + ember-cli-typescript: 4.2.1 transitivePeerDependencies: - '@babel/core' - supports-color dev: true - /@ember-data/canary-features@3.19.0: - resolution: {integrity: sha512-AVrWEP4fARk2ee/CWGOEjLJwK2h+Un37CNIkxEFK9JG5tQh7yzBnbw74ZqDK7Ue9qqjF1fMwDOQUmvstm8SokA==} - engines: {node: 10.* || >= 12.*} + /@ember-data/canary-features@3.28.13: + resolution: {integrity: sha512-fgpcB0wmtUjZeqcIKkfP/MclQjY5r8ft8YZhPlvQh2MIx+3d3nCNRXB6lEUdRdQphFEag2towONFEIsiOAgs3Q==} + engines: {node: 12.* || >= 14.*} dependencies: ember-cli-babel: 7.26.11 - ember-cli-typescript: 3.1.4 + ember-cli-typescript: 4.2.1 transitivePeerDependencies: - - '@babel/core' - supports-color dev: true - /@ember-data/debug@3.19.0: - resolution: {integrity: sha512-cTWKMuOiNa9rPAeY/iB4XznVL5Hs11MwLLJ8LgFP3ksZiveo2PQ4XnpxKmNj+p/QVMHRsdWaydg5MsFM7NH/ZQ==} - engines: {node: 10.* || >= 12.*} + /@ember-data/debug@3.28.13: + resolution: {integrity: sha512-ofny/Grpqx1lM6KWy5q75/b2/B+zQ4B4Ynk7SrQ//sFvpX3gjuP8iN07SKTHSN07vedlC+7QNhNJdCQwyqK1Fg==} + engines: {node: 12.* || >= 14.*} dependencies: - '@ember-data/private-build-infra': 3.19.0 + '@ember-data/private-build-infra': 3.28.13 '@ember/edition-utils': 1.2.0 + '@ember/string': 3.1.1 ember-cli-babel: 7.26.11 ember-cli-test-info: 1.0.0 - ember-cli-typescript: 3.1.4 + ember-cli-typescript: 4.2.1 transitivePeerDependencies: - '@babel/core' - supports-color dev: true - /@ember-data/model@3.19.0: - resolution: {integrity: sha512-OzQwzqk0NQRqHnGT1ZjSQBESfRJdqRFGTXIImxmGv4Mwb3I+3dpVETt/E2wPKP0GyhZqEUCg8X6Z4itY5ATKtw==} - engines: {node: 10.* || >= 12.*} + /@ember-data/model@3.28.13: + resolution: {integrity: sha512-V5Hgzz5grNWTSrKGksY9xeOsTDLN/d3qsVMu26FWWHP5uqyWT0Cd4LSRpNxs14PsTFDcbrtGKaZv3YVksZfFEQ==} + engines: {node: 12.* || >= 14.*} dependencies: - '@ember-data/canary-features': 3.19.0 - '@ember-data/private-build-infra': 3.19.0 - '@ember-data/store': 3.19.0 + '@ember-data/canary-features': 3.28.13 + '@ember-data/private-build-infra': 3.28.13 + '@ember-data/store': 3.28.13 '@ember/edition-utils': 1.2.0 + '@ember/string': 3.1.1 + ember-cached-decorator-polyfill: 0.1.4 ember-cli-babel: 7.26.11 ember-cli-string-utils: 1.1.0 ember-cli-test-info: 1.0.0 - ember-cli-typescript: 3.1.4 + ember-cli-typescript: 4.2.1 ember-compatibility-helpers: 1.2.6 - inflection: 1.12.0 + inflection: 1.13.4 transitivePeerDependencies: - '@babel/core' - supports-color dev: true - /@ember-data/private-build-infra@3.19.0: - resolution: {integrity: sha512-uyXsW7x7ZJSxS1n69llvClfR9uUJ/AgWbghzo7oB7nHUML105W5E+Fp9JmBO/X2w3O7jk2NxNDM4/8xV5wPZVA==} - engines: {node: 10.* || >= 12.*} + /@ember-data/private-build-infra@3.28.13: + resolution: {integrity: sha512-8gT3/gnmbNgFIMVdHBpl3xFGJefJE26VUIidFHTF1/N1aumVUlEhnXH0BSPxvxTnFXz/klGSTOMs+sDsx3jw6A==} + engines: {node: 12.* || >= 14.*} dependencies: '@babel/plugin-transform-block-scoping': 7.21.0(@babel/core@7.21.8) - '@ember-data/canary-features': 3.19.0 + '@ember-data/canary-features': 3.28.13 '@ember/edition-utils': 1.2.0 babel-plugin-debug-macros: 0.3.4(@babel/core@7.21.8) babel-plugin-filter-imports: 4.0.0 babel6-plugin-strip-class-callcheck: 6.0.0 broccoli-debug: 0.6.5 broccoli-file-creator: 2.1.1 - broccoli-funnel: 2.0.2 + broccoli-funnel: 3.0.8 broccoli-merge-trees: 4.2.0 - broccoli-rollup: 4.1.1 + broccoli-rollup: 5.0.0 calculate-cache-key-for-tree: 2.0.0 chalk: 4.1.2 ember-cli-babel: 7.26.11 ember-cli-path-utils: 1.0.0 ember-cli-string-utils: 1.1.0 - ember-cli-typescript: 3.1.4 + ember-cli-typescript: 4.2.1 ember-cli-version-checker: 5.1.2 esm: 3.2.25 git-repo-info: 2.1.1 @@ -2655,18 +2658,17 @@ packages: - supports-color dev: true - /@ember-data/record-data@3.19.0: - resolution: {integrity: sha512-2tjhtJ+SSjzIF2UngSS8BAwxC1j53gxR2ewB9T4W530rqZ/pxLv5JkjLRlbtstFwFq34/okQY6MPCjapgY1k7Q==} - engines: {node: 10.* || >= 12.*} + /@ember-data/record-data@3.28.13: + resolution: {integrity: sha512-0qYOxQr901eZ0JoYVt/IiszZYuNefqO6yiwKw0VH2dmWhVniQSp+Da9YnoKN9U2KgR4NdxKiUs2j9ZLNZ+bH7g==} + engines: {node: 12.* || >= 14.*} dependencies: - '@ember-data/canary-features': 3.19.0 - '@ember-data/private-build-infra': 3.19.0 - '@ember-data/store': 3.19.0 + '@ember-data/canary-features': 3.28.13 + '@ember-data/private-build-infra': 3.28.13 + '@ember-data/store': 3.28.13 '@ember/edition-utils': 1.2.0 - '@ember/ordered-set': 2.0.3 ember-cli-babel: 7.26.11 ember-cli-test-info: 1.0.0 - ember-cli-typescript: 3.1.4 + ember-cli-typescript: 4.2.1 transitivePeerDependencies: - '@babel/core' - supports-color @@ -2675,30 +2677,32 @@ packages: /@ember-data/rfc395-data@0.0.4: resolution: {integrity: sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ==} - /@ember-data/serializer@3.19.0: - resolution: {integrity: sha512-eyUODXfuGWRcDxo37JNsWYnxWGf1uv7oTlC+m0DJHSCZpql24Dc0VfIJ8JtSmi4G7wq3EtCfVx1vni/HKJinfg==} - engines: {node: 10.* || >= 12.*} + /@ember-data/serializer@3.28.13: + resolution: {integrity: sha512-BlYXi8ObH0B5G7QeWtkf9u8PrhdlfAxOAsOuOPZPCTzWsQlmyzV6M9KvBmIAvJtM2IQ3a5BX2o71eP6/7MJDUg==} + engines: {node: 12.* || >= 14.*} dependencies: - '@ember-data/private-build-infra': 3.19.0 - '@ember-data/store': 3.19.0 + '@ember-data/private-build-infra': 3.28.13 + '@ember-data/store': 3.28.13 ember-cli-babel: 7.26.11 ember-cli-test-info: 1.0.0 - ember-cli-typescript: 3.1.4 + ember-cli-typescript: 4.2.1 transitivePeerDependencies: - '@babel/core' - supports-color dev: true - /@ember-data/store@3.19.0: - resolution: {integrity: sha512-4/sOvUd4oeAzB+k57qkbBy9ssUU7MjyNiQZwqYxmlPU9k/1T2/gUKZVmZtDIab1zInIFzLsFpS0PYv9Gt1mz3Q==} - engines: {node: 10.* || >= 12.*} + /@ember-data/store@3.28.13: + resolution: {integrity: sha512-y1ddWLfR20l3NN9fNfIAFWCmREnC6hjKCZERDgkvBgZOCAKcs+6bVJGyMmKBcsp4W7kanqKn71tX7Y63jp+jXQ==} + engines: {node: 12.* || >= 14.*} dependencies: - '@ember-data/canary-features': 3.19.0 - '@ember-data/private-build-infra': 3.19.0 + '@ember-data/canary-features': 3.28.13 + '@ember-data/private-build-infra': 3.28.13 + '@ember/string': 3.1.1 + '@glimmer/tracking': 1.0.4 + ember-cached-decorator-polyfill: 0.1.4 ember-cli-babel: 7.26.11 ember-cli-path-utils: 1.0.0 - ember-cli-typescript: 3.1.4 - heimdalljs: 0.3.3 + ember-cli-typescript: 4.2.1 transitivePeerDependencies: - '@babel/core' - supports-color @@ -2746,14 +2750,12 @@ packages: - supports-color dev: true - /@ember/ordered-set@2.0.3: - resolution: {integrity: sha512-F4yfVk6WMc4AUHxeZsC3CaKyTvO0qSZJy7WWHCFTlVDQw6vubn+FvnGdhzpN1F00EiXMI4Tv1tJdSquHcCnYrA==} - engines: {node: 6.* || 8.* || >= 10.*} + /@ember/string@3.1.1: + resolution: {integrity: sha512-UbXJ+k3QOrYN4SRPHgXCqYIJ+yWWUg1+vr0H4DhdQPTy8LJfyqwZ2tc5uqpSSnEXE+/1KopHBE5J8GDagAg5cg==} + engines: {node: 12.* || 14.* || >= 16} dependencies: - ember-cli-babel: 6.18.0(@babel/core@7.21.8) - ember-compatibility-helpers: 1.2.6 + ember-cli-babel: 7.26.11 transitivePeerDependencies: - - '@babel/core' - supports-color dev: true @@ -3490,8 +3492,13 @@ packages: '@types/node': 20.2.4 dev: true - /@types/broccoli-plugin@1.3.0: - resolution: {integrity: sha512-SLk4/hFc2kGvgwNFrpn2O1juxFOllcHAywvlo7VwxfExLzoz1GGJ0oIZCwj5fwSpvHw4AWpZjJ1fUvb62PDayQ==} + /@types/broccoli-plugin@3.0.0: + resolution: {integrity: sha512-f+TcsARR2PovfFRKFdCX0kfH/QoM3ZVD2h1rl2mNvrKO0fq2uBNCBsTU3JanfU4COCt5cXpTfARyUsERlC8vIw==} + deprecated: This is a stub types definition. broccoli-plugin provides its own type definitions, so you do not need this installed. + dependencies: + broccoli-plugin: 4.0.7 + transitivePeerDependencies: + - supports-color dev: true /@types/cacheable-request@6.0.3: @@ -6126,19 +6133,19 @@ packages: - supports-color dev: true - /broccoli-rollup@4.1.1: - resolution: {integrity: sha512-hkp0dB5chiemi32t6hLe5bJvxuTOm1TU+SryFlZIs95KT9+94uj0C8w6k6CsZ2HuIdIZg6D252t4gwOlcTXrpA==} - engines: {node: '>=8.0'} + /broccoli-rollup@5.0.0: + resolution: {integrity: sha512-QdMuXHwsdz/LOS8zu4HP91Sfi4ofimrOXoYP/lrPdRh7lJYD87Lfq4WzzUhGHsxMfzANIEvl/7qVHKD3cFJ4tA==} + engines: {node: '>=12.0'} dependencies: - '@types/broccoli-plugin': 1.3.0 - broccoli-plugin: 2.1.0 + '@types/broccoli-plugin': 3.0.0 + broccoli-plugin: 4.0.7 fs-tree-diff: 2.0.1 heimdalljs: 0.2.6 node-modules-path: 1.0.2 - rollup: 1.32.1 + rollup: 2.79.1 rollup-pluginutils: 2.8.2 symlink-or-copy: 1.3.1 - walk-sync: 1.1.4 + walk-sync: 2.2.0 transitivePeerDependencies: - supports-color dev: true @@ -8171,6 +8178,32 @@ packages: - webpack dev: true + /ember-cache-primitive-polyfill@1.0.1: + resolution: {integrity: sha512-hSPcvIKarA8wad2/b6jDd/eU+OtKmi6uP+iYQbzi5TQpjsqV6b4QdRqrLk7ClSRRKBAtdTuutx+m+X+WlEd2lw==} + engines: {node: 10.* || >= 12} + dependencies: + ember-cli-babel: 7.26.11 + ember-cli-version-checker: 5.1.2 + ember-compatibility-helpers: 1.2.6 + silent-error: 1.1.1 + transitivePeerDependencies: + - '@babel/core' + - supports-color + dev: true + + /ember-cached-decorator-polyfill@0.1.4: + resolution: {integrity: sha512-JOK7kBCWsTVCzmCefK4nr9BACDJk0owt9oIUaVt6Q0UtQ4XeAHmoK5kQ/YtDcxQF1ZevHQFdGhsTR3JLaHNJgA==} + engines: {node: 10.* || >= 12} + dependencies: + '@glimmer/tracking': 1.0.4 + ember-cache-primitive-polyfill: 1.0.1 + ember-cli-babel: 7.26.11 + ember-cli-babel-plugin-helpers: 1.1.1 + transitivePeerDependencies: + - '@babel/core' + - supports-color + dev: true + /ember-cli-addon-tests@0.11.1: resolution: {integrity: sha512-PI3ht9NrgfAwBgh3aPCVecajndvDKltTqRdtxt5bgfQJ3+AMs6moXhijKygwuAeT5btyhhLbceTfHRL/K8pX2w==} engines: {node: '>= 6'} @@ -8623,6 +8656,24 @@ packages: - supports-color dev: true + /ember-cli-typescript@4.2.1: + resolution: {integrity: sha512-0iKTZ+/wH6UB/VTWKvGuXlmwiE8HSIGcxHamwNhEC5x1mN3z8RfvsFZdQWYUzIWFN2Tek0gmepGRPTwWdBYl/A==} + engines: {node: 10.* || >= 12.*} + dependencies: + ansi-to-html: 0.6.15 + broccoli-stew: 3.0.0 + debug: 4.3.4 + execa: 4.1.0 + fs-extra: 9.1.0 + resolve: 1.22.2 + rsvp: 4.8.5 + semver: 7.5.1 + stagehand: 1.0.1 + walk-sync: 2.2.0 + transitivePeerDependencies: + - supports-color + dev: true + /ember-cli-uglify@3.0.0: resolution: {integrity: sha512-n3QxdBfAgBdb2Cnso82Kt/nxm3ppIjnYWM8uhOEhF1aYxNXfM7AJrc+yiqTCDUR61Db8aCpHfAMvChz3kyme7g==} engines: {node: 8.* || >= 10.*} @@ -8996,24 +9047,24 @@ packages: - supports-color dev: true - /ember-data@3.19.0: - resolution: {integrity: sha512-dZwJNevHXOOzeokOnzgmrxPPFjGwNgPidGECuNYjjHxg4CaumbNpbxj6GgfBq4gyF7zHkMAQeHmph56935kR6g==} - engines: {node: 10.* || >= 12.*} + /ember-data@3.28.13: + resolution: {integrity: sha512-j1YjPl2JNHxQwQW6Bgfis44XSr4WCtdwMXr/SPpLsF1oVeTWIn3kwefcDnbuCI8Spmt1B9ab3ZLKzf2KkGN/7g==} + engines: {node: 12.* || >= 14.*} dependencies: - '@ember-data/adapter': 3.19.0 - '@ember-data/debug': 3.19.0 - '@ember-data/model': 3.19.0 - '@ember-data/private-build-infra': 3.19.0 - '@ember-data/record-data': 3.19.0 - '@ember-data/serializer': 3.19.0 - '@ember-data/store': 3.19.0 + '@ember-data/adapter': 3.28.13 + '@ember-data/debug': 3.28.13 + '@ember-data/model': 3.28.13 + '@ember-data/private-build-infra': 3.28.13 + '@ember-data/record-data': 3.28.13 + '@ember-data/serializer': 3.28.13 + '@ember-data/store': 3.28.13 '@ember/edition-utils': 1.2.0 - '@ember/ordered-set': 2.0.3 + '@ember/string': 3.1.1 '@glimmer/env': 0.1.7 broccoli-merge-trees: 4.2.0 ember-cli-babel: 7.26.11 - ember-cli-typescript: 3.1.4 - ember-inflector: 3.0.1 + ember-cli-typescript: 4.2.1 + ember-inflector: 4.0.2 transitivePeerDependencies: - '@babel/core' - supports-color @@ -9076,13 +9127,12 @@ packages: - supports-color dev: true - /ember-inflector@3.0.1: - resolution: {integrity: sha512-fngrwMsnhkBt51KZgwNwQYxgURwV4lxtoHdjxf7RueGZ5zM7frJLevhHw7pbQNGqXZ3N+MRkhfNOLkdDK9kFdA==} - engines: {node: ^4.5 || 6.* || >= 7.*} + /ember-inflector@4.0.2: + resolution: {integrity: sha512-+oRstEa52mm0jAFzhr51/xtEWpCEykB3SEBr7vUg8YnXUZJ5hKNBppP938q8Zzr9XfJEbzrtDSGjhKwJCJv6FQ==} + engines: {node: 10.* || 12.* || >= 14} dependencies: - ember-cli-babel: 6.18.0(@babel/core@7.21.8) + ember-cli-babel: 7.26.11 transitivePeerDependencies: - - '@babel/core' - supports-color dev: true @@ -11684,12 +11734,6 @@ packages: dependencies: rsvp: 3.2.1 - /heimdalljs@0.3.3: - resolution: {integrity: sha512-xRlqDhgaXW4WccsiQlv6avDMKVN9Jk+FyMopDRPkmdf92TqfGSd2Osd/PKrK9sbM1AKcj8OpPlCzNlCWaLagCw==} - dependencies: - rsvp: 3.2.1 - dev: true - /highlight.js@10.7.3: resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==} dev: true @@ -11992,11 +12036,6 @@ packages: resolution: {integrity: sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==} dev: true - /inflection@1.12.0: - resolution: {integrity: sha512-lRy4DxuIFWXlJU7ed8UiTJOSTqStqYdEb4CEbtXfNbkdj3nH1L+reUWiE10VWcJS2yR7tge8Z74pJjtBjNwj0w==} - engines: {'0': node >= 0.4.0} - dev: true - /inflection@1.13.4: resolution: {integrity: sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==} engines: {'0': node >= 0.4.0} @@ -16069,13 +16108,12 @@ packages: sourcemap-codec: 1.4.8 dev: true - /rollup@1.32.1: - resolution: {integrity: sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==} + /rollup@2.79.1: + resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==} + engines: {node: '>=10.0.0'} hasBin: true - dependencies: - '@types/estree': 1.0.1 - '@types/node': 20.2.4 - acorn: 7.4.1 + optionalDependencies: + fsevents: 2.3.2 dev: true /rsvp@3.2.1: diff --git a/test-packages/basic-app/package.json b/test-packages/basic-app/package.json index 31c0b79d..ffe030f8 100644 --- a/test-packages/basic-app/package.json +++ b/test-packages/basic-app/package.json @@ -43,7 +43,7 @@ "ember-cli-inject-live-reload": "^2.0.2", "ember-cli-sri": "^2.1.1", "ember-cli-uglify": "^3.0.0", - "ember-data": "~3.19.0", + "ember-data": "~3.28.0", "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.1", "ember-load-initializers": "^2.1.1", diff --git a/test-packages/custom-fastboot-app/package.json b/test-packages/custom-fastboot-app/package.json index 9c279d20..32c6f063 100644 --- a/test-packages/custom-fastboot-app/package.json +++ b/test-packages/custom-fastboot-app/package.json @@ -39,7 +39,7 @@ "ember-cli-inject-live-reload": "^2.0.2", "ember-cli-sri": "^2.1.1", "ember-cli-uglify": "^3.0.0", - "ember-data": "~3.19.0", + "ember-data": "~3.28.0", "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.1", "ember-load-initializers": "^2.1.1", diff --git a/test-packages/custom-sandbox-app/package.json b/test-packages/custom-sandbox-app/package.json index 7a6e86e4..e49ff2a4 100644 --- a/test-packages/custom-sandbox-app/package.json +++ b/test-packages/custom-sandbox-app/package.json @@ -34,7 +34,7 @@ "ember-cli-inject-live-reload": "^2.0.2", "ember-cli-sri": "^2.1.1", "ember-cli-uglify": "^3.0.0", - "ember-data": "~3.19.0", + "ember-data": "~3.28.0", "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.1", "ember-load-initializers": "^2.1.1", diff --git a/test-packages/ember-cli-fastboot-testing-app/package.json b/test-packages/ember-cli-fastboot-testing-app/package.json index 369b346c..d8325e98 100644 --- a/test-packages/ember-cli-fastboot-testing-app/package.json +++ b/test-packages/ember-cli-fastboot-testing-app/package.json @@ -35,7 +35,7 @@ "ember-cli-inject-live-reload": "^2.0.2", "ember-cli-sri": "^2.1.1", "ember-cli-uglify": "^3.0.0", - "ember-data": "~3.19.0", + "ember-data": "~3.28.0", "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.1", "ember-load-initializers": "^2.1.1", diff --git a/test-packages/hot-swap-app/package.json b/test-packages/hot-swap-app/package.json index f004f377..753c889f 100644 --- a/test-packages/hot-swap-app/package.json +++ b/test-packages/hot-swap-app/package.json @@ -35,7 +35,7 @@ "ember-cli-fastboot": "4.1.1", "ember-cli-sri": "^2.1.1", "ember-cli-uglify": "^3.0.0", - "ember-data": "~3.19.0", + "ember-data": "~3.28.0", "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.1", "ember-load-initializers": "^2.1.1", From 779c737a4fe816e49c1c95b37399a448fee8cca1 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Sat, 13 May 2023 09:12:05 -0400 Subject: [PATCH 08/23] bump ember-cli-app-version in test-packages --- pnpm-lock.yaml | 45 ++++++++----------- test-packages/basic-app/package.json | 2 +- .../custom-fastboot-app/package.json | 2 +- test-packages/custom-sandbox-app/package.json | 2 +- .../package.json | 2 +- test-packages/hot-swap-app/package.json | 2 +- 6 files changed, 23 insertions(+), 32 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index be722fed..f21fcc88 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -521,8 +521,8 @@ importers: specifier: ~4.1.0 version: 4.1.0 ember-cli-app-version: - specifier: ^3.2.0 - version: 3.2.0 + specifier: ^6.0.0 + version: 6.0.1(ember-source@3.28.12) ember-cli-babel: specifier: ^7.20.5 version: 7.26.6 @@ -641,8 +641,8 @@ importers: specifier: ~4.1.0 version: 4.1.0 ember-cli-app-version: - specifier: ^3.2.0 - version: 3.2.0 + specifier: ^6.0.0 + version: 6.0.1(ember-source@3.28.12) ember-cli-babel: specifier: ^7.20.5 version: 7.26.6 @@ -740,8 +740,8 @@ importers: specifier: ~4.1.0 version: 4.1.0 ember-cli-app-version: - specifier: ^3.2.0 - version: 3.2.0 + specifier: ^6.0.0 + version: 6.0.1(ember-source@3.28.12) ember-cli-babel: specifier: ^7.20.5 version: 7.26.6 @@ -827,8 +827,8 @@ importers: specifier: ~4.1.0 version: 4.1.0 ember-cli-app-version: - specifier: ^3.2.0 - version: 3.2.0 + specifier: ^6.0.0 + version: 6.0.1(ember-source@3.28.12) ember-cli-babel: specifier: ^7.20.5 version: 7.26.6 @@ -1036,8 +1036,8 @@ importers: specifier: ~4.1.0 version: 4.1.0 ember-cli-app-version: - specifier: ^3.2.0 - version: 3.2.0 + specifier: ^6.0.0 + version: 6.0.1(ember-source@3.28.12) ember-cli-babel: specifier: ^7.20.5 version: 7.26.6 @@ -8221,14 +8221,16 @@ packages: - supports-color dev: true - /ember-cli-app-version@3.2.0: - resolution: {integrity: sha512-fHWOJElSw8JL03FNCHrT0RdWhGpWEQ4VQ10unEwwhVZ+OANNcOLz8O2dA3D5iuB4bb0fMLwjEwYZGM62+TBs1Q==} - engines: {node: ^4.5 || 6.* || >= 7.*} + /ember-cli-app-version@6.0.1(ember-source@3.28.12): + resolution: {integrity: sha512-XA1FwkWA5QytmWF0jcJqEr3jcZoiCl9Fb33TZgOVfClL7Voxe+/RwzISEprBRQgbf7j8z1xf8/RJCKfclUy3rQ==} + engines: {node: 14.* || 16.* || >= 18} + peerDependencies: + ember-source: ^3.28.0 || >= 4.0.0 dependencies: - ember-cli-babel: 6.18.0(@babel/core@7.21.8) - git-repo-version: 1.0.2 + ember-cli-babel: 7.26.11 + ember-source: 3.28.12 + git-repo-info: 2.1.1 transitivePeerDependencies: - - '@babel/core' - supports-color dev: true @@ -11237,22 +11239,11 @@ packages: resolution: {integrity: sha512-Y7wLWcrLUXwk2noSka166byGCvhMtDRpgHdzCno1UQv/n/Hegp++a2xBWJL1lJarnKD3SWaljD+0z1ztqxuKyQ==} dev: true - /git-repo-info@1.4.1: - resolution: {integrity: sha512-oqzBH6cNvE8Cq3p61ps4m0POZrVMKlARntc2BxLnuqTK+HeWpKfUMJQ7H1CvescHRINj+0a7TKA+Pp/bOq5F1Q==} - dev: true - /git-repo-info@2.1.1: resolution: {integrity: sha512-8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg==} engines: {node: '>= 4.0'} dev: true - /git-repo-version@1.0.2: - resolution: {integrity: sha512-OPtwtHx9E8/rTMcWT+BU6GNj6Kq/O40bHJZaZAGy+pN2RXGmeKcfr0ix4M+SQuFY8vl5L/wfPSGOAtvUT/e3Qg==} - engines: {node: ^ 4.5 || 6.* || >= 7.*} - dependencies: - git-repo-info: 1.4.1 - dev: true - /git-up@4.0.5: resolution: {integrity: sha512-YUvVDg/vX3d0syBsk/CKUTib0srcQME0JyHkL5BaYdwLsiCslPWmDSi8PUMo9pXYjrryMcmsCoCgsTpSCJEQaA==} dependencies: diff --git a/test-packages/basic-app/package.json b/test-packages/basic-app/package.json index ffe030f8..912f6112 100644 --- a/test-packages/basic-app/package.json +++ b/test-packages/basic-app/package.json @@ -34,7 +34,7 @@ "chai-string": "^1.5.0", "ember-auto-import": "^1.5.3", "ember-cli": "~4.1.0", - "ember-cli-app-version": "^3.2.0", + "ember-cli-app-version": "^6.0.0", "ember-cli-babel": "^7.20.5", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-fastboot": "4.1.1", diff --git a/test-packages/custom-fastboot-app/package.json b/test-packages/custom-fastboot-app/package.json index 32c6f063..304281da 100644 --- a/test-packages/custom-fastboot-app/package.json +++ b/test-packages/custom-fastboot-app/package.json @@ -31,7 +31,7 @@ "chai-string": "^1.5.0", "ember-auto-import": "^1.5.3", "ember-cli": "~4.1.0", - "ember-cli-app-version": "^3.2.0", + "ember-cli-app-version": "^6.0.0", "ember-cli-babel": "^7.20.5", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-fastboot": "4.1.1", diff --git a/test-packages/custom-sandbox-app/package.json b/test-packages/custom-sandbox-app/package.json index e49ff2a4..f7cc9b2b 100644 --- a/test-packages/custom-sandbox-app/package.json +++ b/test-packages/custom-sandbox-app/package.json @@ -26,7 +26,7 @@ "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^1.5.3", "ember-cli": "~4.1.0", - "ember-cli-app-version": "^3.2.0", + "ember-cli-app-version": "^6.0.0", "ember-cli-babel": "^7.20.5", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-htmlbars": "^5.1.2", diff --git a/test-packages/ember-cli-fastboot-testing-app/package.json b/test-packages/ember-cli-fastboot-testing-app/package.json index d8325e98..991d9b25 100644 --- a/test-packages/ember-cli-fastboot-testing-app/package.json +++ b/test-packages/ember-cli-fastboot-testing-app/package.json @@ -26,7 +26,7 @@ "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^1.5.3", "ember-cli": "~4.1.0", - "ember-cli-app-version": "^3.2.0", + "ember-cli-app-version": "^6.0.0", "ember-cli-babel": "^7.20.5", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-fastboot": "4.1.1", diff --git a/test-packages/hot-swap-app/package.json b/test-packages/hot-swap-app/package.json index 753c889f..4b7d5f72 100644 --- a/test-packages/hot-swap-app/package.json +++ b/test-packages/hot-swap-app/package.json @@ -27,7 +27,7 @@ "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^1.5.3", "ember-cli": "~4.1.0", - "ember-cli-app-version": "^3.2.0", + "ember-cli-app-version": "^6.0.0", "ember-cli-babel": "^7.20.5", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-htmlbars": "^5.1.2", From d818bd0b2f83c7f0fe4d1eeb040b0fece54138c8 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Sat, 13 May 2023 09:42:35 -0400 Subject: [PATCH 09/23] bump more outdated dependencies --- packages/ember-cli-fastboot/package.json | 4 +- pnpm-lock.yaml | 279 ++++-------------- test-packages/basic-app/package.json | 4 +- .../custom-fastboot-app/package.json | 4 +- test-packages/custom-sandbox-app/package.json | 4 +- .../package.json | 4 +- test-packages/example-addon/package.json | 4 +- test-packages/hot-swap-app/package.json | 4 +- 8 files changed, 72 insertions(+), 235 deletions(-) diff --git a/packages/ember-cli-fastboot/package.json b/packages/ember-cli-fastboot/package.json index b4cf01fc..c8a61f78 100644 --- a/packages/ember-cli-fastboot/package.json +++ b/packages/ember-cli-fastboot/package.json @@ -73,11 +73,11 @@ "ember-disable-prototype-extensions": "^1.1.3", "ember-export-application-global": "^2.0.1", "ember-load-initializers": "^2.1.2", - "ember-maybe-import-regenerator-for-testing": "^1.0.0", + "ember-maybe-import-regenerator": "^1.0.0", "ember-page-title": "^7.0.0", "ember-qunit": "^5.1.5", "ember-resolver": "^8.0.3", - "ember-sinon": "^2.2.0", + "ember-sinon": "^5.0.0", "ember-source": "~3.28.11", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^3.15.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f21fcc88..324de43f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -150,7 +150,7 @@ importers: ember-load-initializers: specifier: ^2.1.2 version: 2.1.2 - ember-maybe-import-regenerator-for-testing: + ember-maybe-import-regenerator: specifier: ^1.0.0 version: 1.0.0 ember-page-title: @@ -163,8 +163,8 @@ importers: specifier: ^8.0.3 version: 8.1.0 ember-sinon: - specifier: ^2.2.0 - version: 2.2.0 + specifier: ^5.0.0 + version: 5.0.0 ember-source: specifier: ~3.28.11 version: 3.28.12 @@ -560,11 +560,11 @@ importers: specifier: ^2.1.1 version: 2.1.2 ember-maybe-import-regenerator: - specifier: ^0.1.6 - version: 0.1.6 + specifier: ^1.0.0 + version: 1.0.0 ember-qunit: - specifier: ^4.6.0 - version: 4.6.0 + specifier: ^5.1.5 + version: 5.1.5(@ember/test-helpers@2.9.4)(qunit@2.20.0) ember-resolver: specifier: ^8.0.0 version: 8.0.2 @@ -677,11 +677,11 @@ importers: specifier: ^2.1.1 version: 2.1.2 ember-maybe-import-regenerator: - specifier: ^0.1.6 - version: 0.1.6 + specifier: ^1.0.0 + version: 1.0.0 ember-qunit: - specifier: ^4.6.0 - version: 4.6.0 + specifier: ^5.1.5 + version: 5.1.5(@ember/test-helpers@2.9.4)(qunit@2.20.0) ember-resolver: specifier: ^8.0.0 version: 8.0.2 @@ -776,11 +776,11 @@ importers: specifier: ^2.1.1 version: 2.1.2 ember-maybe-import-regenerator: - specifier: ^0.1.6 - version: 0.1.6 + specifier: ^1.0.0 + version: 1.0.0 ember-qunit: - specifier: ^4.6.0 - version: 4.6.0 + specifier: ^5.1.5 + version: 5.1.5(@ember/test-helpers@2.9.4)(qunit@2.20.0) ember-resolver: specifier: ^8.0.0 version: 8.0.2 @@ -866,11 +866,11 @@ importers: specifier: ^2.1.1 version: 2.1.2 ember-maybe-import-regenerator: - specifier: ^0.1.6 - version: 0.1.6 + specifier: ^1.0.0 + version: 1.0.0 ember-qunit: - specifier: ^4.6.0 - version: 4.6.0 + specifier: ^5.1.5 + version: 5.1.5(@ember/test-helpers@2.9.4)(qunit@2.20.0) ember-resolver: specifier: ^8.0.0 version: 8.0.2 @@ -953,11 +953,11 @@ importers: specifier: ^2.1.1 version: 2.1.2 ember-maybe-import-regenerator: - specifier: ^0.1.6 - version: 0.1.6 + specifier: ^1.0.0 + version: 1.0.0 ember-qunit: - specifier: ^4.6.0 - version: 4.6.0 + specifier: ^5.1.5 + version: 5.1.5(@ember/test-helpers@2.9.4)(qunit@2.20.0) ember-resolver: specifier: ^8.0.0 version: 8.0.2 @@ -1072,11 +1072,11 @@ importers: specifier: ^2.1.1 version: 2.1.2 ember-maybe-import-regenerator: - specifier: ^0.1.6 - version: 0.1.6 + specifier: ^1.0.0 + version: 1.0.0 ember-qunit: - specifier: ^4.6.0 - version: 4.6.0 + specifier: ^5.1.5 + version: 5.1.5(@ember/test-helpers@2.9.4)(qunit@2.20.0) ember-resolver: specifier: ^8.0.0 version: 8.0.2 @@ -2759,20 +2759,6 @@ packages: - supports-color dev: true - /@ember/test-helpers@1.7.3: - resolution: {integrity: sha512-0NwxM9rtl/vD/Zqv8cHefLxojL3l2xuRs6pEppff/Fe39ybXz5H7hm5ZvnpRO/lpSsIeX7tivht9ko6/V+sShw==} - engines: {node: 6.* || 8.* || >= 10.*} - dependencies: - broccoli-debug: 0.6.5 - broccoli-funnel: 2.0.2 - ember-assign-polyfill: 2.7.3 - ember-cli-babel: 7.26.11 - ember-cli-htmlbars-inline-precompile: 2.1.0(ember-cli-babel@7.26.11) - ember-test-waiters: 1.2.0 - transitivePeerDependencies: - - supports-color - dev: true - /@ember/test-helpers@2.9.4(ember-source@3.28.12): resolution: {integrity: sha512-z+Qs1NYWyIVDmrY6WdmOS5mdG1lJ5CFfzh6dRhLfs9lq45deDaDrVNcaCYhnNeJZTvUBK2XR2SvPcZm0RloXdA==} engines: {node: 10.* || 12.* || 14.* || 15.* || >= 16.*} @@ -3429,23 +3415,18 @@ packages: type-detect: 4.0.8 dev: true - /@sinonjs/formatio@3.2.2: - resolution: {integrity: sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==} + /@sinonjs/fake-timers@6.0.1: + resolution: {integrity: sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==} dependencies: '@sinonjs/commons': 1.8.6 - '@sinonjs/samsam': 3.3.3 dev: true - /@sinonjs/samsam@2.1.3: - resolution: {integrity: sha512-8zNeBkSKhU9a5cRNbpCKau2WWPfan+Q2zDlcXvXyhn9EsMqgYs4qzo0XHNVlXC6ABQL8fT6nV+zzo5RTHJzyXw==} - dev: true - - /@sinonjs/samsam@3.3.3: - resolution: {integrity: sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==} + /@sinonjs/samsam@5.3.1: + resolution: {integrity: sha512-1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg==} dependencies: '@sinonjs/commons': 1.8.6 - array-from: 2.1.1 - lodash: 4.17.21 + lodash.get: 4.4.2 + type-detect: 4.0.8 dev: true /@sinonjs/text-encoding@0.7.2: @@ -4451,10 +4432,6 @@ packages: /array-flatten@1.1.1: resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==} - /array-from@2.1.1: - resolution: {integrity: sha512-GQTc6Uupx1FCavi5mPzBvVT7nEOeWMmUA9P95wpfpW1XwMSKs+KaymD5C2Up7KAUKg/mYwbsUYzdZWcoajlNZg==} - dev: true - /array-to-error@1.1.1: resolution: {integrity: sha512-kqcQ8s7uQfg3UViYON3kCMcck3A9exxgq+riVuKy08Mx00VN4EJhK30L2VpjE58LQHKhcE/GRpvbVUhqTvqzGQ==} dependencies: @@ -4971,11 +4948,6 @@ packages: lodash: 4.17.21 dev: true - /babel-plugin-htmlbars-inline-precompile@1.0.0: - resolution: {integrity: sha512-4jvKEHR1bAX03hBDZ94IXsYCj3bwk9vYsn6ux6JZNL2U5pvzCWjqyrGahfsGNrhERyxw8IqcirOi9Q6WCo3dkQ==} - engines: {node: '>= 4'} - dev: true - /babel-plugin-htmlbars-inline-precompile@3.2.0: resolution: {integrity: sha512-IUeZmgs9tMUGXYu1vfke5I18yYJFldFGdNFQOWslXTnDWXzpwPih7QFduUqvT+awDpDuNtXpdt5JAf43Q1Hhzg==} engines: {node: 8.* || 10.* || >= 12.*} @@ -5851,27 +5823,6 @@ packages: resolution: {integrity: sha512-SaOCEdh+wnt2jFUV2Qb32m7LXyElvFwW3NKNaEJyi5PGQNwxfqpkc0KI6AbQANKgdj/40U2UC0WuGThFwuEUaA==} dev: true - /broccoli-funnel@1.2.0: - resolution: {integrity: sha512-0pbFNUA5Ml+gPPd58Rj/M26OS21+bMiV0F+m6+9OVzAhAdppVLxylSsXfWAt2WOD3kS+D8UsDv6GSmnZhbw/dw==} - dependencies: - array-equal: 1.0.0 - blank-object: 1.0.2 - broccoli-plugin: 1.3.1 - debug: 2.6.9 - exists-sync: 0.0.4 - fast-ordered-set: 1.0.3 - fs-tree-diff: 0.5.9 - heimdalljs: 0.2.6 - minimatch: 3.1.2 - mkdirp: 0.5.6 - path-posix: 1.0.0 - rimraf: 2.7.1 - symlink-or-copy: 1.3.1 - walk-sync: 0.3.4 - transitivePeerDependencies: - - supports-color - dev: true - /broccoli-funnel@2.0.2: resolution: {integrity: sha512-/vDTqtv7ipjEZQOVqO4vGDVAOZyuYzQ/EgGoyewfOgh1M7IQAToBKZI0oAQPgMBeFPPlIbfMuAngk+ohPBuaHQ==} engines: {node: ^4.5 || 6.* || >= 7.*} @@ -5919,21 +5870,6 @@ packages: glob: 5.0.15 mkdirp: 0.5.6 - /broccoli-merge-trees@1.2.4: - resolution: {integrity: sha512-RXJAleytlED0dxXGEo2EXwrg5cCesY8LQzzGRogwGQmluoz+ijzxajpyWAW6wu/AyuQZj1vgnIqnld8jvuuXtQ==} - dependencies: - broccoli-plugin: 1.3.1 - can-symlink: 1.0.0 - fast-ordered-set: 1.0.3 - fs-tree-diff: 0.5.9 - heimdalljs: 0.2.6 - heimdalljs-logger: 0.1.10 - rimraf: 2.7.1 - symlink-or-copy: 1.3.1 - transitivePeerDependencies: - - supports-color - dev: true - /broccoli-merge-trees@2.0.1: resolution: {integrity: sha512-WjaexJ+I8BxP5V5RNn6um/qDRSmKoiBC/QkRi79FT9ClHfldxRyCDs9mcV7mmoaPlsshmmPaUz5jdtcKA6DClQ==} dependencies: @@ -7931,8 +7867,8 @@ packages: engines: {node: '>=8'} dev: true - /diff@3.5.0: - resolution: {integrity: sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==} + /diff@4.0.2: + resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==} engines: {node: '>=0.3.1'} dev: true @@ -8048,16 +7984,6 @@ packages: minimalistic-crypto-utils: 1.0.1 dev: true - /ember-assign-polyfill@2.7.3: - resolution: {integrity: sha512-PINAtHOQf5DKniyecOBZSz8VZVmtIKFvp67853+aw+TL+LWUCji5OjQ13PrAV/GIl3Fp2sZ7IbEPyTobDL7Y8Q==} - engines: {node: 6.* || 8.* || 10.* || >= 12} - dependencies: - ember-cli-babel: 7.26.11 - ember-cli-version-checker: 2.2.0 - transitivePeerDependencies: - - supports-color - dev: true - /ember-auto-import@1.12.2: resolution: {integrity: sha512-gLqML2k77AuUiXxWNon1FSzuG1DV7PEPpCLCU5aJvf6fdL6rmFfElsZRh+8ELEB/qP9dT+LHjNEunVzd2dYc8A==} engines: {node: '>= 10.*'} @@ -8381,23 +8307,6 @@ packages: - supports-color dev: true - /ember-cli-htmlbars-inline-precompile@2.1.0(ember-cli-babel@7.26.11): - resolution: {integrity: sha512-BylIHduwQkncPhnj0ZyorBuljXbTzLgRo6kuHf1W+IHFxThFl2xG+r87BVwsqx4Mn9MTgW9SE0XWjwBJcSWd6Q==} - engines: {node: 6.* || 8.* || >= 10.*} - deprecated: Use ember-cli-htmlbars instead. - peerDependencies: - ember-cli-babel: ^6.7.1 || ^7.0.0 - dependencies: - babel-plugin-htmlbars-inline-precompile: 1.0.0 - ember-cli-babel: 7.26.11 - ember-cli-version-checker: 2.2.0 - hash-for-dep: 1.5.1 - heimdalljs-logger: 0.1.10 - silent-error: 1.1.1 - transitivePeerDependencies: - - supports-color - dev: true - /ember-cli-htmlbars@3.1.0: resolution: {integrity: sha512-cgvRJM73IT0aePUG7oQ/afB7vSRBV3N0wu9BrWhHX2zkR7A7cUBI7KC9VPk6tbctCXoM7BRGsCC4aIjF7yrfXA==} engines: {node: 6.* || 8.* || >= 10.*} @@ -8575,16 +8484,6 @@ packages: ember-cli-string-utils: 1.1.0 dev: true - /ember-cli-test-loader@2.2.0: - resolution: {integrity: sha512-mlSXX9SciIRwGkFTX6XGyJYp4ry6oCFZRxh5jJ7VH8UXLTNx2ZACtDTwaWtNhYrWXgKyiDUvmD8enD56aePWRA==} - engines: {node: '>= 4.0'} - dependencies: - ember-cli-babel: 6.18.0(@babel/core@7.21.8) - transitivePeerDependencies: - - '@babel/core' - - supports-color - dev: true - /ember-cli-test-loader@3.0.0: resolution: {integrity: sha512-wfFRBrfO9gaKScYcdQxTfklx9yp1lWK6zv1rZRpkas9z2SHyJojF7NOQRWQgSB3ypm7vfpiF8VsFFVVr7VBzAQ==} engines: {node: 10.* || >= 12} @@ -9149,28 +9048,15 @@ packages: - supports-color dev: true - /ember-maybe-import-regenerator-for-testing@1.0.0: - resolution: {integrity: sha512-9ZOjrXZ6iO8WnVuk5kLqUZIFEEOx2O/EA08vcedaT/XSna6LzH2knLx5OiOD9f7XiO8jNaYuZoh0Uq3wnm8/oA==} - engines: {node: ^4.5 || 6.* || >= 7.*} - dependencies: - broccoli-funnel: 1.2.0 - ember-cli-babel: 6.18.0(@babel/core@7.21.8) - regenerator-runtime: 0.9.6 - transitivePeerDependencies: - - '@babel/core' - - supports-color - dev: true - - /ember-maybe-import-regenerator@0.1.6: - resolution: {integrity: sha512-aX9UINiUXIjzsCNNna1ioASB/2lbnFgSHI63bBcd4MOVE9AqoLdOL7h+ocyylYXyYoBj2JDRwCzjWNf2Xbp5wg==} - engines: {node: '>= 0.10.0'} + /ember-maybe-import-regenerator@1.0.0: + resolution: {integrity: sha512-wtjgjEV0Hk4fgiAwFjOfPrGWfmFrbRW3zgNZO4oA3H5FlbMssMvWuR8blQ3QSWYHODVK9r+ThsRAs8lG4kbxqA==} + engines: {node: '>= 12.*'} dependencies: - broccoli-funnel: 1.2.0 - broccoli-merge-trees: 1.2.4 - ember-cli-babel: 6.18.0(@babel/core@7.21.8) - regenerator-runtime: 0.9.6 + broccoli-funnel: 2.0.2 + broccoli-merge-trees: 3.0.2 + ember-cli-babel: 7.26.11 + regenerator-runtime: 0.13.11 transitivePeerDependencies: - - '@babel/core' - supports-color dev: true @@ -9183,22 +9069,6 @@ packages: - supports-color dev: true - /ember-qunit@4.6.0: - resolution: {integrity: sha512-i5VOGn0RP8XH+5qkYDOZshbqAvO6lHgF65D0gz8vRx4DszCIvJMJO+bbftBTfYMxp6rqG85etAA6pfNxE0DqsQ==} - engines: {node: 6.* || 8.* || >= 10.*} - dependencies: - '@ember/test-helpers': 1.7.3 - broccoli-funnel: 2.0.2 - broccoli-merge-trees: 3.0.2 - common-tags: 1.8.2 - ember-cli-babel: 7.26.11 - ember-cli-test-loader: 2.2.0 - qunit: 2.20.0 - transitivePeerDependencies: - - '@babel/core' - - supports-color - dev: true - /ember-qunit@5.1.5(@ember/test-helpers@2.9.4)(qunit@2.20.0): resolution: {integrity: sha512-2cFA4oMygh43RtVcMaBrr086Tpdhgbn3fVZ2awLkzF/rnSN0D0PSRpd7hAD7OdBPerC/ZYRwzVyGXLoW/Zes4A==} engines: {node: 10.* || 12.* || >= 14.*} @@ -9267,16 +9137,15 @@ packages: - supports-color dev: true - /ember-sinon@2.2.0: - resolution: {integrity: sha512-BgjHsgy8rli8FaJ1MWkscIKRpoFmzYhNkDtwBWQrUCzQx1bp3+irVpseAPqBnuEB4FPFGGQV5ahDpFcckmIsAw==} - engines: {node: 6.* || 8.* || >= 10.*} + /ember-sinon@5.0.0: + resolution: {integrity: sha512-dTP2vhao1xWm3OlfpOALooso/OLM71SFg7PIBmZ6JdwKCC+CzcPb4BYRAXuoAFYzmhH8z28p8HdemjZBb0B3Bw==} + engines: {node: 10.* || >= 12} dependencies: broccoli-funnel: 2.0.2 broccoli-merge-trees: 3.0.2 - ember-cli-babel: 6.18.0(@babel/core@7.21.8) - sinon: 6.3.5 + ember-cli-babel: 7.26.11 + sinon: 9.2.4 transitivePeerDependencies: - - '@babel/core' - supports-color dev: true @@ -9415,16 +9284,6 @@ packages: - supports-color dev: true - /ember-test-waiters@1.2.0: - resolution: {integrity: sha512-aEw7YuutLuJT4NUuPTNiGFwgTYl23ThqmBxSkfFimQAn+keWjAftykk3dlFELuhsJhYW/S8YoVjN0bSAQRLNtw==} - engines: {node: 6.* || 8.* || >= 10.*} - dependencies: - ember-cli-babel: 7.26.11 - semver: 6.3.0 - transitivePeerDependencies: - - supports-color - dev: true - /ember-try-config@4.0.0: resolution: {integrity: sha512-jAv7fqYJK7QYYekPc/8Nr7KOqDpv/asqM6F8xcRnbmf9UrD35BkSffY63qUuiD9e0aR5qiMNBIQzH8f65rGDqw==} engines: {node: 10.* || 12.* || >= 14} @@ -10292,11 +10151,6 @@ packages: strip-final-newline: 2.0.0 dev: true - /exists-sync@0.0.4: - resolution: {integrity: sha512-cy5z7K+05RFxHAWY37dSDkPWmuTi+VzrA/xLwPDHmwQPMnO/kVhu6jheGaItlnNRoOE6f5MAjxy3VEupfrHigQ==} - deprecated: Please replace with usage of fs.existsSync - dev: true - /exit@0.1.2: resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==} engines: {node: '>= 0.8.0'} @@ -13313,16 +13167,6 @@ packages: is-unicode-supported: 0.1.0 dev: true - /lolex@2.7.5: - resolution: {integrity: sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q==} - dev: true - - /lolex@5.1.2: - resolution: {integrity: sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==} - dependencies: - '@sinonjs/commons': 1.8.6 - dev: true - /loose-envify@1.4.0: resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==} hasBin: true @@ -14237,13 +14081,13 @@ packages: resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} dev: true - /nise@1.5.3: - resolution: {integrity: sha512-Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ==} + /nise@4.1.0: + resolution: {integrity: sha512-eQMEmGN/8arp0xsvGoQ+B1qvSkR73B1nWSCh7nOt5neMCtwcQVYQGdzQMhcNscktTsWB54xnlSQFzOAPJD8nXA==} dependencies: - '@sinonjs/formatio': 3.2.2 + '@sinonjs/commons': 1.8.6 + '@sinonjs/fake-timers': 6.0.1 '@sinonjs/text-encoding': 0.7.2 just-extend: 4.2.1 - lolex: 5.1.2 path-to-regexp: 1.8.0 dev: true @@ -15621,10 +15465,6 @@ packages: /regenerator-runtime@0.13.11: resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==} - /regenerator-runtime@0.9.6: - resolution: {integrity: sha512-D0Y/JJ4VhusyMOd/o25a3jdUqN/bC85EFsaoL9Oqmy/O4efCh+xhp7yj2EEOsj974qvMkcW8AwUzJ1jB/MbxCw==} - dev: true - /regenerator-transform@0.10.1: resolution: {integrity: sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==} dependencies: @@ -16470,18 +16310,15 @@ packages: resolution: {integrity: sha512-C2WEK/Z3HoSFbYq8tI7ni3eOo/NneSPRoPpcM7WdLjFOArFuyXEjAoCdOC3DgMfRyziZQ1hCNR4mrNdWEvD0og==} dev: true - /sinon@6.3.5: - resolution: {integrity: sha512-xgoZ2gKjyVRcF08RrIQc+srnSyY1JDJtxu3Nsz07j1ffjgXoY6uPLf/qja6nDBZgzYYEovVkFryw2+KiZz11xQ==} + /sinon@9.2.4: + resolution: {integrity: sha512-zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg==} dependencies: '@sinonjs/commons': 1.8.6 - '@sinonjs/formatio': 3.2.2 - '@sinonjs/samsam': 2.1.3 - diff: 3.5.0 - lodash.get: 4.4.2 - lolex: 2.7.5 - nise: 1.5.3 - supports-color: 5.5.0 - type-detect: 4.0.8 + '@sinonjs/fake-timers': 6.0.1 + '@sinonjs/samsam': 5.3.1 + diff: 4.0.2 + nise: 4.1.0 + supports-color: 7.2.0 dev: true /slash@1.0.0: diff --git a/test-packages/basic-app/package.json b/test-packages/basic-app/package.json index 912f6112..88a21b44 100644 --- a/test-packages/basic-app/package.json +++ b/test-packages/basic-app/package.json @@ -47,8 +47,8 @@ "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.1", "ember-load-initializers": "^2.1.1", - "ember-maybe-import-regenerator": "^0.1.6", - "ember-qunit": "^4.6.0", + "ember-maybe-import-regenerator": "^1.0.0", + "ember-qunit": "^5.1.5", "ember-resolver": "^8.0.0", "ember-source": "~3.28.11", "ember-template-lint": "^2.8.0", diff --git a/test-packages/custom-fastboot-app/package.json b/test-packages/custom-fastboot-app/package.json index 304281da..941eb9d8 100644 --- a/test-packages/custom-fastboot-app/package.json +++ b/test-packages/custom-fastboot-app/package.json @@ -43,8 +43,8 @@ "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.1", "ember-load-initializers": "^2.1.1", - "ember-maybe-import-regenerator": "^0.1.6", - "ember-qunit": "^4.6.0", + "ember-maybe-import-regenerator": "^1.0.0", + "ember-qunit": "^5.1.5", "ember-resolver": "^8.0.0", "ember-source": "~3.28.11", "ember-template-lint": "^2.8.0", diff --git a/test-packages/custom-sandbox-app/package.json b/test-packages/custom-sandbox-app/package.json index f7cc9b2b..0d50dde3 100644 --- a/test-packages/custom-sandbox-app/package.json +++ b/test-packages/custom-sandbox-app/package.json @@ -38,8 +38,8 @@ "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.1", "ember-load-initializers": "^2.1.1", - "ember-maybe-import-regenerator": "^0.1.6", - "ember-qunit": "^4.6.0", + "ember-maybe-import-regenerator": "^1.0.0", + "ember-qunit": "^5.1.5", "ember-resolver": "^8.0.0", "ember-source": "~3.28.11", "ember-template-lint": "^2.8.0", diff --git a/test-packages/ember-cli-fastboot-testing-app/package.json b/test-packages/ember-cli-fastboot-testing-app/package.json index 991d9b25..21f4ed80 100644 --- a/test-packages/ember-cli-fastboot-testing-app/package.json +++ b/test-packages/ember-cli-fastboot-testing-app/package.json @@ -39,8 +39,8 @@ "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.1", "ember-load-initializers": "^2.1.1", - "ember-maybe-import-regenerator": "^0.1.6", - "ember-qunit": "^4.6.0", + "ember-maybe-import-regenerator": "^1.0.0", + "ember-qunit": "^5.1.5", "ember-resolver": "^8.0.0", "ember-source": "~3.28.11", "ember-template-lint": "^2.8.0", diff --git a/test-packages/example-addon/package.json b/test-packages/example-addon/package.json index fb14858c..15fe2000 100644 --- a/test-packages/example-addon/package.json +++ b/test-packages/example-addon/package.json @@ -42,8 +42,8 @@ "ember-disable-prototype-extensions": "^1.1.3", "ember-export-application-global": "^2.0.1", "ember-load-initializers": "^2.1.1", - "ember-maybe-import-regenerator": "^0.1.6", - "ember-qunit": "^4.6.0", + "ember-maybe-import-regenerator": "^1.0.0", + "ember-qunit": "^5.1.5", "ember-resolver": "^8.0.0", "ember-source": "~3.28.11", "ember-source-channel-url": "^2.0.1", diff --git a/test-packages/hot-swap-app/package.json b/test-packages/hot-swap-app/package.json index 4b7d5f72..603b4d52 100644 --- a/test-packages/hot-swap-app/package.json +++ b/test-packages/hot-swap-app/package.json @@ -39,8 +39,8 @@ "ember-export-application-global": "^2.0.1", "ember-fetch": "^8.0.1", "ember-load-initializers": "^2.1.1", - "ember-maybe-import-regenerator": "^0.1.6", - "ember-qunit": "^4.6.0", + "ember-maybe-import-regenerator": "^1.0.0", + "ember-qunit": "^5.1.5", "ember-resolver": "^8.0.0", "ember-source": "~3.28.11", "ember-template-lint": "^2.8.0", From 79fde112220787d6bdead80b9b1d35d8898ada7d Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Sat, 13 May 2023 10:13:42 -0400 Subject: [PATCH 10/23] explicitly add @ember/test-helpers to devDependencies in test-packages explicitly add @ember/test-helpers to devDependencies in test-packages --- pnpm-lock.yaml | 12 ++++++++++++ test-packages/basic-app/package.json | 1 + test-packages/custom-fastboot-app/package.json | 1 + test-packages/custom-sandbox-app/package.json | 1 + .../ember-cli-fastboot-testing-app/package.json | 1 + 5 files changed, 16 insertions(+) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 324de43f..157c1b11 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -493,6 +493,9 @@ importers: '@ember/optional-features': specifier: ^1.3.0 version: 1.3.0 + '@ember/test-helpers': + specifier: ^2.9.2 + version: 2.9.4(ember-source@3.28.12) '@glimmer/component': specifier: ^1.1.2 version: 1.1.2 @@ -613,6 +616,9 @@ importers: '@ember/optional-features': specifier: ^1.3.0 version: 1.3.0 + '@ember/test-helpers': + specifier: ^2.9.2 + version: 2.9.4(ember-source@3.28.12) '@glimmer/component': specifier: ^1.1.2 version: 1.1.2 @@ -721,6 +727,9 @@ importers: '@ember/optional-features': specifier: ^1.3.0 version: 1.3.0 + '@ember/test-helpers': + specifier: ^2.9.2 + version: 2.9.4(ember-source@3.28.12) '@glimmer/component': specifier: ^1.1.2 version: 1.1.2 @@ -814,6 +823,9 @@ importers: '@ember/optional-features': specifier: ^1.3.0 version: 1.3.0 + '@ember/test-helpers': + specifier: ^2.9.2 + version: 2.9.4(ember-source@3.28.12) babel-eslint: specifier: ^10.1.0 version: 10.1.0(eslint@7.23.0) diff --git a/test-packages/basic-app/package.json b/test-packages/basic-app/package.json index 88a21b44..c379d658 100644 --- a/test-packages/basic-app/package.json +++ b/test-packages/basic-app/package.json @@ -25,6 +25,7 @@ }, "devDependencies": { "@ember/optional-features": "^1.3.0", + "@ember/test-helpers": "^2.9.2", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.0.0", "babel-eslint": "^10.1.0", diff --git a/test-packages/custom-fastboot-app/package.json b/test-packages/custom-fastboot-app/package.json index 941eb9d8..2757062c 100644 --- a/test-packages/custom-fastboot-app/package.json +++ b/test-packages/custom-fastboot-app/package.json @@ -22,6 +22,7 @@ }, "devDependencies": { "@ember/optional-features": "^1.3.0", + "@ember/test-helpers": "^2.9.2", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.0.0", "babel-eslint": "^10.1.0", diff --git a/test-packages/custom-sandbox-app/package.json b/test-packages/custom-sandbox-app/package.json index 0d50dde3..b5b946e5 100644 --- a/test-packages/custom-sandbox-app/package.json +++ b/test-packages/custom-sandbox-app/package.json @@ -20,6 +20,7 @@ }, "devDependencies": { "@ember/optional-features": "^1.3.0", + "@ember/test-helpers": "^2.9.2", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.0.0", "babel-eslint": "^10.1.0", diff --git a/test-packages/ember-cli-fastboot-testing-app/package.json b/test-packages/ember-cli-fastboot-testing-app/package.json index 21f4ed80..ba2c70a3 100644 --- a/test-packages/ember-cli-fastboot-testing-app/package.json +++ b/test-packages/ember-cli-fastboot-testing-app/package.json @@ -22,6 +22,7 @@ }, "devDependencies": { "@ember/optional-features": "^1.3.0", + "@ember/test-helpers": "^2.9.2", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^1.5.3", From 56cb15e358c426c4f3370144ff1e9ac601c38346 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Sat, 13 May 2023 07:53:09 -0400 Subject: [PATCH 11/23] fix fastboot-shoebox-test --- packages/fastboot/src/fastboot-info.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/fastboot/src/fastboot-info.js b/packages/fastboot/src/fastboot-info.js index f3305963..a420731f 100644 --- a/packages/fastboot/src/fastboot-info.js +++ b/packages/fastboot/src/fastboot-info.js @@ -38,5 +38,9 @@ module.exports = class FastBootInfo { */ register(instance) { instance.register('info:-fastboot', this, { instantiate: false }); + const fastbootService = instance.lookup('service:fastboot'); + if (fastbootService) { + fastbootService._fastbootInfo = this; + } } }; From 8a982f293f57aa5916b37224f8225891b730a2dc Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Sat, 13 May 2023 10:00:21 -0400 Subject: [PATCH 12/23] fix sinon error --- .../tests/unit/services/fastboot/shoebox-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ember-cli-fastboot/tests/unit/services/fastboot/shoebox-test.js b/packages/ember-cli-fastboot/tests/unit/services/fastboot/shoebox-test.js index 5ba69884..b9f86f18 100644 --- a/packages/ember-cli-fastboot/tests/unit/services/fastboot/shoebox-test.js +++ b/packages/ember-cli-fastboot/tests/unit/services/fastboot/shoebox-test.js @@ -9,7 +9,7 @@ module('Unit | Service | fastboot | shoebox', function(hooks) { setupTest(hooks); hooks.beforeEach(function() { - sandbox = sinon.sandbox.create(); + sandbox = sinon.createSandbox(); }); hooks.afterEach(function() { @@ -90,4 +90,4 @@ module('Unit | Service | fastboot | shoebox', function(hooks) { assert.strictEqual(service.get('shoebox').retrieve('foo'), 'bar'); }); -}); \ No newline at end of file +}); From 8a795810aa1931fd770e4a5468077f9e4b6e11e9 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Tue, 17 Oct 2023 07:31:35 -0400 Subject: [PATCH 13/23] fix fastboot-express-middleware script --- packages/fastboot-express-middleware/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fastboot-express-middleware/package.json b/packages/fastboot-express-middleware/package.json index a89935aa..8a78aad3 100644 --- a/packages/fastboot-express-middleware/package.json +++ b/packages/fastboot-express-middleware/package.json @@ -20,8 +20,8 @@ "author": "Tom Dale ", "main": "src/index.js", "scripts": { - "lint": "eslint --cache .", - "test": "yarn lint:js && mocha" + "lint:js": "eslint --cache .", + "test": "pnpm lint:js && mocha" }, "dependencies": { "chalk": "^4.1.2", From 22e4b5b3a0b1e65d5dc0da796e4fafdb53558b3c Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Tue, 17 Oct 2023 07:41:20 -0400 Subject: [PATCH 14/23] fix end of line eslint error on Windows --- packages/fastboot-express-middleware/.eslintrc.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/fastboot-express-middleware/.eslintrc.js b/packages/fastboot-express-middleware/.eslintrc.js index 0176f70b..20285a8f 100644 --- a/packages/fastboot-express-middleware/.eslintrc.js +++ b/packages/fastboot-express-middleware/.eslintrc.js @@ -9,6 +9,14 @@ module.exports = { node: true, es6: true, }, + rules: { + "prettier/prettier": [ + "error", + { + "endOfLine": "auto" + }, + ], + }, overrides: [ { files: ['test/**/*-test.js'], From d6c54b9c0fbc4399e0f545c5a5fe1858dffdf72b Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Tue, 17 Oct 2023 08:52:45 -0400 Subject: [PATCH 15/23] fix peer dependency errors --- pnpm-lock.yaml | 24 +++++++++++++++++++ test-packages/basic-app/package.json | 3 ++- .../custom-fastboot-app/package.json | 3 ++- test-packages/custom-sandbox-app/package.json | 3 ++- .../package.json | 3 ++- test-packages/example-addon/package.json | 4 +++- test-packages/hot-swap-app/package.json | 4 +++- 7 files changed, 38 insertions(+), 6 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 157c1b11..b260c80e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -607,6 +607,9 @@ importers: npm-run-all: specifier: ^4.1.5 version: 4.1.5 + qunit: + specifier: ^2.17.2 + version: 2.20.0 qunit-dom: specifier: ^1.2.0 version: 1.6.0 @@ -718,6 +721,9 @@ importers: npm-run-all: specifier: ^4.1.5 version: 4.1.5 + qunit: + specifier: ^2.17.2 + version: 2.20.0 qunit-dom: specifier: ^1.2.0 version: 1.6.0 @@ -814,6 +820,9 @@ importers: npm-run-all: specifier: ^4.1.5 version: 4.1.5 + qunit: + specifier: ^2.17.2 + version: 2.20.0 qunit-dom: specifier: ^1.2.0 version: 1.6.0 @@ -907,6 +916,9 @@ importers: npm-run-all: specifier: ^4.1.5 version: 4.1.5 + qunit: + specifier: ^2.17.2 + version: 2.20.0 qunit-dom: specifier: ^1.2.0 version: 1.6.0 @@ -925,6 +937,9 @@ importers: '@ember/optional-features': specifier: ^1.3.0 version: 1.3.0 + '@ember/test-helpers': + specifier: ^2.9.2 + version: 2.9.4(ember-source@3.28.12) '@glimmer/component': specifier: ^1.1.2 version: 1.1.2 @@ -1000,6 +1015,9 @@ importers: npm-run-all: specifier: ^4.1.5 version: 4.1.5 + qunit: + specifier: ^2.17.2 + version: 2.20.0 qunit-dom: specifier: ^1.2.0 version: 1.6.0 @@ -1029,6 +1047,9 @@ importers: '@ember/optional-features': specifier: ^1.3.0 version: 1.3.0 + '@ember/test-helpers': + specifier: ^2.9.2 + version: 2.9.4(ember-source@3.28.12) '@glimmer/component': specifier: ^1.1.2 version: 1.1.2 @@ -1113,6 +1134,9 @@ importers: npm-run-all: specifier: ^4.1.5 version: 4.1.5 + qunit: + specifier: ^2.17.2 + version: 2.20.0 qunit-dom: specifier: ^1.2.0 version: 1.6.0 diff --git a/test-packages/basic-app/package.json b/test-packages/basic-app/package.json index c379d658..767433b5 100644 --- a/test-packages/basic-app/package.json +++ b/test-packages/basic-app/package.json @@ -63,7 +63,8 @@ "loader.js": "^4.7.0", "mocha": "^9.1.2", "npm-run-all": "^4.1.5", - "qunit-dom": "^1.2.0" + "qunit-dom": "^1.2.0", + "qunit": "^2.17.2" }, "fastbootDependencies": [ "rsvp" diff --git a/test-packages/custom-fastboot-app/package.json b/test-packages/custom-fastboot-app/package.json index 2757062c..c7ba50e1 100644 --- a/test-packages/custom-fastboot-app/package.json +++ b/test-packages/custom-fastboot-app/package.json @@ -56,7 +56,8 @@ "loader.js": "^4.7.0", "mocha": "^9.1.2", "npm-run-all": "^4.1.5", - "qunit-dom": "^1.2.0" + "qunit-dom": "^1.2.0", + "qunit": "^2.17.2" }, "engines": { "node": "10.* || >= 12" diff --git a/test-packages/custom-sandbox-app/package.json b/test-packages/custom-sandbox-app/package.json index b5b946e5..d976a629 100644 --- a/test-packages/custom-sandbox-app/package.json +++ b/test-packages/custom-sandbox-app/package.json @@ -49,7 +49,8 @@ "eslint-plugin-node": "^11.1.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "qunit-dom": "^1.2.0" + "qunit-dom": "^1.2.0", + "qunit": "^2.17.2" }, "engines": { "node": "10.* || >= 12" diff --git a/test-packages/ember-cli-fastboot-testing-app/package.json b/test-packages/ember-cli-fastboot-testing-app/package.json index ba2c70a3..cae876bb 100644 --- a/test-packages/ember-cli-fastboot-testing-app/package.json +++ b/test-packages/ember-cli-fastboot-testing-app/package.json @@ -50,7 +50,8 @@ "eslint-plugin-node": "^11.1.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "qunit-dom": "^1.2.0" + "qunit-dom": "^1.2.0", + "qunit": "^2.17.2" }, "ember": { "edition": "octane" diff --git a/test-packages/example-addon/package.json b/test-packages/example-addon/package.json index 15fe2000..16080ab3 100644 --- a/test-packages/example-addon/package.json +++ b/test-packages/example-addon/package.json @@ -29,6 +29,7 @@ }, "devDependencies": { "@ember/optional-features": "^1.3.0", + "@ember/test-helpers": "^2.9.2", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.0.0", "babel-eslint": "^10.1.0", @@ -54,7 +55,8 @@ "eslint-plugin-node": "^11.1.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "qunit-dom": "^1.2.0" + "qunit-dom": "^1.2.0", + "qunit": "^2.17.2" }, "engines": { "node": "10.* || >= 12" diff --git a/test-packages/hot-swap-app/package.json b/test-packages/hot-swap-app/package.json index 603b4d52..cbec5dfd 100644 --- a/test-packages/hot-swap-app/package.json +++ b/test-packages/hot-swap-app/package.json @@ -21,6 +21,7 @@ }, "devDependencies": { "@ember/optional-features": "^1.3.0", + "@ember/test-helpers": "^2.9.2", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.0.0", "babel-eslint": "^10.1.0", @@ -49,7 +50,8 @@ "eslint-plugin-node": "^11.1.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "qunit-dom": "^1.2.0" + "qunit-dom": "^1.2.0", + "qunit": "^2.17.2" }, "engines": { "node": "10.* || >= 12" From 4749943d068ea4d13b251d5414c7c4573ce655b1 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Tue, 17 Oct 2023 09:19:07 -0400 Subject: [PATCH 16/23] update fixtures --- .../test/fixtures/app-with-metadata/package.json | 2 +- .../test/fixtures/multivalue-headers/package.json | 2 +- test-packages/basic-app/test/package-json-test.js | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/fastboot-express-middleware/test/fixtures/app-with-metadata/package.json b/packages/fastboot-express-middleware/test/fixtures/app-with-metadata/package.json index b65b5805..418b4ca9 100644 --- a/packages/fastboot-express-middleware/test/fixtures/app-with-metadata/package.json +++ b/packages/fastboot-express-middleware/test/fixtures/app-with-metadata/package.json @@ -1 +1 @@ -{"dependencies":{},"fastboot":{"appName":"fastboot-app","config":{"fastboot-app":{"APP":{"autoboot":false,"name":"fastboot-app","version":"0.0.0+fcd8aedb"},"EmberENV":{"EXTEND_PROTOTYPES":{"Date":false},"FEATURES":{},"_APPLICATION_TEMPLATE_WRAPPER":false,"_DEFAULT_ASYNC_OBSERVERS":true,"_JQUERY_INTEGRATION":false,"_TEMPLATE_ONLY_GLIMMER_COMPONENTS":true},"environment":"development","exportApplicationGlobal":true,"locationType":"auto","modulePrefix":"fastboot-app","rootURL":"/"}},"manifest":{"appFiles":["assets/fastboot-app.js","assets/fastboot-app-fastboot.js"],"htmlFile":"index.html","vendorFiles":["assets/vendor.js","assets/auto-import-fastboot.js"]},"moduleWhitelist":[],"schemaVersion":3}} \ No newline at end of file +{"dependencies":{},"fastboot":{"appName":"fastboot-app","config":{"fastboot-app":{"APP":{"autoboot":false,"name":"fastboot-app","version":"0.0.0+fcd8aedb"},"EmberENV":{"EXTEND_PROTOTYPES":{"Date":false},"FEATURES":{},"_APPLICATION_TEMPLATE_WRAPPER":false,"_DEFAULT_ASYNC_OBSERVERS":true,"_JQUERY_INTEGRATION":false,"_TEMPLATE_ONLY_GLIMMER_COMPONENTS":true},"environment":"development","exportApplicationGlobal":true,"locationType":"auto","modulePrefix":"fastboot-app","rootURL":"/"}},"manifest":{"appFiles":["assets/fastboot-app.js","assets/fastboot-app-fastboot.js"],"htmlFile":"index.html","vendorFiles":["assets/vendor.js"]},"moduleWhitelist":[],"schemaVersion":3}} diff --git a/packages/fastboot-express-middleware/test/fixtures/multivalue-headers/package.json b/packages/fastboot-express-middleware/test/fixtures/multivalue-headers/package.json index 81538a0f..60d9a5a1 100644 --- a/packages/fastboot-express-middleware/test/fixtures/multivalue-headers/package.json +++ b/packages/fastboot-express-middleware/test/fixtures/multivalue-headers/package.json @@ -1 +1 @@ -{"dependencies":{},"fastboot":{"appName":"multivalue-headers","config":{"multivalue-headers":{"APP":{"autoboot":false,"name":"multivalue-headers","version":"0.0.0+5110a671"},"EmberENV":{"EXTEND_PROTOTYPES":{"Date":false},"FEATURES":{},"_APPLICATION_TEMPLATE_WRAPPER":false,"_DEFAULT_ASYNC_OBSERVERS":true,"_JQUERY_INTEGRATION":false,"_TEMPLATE_ONLY_GLIMMER_COMPONENTS":true},"environment":"development","exportApplicationGlobal":true,"locationType":"auto","modulePrefix":"multivalue-headers","rootURL":"/"}},"manifest":{"appFiles":["assets/multivalue-headers.js","assets/multivalue-headers-fastboot.js"],"htmlFile":"index.html","vendorFiles":["assets/vendor.js","assets/auto-import-fastboot.js"]},"moduleWhitelist":[],"schemaVersion":3}} \ No newline at end of file +{"dependencies":{},"fastboot":{"appName":"multivalue-headers","config":{"multivalue-headers":{"APP":{"autoboot":false,"name":"multivalue-headers","version":"0.0.0+5110a671"},"EmberENV":{"EXTEND_PROTOTYPES":{"Date":false},"FEATURES":{},"_APPLICATION_TEMPLATE_WRAPPER":false,"_DEFAULT_ASYNC_OBSERVERS":true,"_JQUERY_INTEGRATION":false,"_TEMPLATE_ONLY_GLIMMER_COMPONENTS":true},"environment":"development","exportApplicationGlobal":true,"locationType":"auto","modulePrefix":"multivalue-headers","rootURL":"/"}},"manifest":{"appFiles":["assets/multivalue-headers.js","assets/multivalue-headers-fastboot.js"],"htmlFile":"index.html","vendorFiles":["assets/vendor.js"]},"moduleWhitelist":[],"schemaVersion":3}} diff --git a/test-packages/basic-app/test/package-json-test.js b/test-packages/basic-app/test/package-json-test.js index 0cc69fc8..f5892540 100644 --- a/test-packages/basic-app/test/package-json-test.js +++ b/test-packages/basic-app/test/package-json-test.js @@ -67,7 +67,6 @@ describe("generating package.json", function () { vendorFiles: [ "example-addon/foo.js", "assets/vendor.js", - "assets/auto-import-fastboot.js", "ember-fetch/fetch-fastboot.js", ], }); From 8122503c3d07901544331689573cae1cb3262671 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Tue, 17 Oct 2023 09:32:06 -0400 Subject: [PATCH 17/23] fix ember-cli-fastboot-testing should use linked fastboot@4.1.1 --- package.json | 3 +++ pnpm-lock.yaml | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index b9919849..9629969b 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,9 @@ "npm-run-all": "^4.1.5", "release-it": "^14.2.2" }, + "resolutions": { + "fastboot": "4.1.1" + }, "publishConfig": { "registry": "https://registry.npmjs.org" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b260c80e..e9623ed7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,9 @@ settings: autoInstallPeers: false excludeLinksFromLockfile: false +overrides: + fastboot: 4.1.1 + importers: .: @@ -8313,7 +8316,7 @@ packages: body-parser: 1.20.2 ember-auto-import: 1.12.2 ember-cli-babel: 7.26.11 - fastboot: 3.3.2 + fastboot: 4.1.1 json-fn: 1.1.1 minimist: 1.2.8 nock: 12.0.3 @@ -10411,8 +10414,8 @@ packages: - supports-color dev: false - /fastboot@3.3.2: - resolution: {integrity: sha512-2NKTW32GvEsDyBrdw1trW1JsbS+9/7sAQuKwkht12mNitimRrSKVLP2AxsM/HSXQE+aiET4XCfKdyeIy0kQbKQ==} + /fastboot@4.1.1: + resolution: {integrity: sha512-XG7YprsAuAGZrUDhmJ0NFuEP0gpWg9LZwGWSS1I5+f0ETHKPWqb4x59sN2rU1nvCEETBK70z68tLsWsl9daomg==} engines: {node: 12.* || 14.* || >=16} dependencies: chalk: 4.1.2 From 397c93de07573e21039c55d4645a16f36a41beba Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Tue, 17 Oct 2023 10:15:21 -0400 Subject: [PATCH 18/23] upgrade ember-cli-fastboot-testing --- pnpm-lock.yaml | 124 +++++++++++++++--- test-packages/basic-app/package.json | 2 +- .../custom-fastboot-app/package.json | 2 +- test-packages/custom-sandbox-app/package.json | 2 +- .../package.json | 9 +- test-packages/example-addon/package.json | 2 +- test-packages/hot-swap-app/package.json | 2 +- 7 files changed, 114 insertions(+), 29 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e9623ed7..e7771301 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -614,7 +614,7 @@ importers: specifier: ^2.17.2 version: 2.20.0 qunit-dom: - specifier: ^1.2.0 + specifier: ^1.6.0 version: 1.6.0 test-packages/custom-fastboot-app: @@ -728,7 +728,7 @@ importers: specifier: ^2.17.2 version: 2.20.0 qunit-dom: - specifier: ^1.2.0 + specifier: ^1.6.0 version: 1.6.0 test-packages/custom-sandbox-app: @@ -827,7 +827,7 @@ importers: specifier: ^2.17.2 version: 2.20.0 qunit-dom: - specifier: ^1.2.0 + specifier: ^1.6.0 version: 1.6.0 test-packages/ember-cli-fastboot-testing-app: @@ -845,8 +845,8 @@ importers: specifier: ^3.0.0 version: 3.0.0 ember-auto-import: - specifier: ^1.5.3 - version: 1.12.2 + specifier: ^2.6.1 + version: 2.6.3(webpack@5.58.1) ember-cli: specifier: ~4.1.0 version: 4.1.0 @@ -863,8 +863,8 @@ importers: specifier: 4.1.1 version: link:../../packages/ember-cli-fastboot ember-cli-fastboot-testing: - specifier: ^0.5.0 - version: 0.5.0 + specifier: ^0.6.1 + version: 0.6.1(ember-source@3.28.12)(webpack@5.58.1) ember-cli-htmlbars: specifier: ^5.1.2 version: 5.7.1 @@ -923,8 +923,11 @@ importers: specifier: ^2.17.2 version: 2.20.0 qunit-dom: - specifier: ^1.2.0 + specifier: ^1.6.0 version: 1.6.0 + webpack: + specifier: ^5.58.1 + version: 5.58.1 test-packages/ember-cli-fastboot-testing-app/dist: {} @@ -1022,7 +1025,7 @@ importers: specifier: ^2.17.2 version: 2.20.0 qunit-dom: - specifier: ^1.2.0 + specifier: ^1.6.0 version: 1.6.0 test-packages/fake-addon: @@ -1141,7 +1144,7 @@ importers: specifier: ^2.17.2 version: 2.20.0 qunit-dom: - specifier: ^1.2.0 + specifier: ^1.6.0 version: 1.6.0 test-packages/integration-tests: @@ -4252,6 +4255,15 @@ packages: ajv: 6.12.6 dev: true + /ajv-formats@2.1.1: + resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==} + peerDependenciesMeta: + ajv: + optional: true + dependencies: + ajv: 8.12.0 + dev: true + /ajv-keywords@3.5.2(ajv@6.12.6): resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} peerDependencies: @@ -4260,6 +4272,15 @@ packages: ajv: 6.12.6 dev: true + /ajv-keywords@5.1.0(ajv@8.12.0): + resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==} + peerDependencies: + ajv: ^8.8.2 + dependencies: + ajv: 8.12.0 + fast-deep-equal: 3.1.3 + dev: true + /ajv@6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} dependencies: @@ -8143,6 +8164,47 @@ packages: - webpack dev: true + /ember-auto-import@2.6.3(webpack@5.58.1): + resolution: {integrity: sha512-uLhrRDJYWCRvQ4JQ1e64XlSrqAKSd6PXaJ9ZsZI6Tlms9T4DtQFxNXasqji2ZRJBVrxEoLCRYX3RTldsQ0vNGQ==} + engines: {node: 12.* || 14.* || >= 16} + dependencies: + '@babel/core': 7.21.8 + '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.21.8) + '@babel/plugin-proposal-decorators': 7.21.0(@babel/core@7.21.8) + '@babel/preset-env': 7.21.5(@babel/core@7.21.8) + '@embroider/macros': 1.13.2 + '@embroider/shared-internals': 2.5.0 + babel-loader: 8.3.0(@babel/core@7.21.8)(webpack@5.58.1) + babel-plugin-ember-modules-api-polyfill: 3.5.0 + babel-plugin-ember-template-compilation: 2.2.0 + babel-plugin-htmlbars-inline-precompile: 5.3.1 + babel-plugin-syntax-dynamic-import: 6.18.0 + broccoli-debug: 0.6.5 + broccoli-funnel: 3.0.8 + broccoli-merge-trees: 4.2.0 + broccoli-plugin: 4.0.7 + broccoli-source: 3.0.1 + css-loader: 5.2.7(webpack@5.58.1) + debug: 4.3.4 + fs-extra: 10.0.0 + fs-tree-diff: 2.0.1 + handlebars: 4.7.7 + js-string-escape: 1.0.1 + lodash: 4.17.21 + mini-css-extract-plugin: 2.7.6(webpack@5.58.1) + parse5: 6.0.1 + resolve: 1.22.2 + resolve-package-path: 4.0.3 + semver: 7.5.1 + style-loader: 2.0.0(webpack@5.58.1) + typescript-memoize: 1.1.1 + walk-sync: 3.0.0 + transitivePeerDependencies: + - '@glint/template' + - supports-color + - webpack + dev: true + /ember-cache-primitive-polyfill@1.0.1: resolution: {integrity: sha512-hSPcvIKarA8wad2/b6jDd/eU+OtKmi6uP+iYQbzi5TQpjsqV6b4QdRqrLk7ClSRRKBAtdTuutx+m+X+WlEd2lw==} engines: {node: 10.* || >= 12} @@ -8309,26 +8371,29 @@ packages: - supports-color dev: true - /ember-cli-fastboot-testing@0.5.0: - resolution: {integrity: sha512-BZmqXSYI9zCDWby9AkpbUnwUK0ubm78a84NUpp5Mv3QSY2HDar6JgEu+XAQA49dKQBfMVuNU4YMq4AGG5dx6yA==} - engines: {node: 8.* || >= 10.*} + /ember-cli-fastboot-testing@0.6.1(ember-source@3.28.12)(webpack@5.58.1): + resolution: {integrity: sha512-nevPv77Wjk0Mslb0AF0wgHfbjki6Fi3/dapTrFz17WLX6n5maLr/MTL1hZcZdbT+69DHdgckCza8Z1WyxiUbBA==} + engines: {node: 12.* || 14.* || 16.* || >= 18} + peerDependencies: + ember-source: ^3.28.0 || ^4.0.0 || ^5.0.0 dependencies: body-parser: 1.20.2 - ember-auto-import: 1.12.2 + ember-auto-import: 2.6.3(webpack@5.58.1) ember-cli-babel: 7.26.11 + ember-source: 3.28.12 fastboot: 4.1.1 json-fn: 1.1.1 minimist: 1.2.8 - nock: 12.0.3 + nock: 13.3.4 resolve: 1.22.2 whatwg-fetch: 3.6.2 transitivePeerDependencies: + - '@glint/template' - bufferutil - canvas - supports-color - utf-8-validate - - webpack-cli - - webpack-command + - webpack dev: true /ember-cli-get-component-path-option@1.0.0: @@ -10866,7 +10931,6 @@ packages: graceful-fs: 4.2.11 jsonfile: 6.1.0 universalify: 2.0.0 - dev: false /fs-extra@4.0.3: resolution: {integrity: sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==} @@ -13841,6 +13905,16 @@ packages: engines: {node: '>=10'} dev: true + /mini-css-extract-plugin@2.7.6(webpack@5.58.1): + resolution: {integrity: sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==} + engines: {node: '>= 12.13.0'} + peerDependencies: + webpack: ^5.0.0 + dependencies: + schema-utils: 4.2.0 + webpack: 5.58.1 + dev: true + /minimalistic-assert@1.0.1: resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==} dev: true @@ -14137,8 +14211,8 @@ packages: tslib: 2.5.2 dev: true - /nock@12.0.3: - resolution: {integrity: sha512-QNb/j8kbFnKCiyqi9C5DD0jH/FubFGj5rt9NQFONXwQm3IPB0CULECg/eS3AU1KgZb/6SwUa4/DTRKhVxkGABw==} + /nock@13.3.4: + resolution: {integrity: sha512-DDpmn5oLEdCTclEqweOT4U7bEpuoifBMFUXem9sA4turDAZ5tlbrEoWqCorwXey8CaAw44mst5JOQeVNiwtkhw==} engines: {node: '>= 10.13'} dependencies: debug: 4.3.4 @@ -16162,6 +16236,16 @@ packages: ajv-keywords: 3.5.2(ajv@6.12.6) dev: true + /schema-utils@4.2.0: + resolution: {integrity: sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==} + engines: {node: '>= 12.13.0'} + dependencies: + '@types/json-schema': 7.0.12 + ajv: 8.12.0 + ajv-formats: 2.1.1 + ajv-keywords: 5.1.0(ajv@8.12.0) + dev: true + /semver-diff@3.1.1: resolution: {integrity: sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==} engines: {node: '>=8'} diff --git a/test-packages/basic-app/package.json b/test-packages/basic-app/package.json index 767433b5..89e7c89f 100644 --- a/test-packages/basic-app/package.json +++ b/test-packages/basic-app/package.json @@ -63,7 +63,7 @@ "loader.js": "^4.7.0", "mocha": "^9.1.2", "npm-run-all": "^4.1.5", - "qunit-dom": "^1.2.0", + "qunit-dom": "^1.6.0", "qunit": "^2.17.2" }, "fastbootDependencies": [ diff --git a/test-packages/custom-fastboot-app/package.json b/test-packages/custom-fastboot-app/package.json index c7ba50e1..13a1307f 100644 --- a/test-packages/custom-fastboot-app/package.json +++ b/test-packages/custom-fastboot-app/package.json @@ -56,7 +56,7 @@ "loader.js": "^4.7.0", "mocha": "^9.1.2", "npm-run-all": "^4.1.5", - "qunit-dom": "^1.2.0", + "qunit-dom": "^1.6.0", "qunit": "^2.17.2" }, "engines": { diff --git a/test-packages/custom-sandbox-app/package.json b/test-packages/custom-sandbox-app/package.json index d976a629..6bc4c188 100644 --- a/test-packages/custom-sandbox-app/package.json +++ b/test-packages/custom-sandbox-app/package.json @@ -49,7 +49,7 @@ "eslint-plugin-node": "^11.1.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "qunit-dom": "^1.2.0", + "qunit-dom": "^1.6.0", "qunit": "^2.17.2" }, "engines": { diff --git a/test-packages/ember-cli-fastboot-testing-app/package.json b/test-packages/ember-cli-fastboot-testing-app/package.json index cae876bb..6f793a29 100644 --- a/test-packages/ember-cli-fastboot-testing-app/package.json +++ b/test-packages/ember-cli-fastboot-testing-app/package.json @@ -25,13 +25,13 @@ "@ember/test-helpers": "^2.9.2", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^1.5.3", + "ember-auto-import": "^2.6.1", "ember-cli": "~4.1.0", "ember-cli-app-version": "^6.0.0", "ember-cli-babel": "^7.20.5", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-fastboot": "4.1.1", - "ember-cli-fastboot-testing": "^0.5.0", + "ember-cli-fastboot-testing": "^0.6.1", "ember-cli-htmlbars": "^5.1.2", "ember-cli-inject-live-reload": "^2.0.2", "ember-cli-sri": "^2.1.1", @@ -50,8 +50,9 @@ "eslint-plugin-node": "^11.1.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "qunit-dom": "^1.2.0", - "qunit": "^2.17.2" + "qunit-dom": "^1.6.0", + "qunit": "^2.17.2", + "webpack": "^5.58.1" }, "ember": { "edition": "octane" diff --git a/test-packages/example-addon/package.json b/test-packages/example-addon/package.json index 16080ab3..9069a8bb 100644 --- a/test-packages/example-addon/package.json +++ b/test-packages/example-addon/package.json @@ -55,7 +55,7 @@ "eslint-plugin-node": "^11.1.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "qunit-dom": "^1.2.0", + "qunit-dom": "^1.6.0", "qunit": "^2.17.2" }, "engines": { diff --git a/test-packages/hot-swap-app/package.json b/test-packages/hot-swap-app/package.json index cbec5dfd..bf6abbce 100644 --- a/test-packages/hot-swap-app/package.json +++ b/test-packages/hot-swap-app/package.json @@ -50,7 +50,7 @@ "eslint-plugin-node": "^11.1.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "qunit-dom": "^1.2.0", + "qunit-dom": "^1.6.0", "qunit": "^2.17.2" }, "engines": { From 93a4aad4a3e42a281e88af8f9d882d422496c612 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Tue, 17 Oct 2023 11:29:49 -0400 Subject: [PATCH 19/23] fix ember-cli-fastboot-testing-app test --- test-packages/ember-cli-fastboot-testing-app/tests/index.html | 3 +++ .../ember-cli-fastboot-testing-app/tests/test-helper.js | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/test-packages/ember-cli-fastboot-testing-app/tests/index.html b/test-packages/ember-cli-fastboot-testing-app/tests/index.html index 965565d9..d234c7d2 100644 --- a/test-packages/ember-cli-fastboot-testing-app/tests/index.html +++ b/test-packages/ember-cli-fastboot-testing-app/tests/index.html @@ -21,6 +21,9 @@ {{content-for "body"}} {{content-for "test-body"}} +
+
+ diff --git a/test-packages/ember-cli-fastboot-testing-app/tests/test-helper.js b/test-packages/ember-cli-fastboot-testing-app/tests/test-helper.js index 0382a848..65daff04 100644 --- a/test-packages/ember-cli-fastboot-testing-app/tests/test-helper.js +++ b/test-packages/ember-cli-fastboot-testing-app/tests/test-helper.js @@ -2,6 +2,10 @@ import Application from '../app'; import config from '../config/environment'; import { setApplication } from '@ember/test-helpers'; import { start } from 'ember-qunit'; +import * as QUnit from 'qunit'; +import { setup } from 'qunit-dom'; + +setup(QUnit.assert); setApplication(Application.create(config.APP)); From bea40b4d97d88fd3d38d95d95da819ed0d2f64be Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Sun, 14 May 2023 12:08:44 -0400 Subject: [PATCH 20/23] fix legacy mocha tests --- .github/workflows/ci.yml | 1 + .../ember-cli-fastboot/fix-node-modules.mjs | 10 +++++++ packages/ember-cli-fastboot/package.json | 10 ++++--- .../test/fastboot-config-test.js | 6 ++--- .../test/fastboot-location-config-test.js | 6 ++--- .../test/fastboot-location-test.js | 6 ++--- .../test/package-json-test.js | 6 ++--- .../test/request-details-test.js | 27 +++++++++++++++---- .../ember-cli-fastboot/test/root-url-test.js | 6 ++--- pnpm-lock.yaml | 7 +++-- 10 files changed, 58 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2a757b75..29bbe8db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,6 +140,7 @@ jobs: node-version: ${{ matrix.node-version }} cache: pnpm - run: pnpm install --frozen-lockfile + - run: pnpm --filter ember-cli-fastboot pretest:precook - run: pnpm --filter ember-cli-fastboot test:mocha try-scenarios: diff --git a/packages/ember-cli-fastboot/fix-node-modules.mjs b/packages/ember-cli-fastboot/fix-node-modules.mjs index fdd4b85a..96c08117 100644 --- a/packages/ember-cli-fastboot/fix-node-modules.mjs +++ b/packages/ember-cli-fastboot/fix-node-modules.mjs @@ -12,6 +12,7 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url)); const packagesDir = path.resolve(__dirname, '../../packages'); const nodeModulesDir = path.resolve(__dirname, 'node_modules'); +const precookedDir = path.resolve(__dirname, 'tmp', 'precooked_node_modules'); // eslint-disable-next-line no-undef const shouldRestore = process.argv[2]; @@ -29,11 +30,16 @@ Options: function run(shouldRestore) { ['fastboot', 'fastboot-express-middleware'].forEach((packageName) => { const nodeModulesPackageDir = path.join(nodeModulesDir, packageName); + const precookedPackageDir = path.join(precookedDir, packageName); const workspacesPackageDir = path.resolve(packagesDir, packageName); if (fs.existsSync(nodeModulesPackageDir)) { console.log(chalk.blue(`remove ${nodeModulesPackageDir}`)); fs.removeSync(nodeModulesPackageDir); } + if (fs.existsSync(precookedPackageDir)) { + console.log(chalk.blue(`remove ${precookedPackageDir}`)); + fs.removeSync(precookedPackageDir); + } if (!shouldRestore) { console.log( chalk.green( @@ -41,6 +47,10 @@ function run(shouldRestore) { ) ); fs.symlinkSync(workspacesPackageDir, nodeModulesPackageDir, 'dir'); + console.log( + chalk.green(`symlink ${precookedPackageDir} -> ${workspacesPackageDir}`) + ); + fs.symlinkSync(workspacesPackageDir, precookedPackageDir, 'dir'); } }); } diff --git a/packages/ember-cli-fastboot/package.json b/packages/ember-cli-fastboot/package.json index c8a61f78..f7720f3f 100644 --- a/packages/ember-cli-fastboot/package.json +++ b/packages/ember-cli-fastboot/package.json @@ -22,10 +22,10 @@ "release": "release-it", "lint:js:fix": "eslint . --fix", "start": "ember serve", - "test": "npm-run-all lint test:*", - "test:mocha": "node fix-node-modules.mjs && mocha && node fix-node-modules.mjs -r", + "pretest:precook": "node node_modules/ember-cli-addon-tests/scripts/precook-node-modules.js", + "test": "npm-run-all -s lint pretest:* test:*", + "test:mocha": "node fix-node-modules.mjs && mocha", "test:ember": "ember test", - "test:precook": "node node_modules/ember-cli-addon-tests/scripts/precook-node-modules.js", "test:ember-compatibility": "ember try:each" }, "dependencies": { @@ -45,9 +45,13 @@ "fs-extra": "^10.0.0", "json-stable-stringify": "^1.0.1", "md5-hex": "^3.0.1", + "node-fetch": "^2.6.7", "recast": "^0.19.1", "silent-error": "^1.1.1" }, + "fastbootDependencies": [ + "node-fetch" + ], "devDependencies": { "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.6.0", diff --git a/packages/ember-cli-fastboot/test/fastboot-config-test.js b/packages/ember-cli-fastboot/test/fastboot-config-test.js index 7a9b78e4..720b73f1 100644 --- a/packages/ember-cli-fastboot/test/fastboot-config-test.js +++ b/packages/ember-cli-fastboot/test/fastboot-config-test.js @@ -17,15 +17,15 @@ describe('FastBoot config', function () { return app .create('fastboot-config', { - emberVersion: 'latest', - emberDataVersion: 'latest', + emberVersion: '~3.28.12', + emberDataVersion: '~3.28.12', }) .then(function () { app.editPackageJSON((pkg) => { delete pkg.devDependencies['ember-fetch']; delete pkg.devDependencies['ember-welcome-page']; // needed because @ember-data/store does `FastBoot.require('crypto')` - pkg.fastbootDependencies = ['crypto']; + pkg.fastbootDependencies = ['node-fetch', 'path', 'crypto']; }); return app.run('npm', 'install'); }) diff --git a/packages/ember-cli-fastboot/test/fastboot-location-config-test.js b/packages/ember-cli-fastboot/test/fastboot-location-config-test.js index b0021316..58ccdbd6 100644 --- a/packages/ember-cli-fastboot/test/fastboot-location-config-test.js +++ b/packages/ember-cli-fastboot/test/fastboot-location-config-test.js @@ -17,15 +17,15 @@ describe('FastBootLocation Configuration', function () { return app .create('fastboot-location-config', { - emberVersion: 'latest', - emberDataVersion: 'latest', + emberVersion: '~3.28.12', + emberDataVersion: '~3.28.12', }) .then(function () { app.editPackageJSON((pkg) => { delete pkg.devDependencies['ember-fetch']; delete pkg.devDependencies['ember-welcome-page']; // needed because @ember-data/store does `FastBoot.require('crypto')` - pkg.fastbootDependencies = ['crypto']; + pkg.fastbootDependencies = ['node-fetch', 'path', 'crypto']; }); return app.run('npm', 'install'); }) diff --git a/packages/ember-cli-fastboot/test/fastboot-location-test.js b/packages/ember-cli-fastboot/test/fastboot-location-test.js index 773331d0..375f242a 100644 --- a/packages/ember-cli-fastboot/test/fastboot-location-test.js +++ b/packages/ember-cli-fastboot/test/fastboot-location-test.js @@ -16,15 +16,15 @@ describe('FastBootLocation', function () { return app .create('fastboot-location', { - emberVersion: 'latest', - emberDataVersion: 'latest', + emberVersion: '~3.28.12', + emberDataVersion: '~3.28.12', }) .then(function () { app.editPackageJSON((pkg) => { delete pkg.devDependencies['ember-fetch']; delete pkg.devDependencies['ember-welcome-page']; // needed because @ember-data/store does `FastBoot.require('crypto')` - pkg.fastbootDependencies = ['crypto']; + pkg.fastbootDependencies = ['node-fetch', 'path', 'crypto']; }); return app.run('npm', 'install'); }) diff --git a/packages/ember-cli-fastboot/test/package-json-test.js b/packages/ember-cli-fastboot/test/package-json-test.js index bff1f7e2..8ca210af 100644 --- a/packages/ember-cli-fastboot/test/package-json-test.js +++ b/packages/ember-cli-fastboot/test/package-json-test.js @@ -19,15 +19,15 @@ describe('generating package.json', function () { before(function () { return customApp .create('customized-outputpaths', { - emberVersion: 'latest', - emberDataVersion: 'latest', + emberVersion: '~3.28.12', + emberDataVersion: '~3.28.12', }) .then(function () { customApp.editPackageJSON((pkg) => { delete pkg.devDependencies['ember-fetch']; delete pkg.devDependencies['ember-welcome-page']; // needed because @ember-data/store does `FastBoot.require('crypto')` - pkg.fastbootDependencies = ['crypto']; + pkg.fastbootDependencies = ['node-fetch', 'path', 'crypto']; }); return customApp.run('npm', 'install'); }) diff --git a/packages/ember-cli-fastboot/test/request-details-test.js b/packages/ember-cli-fastboot/test/request-details-test.js index 5e3967ce..dc415e75 100644 --- a/packages/ember-cli-fastboot/test/request-details-test.js +++ b/packages/ember-cli-fastboot/test/request-details-test.js @@ -4,10 +4,11 @@ const chai = require('chai'); const expect = chai.expect; const RSVP = require('rsvp'); +const path = require('path'); const AddonTestApp = require('ember-cli-addon-tests').AddonTestApp; const request = RSVP.denodeify(require('request')); -function injectMiddlewareAddon(app) { +async function injectMiddlewareAddon(app) { app.editPackageJSON(function (pkg) { pkg.devDependencies['body-parser'] = process.env.npm_package_devDependencies_body_parser; @@ -20,9 +21,25 @@ function injectMiddlewareAddon(app) { delete pkg.devDependencies['ember-fetch']; delete pkg.devDependencies['ember-welcome-page']; // needed because @ember-data/store does `FastBoot.require('crypto')` - pkg.fastbootDependencies = ['crypto']; + pkg.fastbootDependencies = ['node-fetch', 'path', 'crypto']; + }); + await app.run('npm', 'install', '--no-package-lock'); + await app.run( + 'ln', + '-s', + path.resolve(__dirname, '../../fastboot'), + path.resolve(app.path, 'node_modules/fastboot') + ); + await app.run( + 'ln', + '-s', + path.resolve(__dirname, '../../fastboot-express-middleware'), + path.resolve(app.path, 'node_modules/fastboot-express-middleware') + ); + app.editPackageJSON(function (pkg) { + pkg.dependencies['fastboot'] = '*'; + pkg.dependencies['fastboot-express-middleware'] = '*'; }); - return app.run('npm', 'install'); } describe('request details', function () { @@ -35,8 +52,8 @@ describe('request details', function () { return app .create('request', { - emberVersion: 'latest', - emberDataVersion: 'latest', + emberVersion: '~3.28.12', + emberDataVersion: '~3.28.12', }) .then(() => injectMiddlewareAddon(app)) .then(function () { diff --git a/packages/ember-cli-fastboot/test/root-url-test.js b/packages/ember-cli-fastboot/test/root-url-test.js index 321fb6f2..35969576 100644 --- a/packages/ember-cli-fastboot/test/root-url-test.js +++ b/packages/ember-cli-fastboot/test/root-url-test.js @@ -17,15 +17,15 @@ describe('rootUrl acceptance', function () { return app .create('root-url', { - emberVersion: 'latest', - emberDataVersion: 'latest', + emberVersion: '~3.28.12', + emberDataVersion: '~3.28.12', }) .then(function () { app.editPackageJSON((pkg) => { delete pkg.devDependencies['ember-fetch']; delete pkg.devDependencies['ember-welcome-page']; // needed because @ember-data/store does `FastBoot.require('crypto')` - pkg.fastbootDependencies = ['crypto']; + pkg.fastbootDependencies = ['node-fetch', 'path', 'crypto']; }); return app.run('npm', 'install'); }) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e7771301..cd3fdff1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -74,6 +74,9 @@ importers: md5-hex: specifier: ^3.0.1 version: 3.0.1 + node-fetch: + specifier: ^2.6.7 + version: 2.6.11 recast: specifier: ^0.19.1 version: 0.19.1 @@ -14233,7 +14236,6 @@ packages: optional: true dependencies: whatwg-url: 5.0.0 - dev: true /node-int64@0.4.0: resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==} @@ -17501,7 +17503,6 @@ packages: /tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} - dev: true /tr46@1.0.1: resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} @@ -18065,7 +18066,6 @@ packages: /webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} - dev: true /webidl-conversions@4.0.2: resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} @@ -18265,7 +18265,6 @@ packages: dependencies: tr46: 0.0.3 webidl-conversions: 3.0.1 - dev: true /whatwg-url@7.1.0: resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==} From e588faf377cdb796348ef187a56a6a14b2e23337 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Tue, 17 Oct 2023 13:15:37 -0400 Subject: [PATCH 21/23] do not hoist ember-cli-addon-tests --- .npmrc | 1 + pnpm-lock.yaml | 244 +++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 225 insertions(+), 20 deletions(-) diff --git a/.npmrc b/.npmrc index f301fedf..3d3271bb 100644 --- a/.npmrc +++ b/.npmrc @@ -1 +1,2 @@ auto-install-peers=false +public-hoist-pattern=['ember-cli-addon-tests/*','eslint/*','prettier/*'] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cd3fdff1..d79e3a03 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -246,6 +246,192 @@ importers: packages/ember-cli-fastboot/test/fixtures/request/lib/post-middleware: {} + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot: + dependencies: + chalk: + specifier: ^4.1.2 + version: 4.1.2 + cookie: + specifier: ^0.4.1 + version: 0.4.1 + debug: + specifier: ^4.3.3 + version: 4.3.3 + jsdom: + specifier: ^19.0.0 + version: 19.0.0 + resolve: + specifier: ^1.22.0 + version: 1.22.0 + simple-dom: + specifier: ^1.4.0 + version: 1.4.0 + source-map-support: + specifier: ^0.5.21 + version: 0.5.21 + devDependencies: + chai: + specifier: ^4.3.4 + version: 4.3.4 + chai-as-promised: + specifier: ^7.1.1 + version: 7.1.1(chai@4.3.4) + eslint: + specifier: ^6.8.0 + version: 6.8.0 + eslint-config-prettier: + specifier: ^6.10.0 + version: 6.10.0(eslint@6.8.0) + eslint-plugin-chai-expect: + specifier: ^2.1.0 + version: 2.1.0(eslint@6.8.0) + eslint-plugin-mocha: + specifier: ^6.2.2 + version: 6.2.2(eslint@6.8.0) + eslint-plugin-node: + specifier: ^11.0.0 + version: 11.1.0(eslint@6.8.0) + eslint-plugin-prettier: + specifier: ^3.1.2 + version: 3.4.1(eslint-config-prettier@6.10.0)(eslint@6.8.0)(prettier@1.19.1) + express: + specifier: ^4.17.2 + version: 4.17.2 + fixturify: + specifier: ^2.1.0 + version: 2.1.0 + lerna-changelog: + specifier: ^1.0.0 + version: 1.0.0 + mocha: + specifier: ^9.1.2 + version: 9.1.2 + prettier: + specifier: ^1.19.1 + version: 1.19.1 + release-it: + specifier: ^14.2.2 + version: 14.2.2 + release-it-lerna-changelog: + specifier: ^3.1.0 + version: 3.1.0(release-it@14.2.2) + rimraf: + specifier: ^3.0.1 + version: 3.0.1 + tmp: + specifier: ^0.2.1 + version: 0.2.1 + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot-express-middleware: + dependencies: + chalk: + specifier: ^4.1.2 + version: 4.1.2 + fastboot: + specifier: 4.1.1 + version: link:../../../../fastboot + devDependencies: + chai: + specifier: ^4.3.4 + version: 4.3.4 + chai-as-promised: + specifier: ^7.1.1 + version: 7.1.1(chai@4.3.4) + eslint: + specifier: ^6.8.0 + version: 6.8.0 + eslint-config-prettier: + specifier: ^6.9.0 + version: 6.10.0(eslint@6.8.0) + eslint-plugin-mocha: + specifier: ^6.2.2 + version: 6.2.2(eslint@6.8.0) + eslint-plugin-node: + specifier: ^11.0.0 + version: 11.1.0(eslint@6.8.0) + eslint-plugin-prettier: + specifier: ^3.1.2 + version: 3.4.1(eslint-config-prettier@6.10.0)(eslint@6.8.0)(prettier@1.19.1) + express: + specifier: ^4.17.2 + version: 4.17.2 + mocha: + specifier: ^9.1.2 + version: 9.1.2 + prettier: + specifier: ^1.19.1 + version: 1.19.1 + release-it: + specifier: ^14.2.2 + version: 14.2.2 + release-it-lerna-changelog: + specifier: ^3.1.0 + version: 3.1.0(release-it@14.2.2) + request: + specifier: ^2.88.0 + version: 2.88.0 + request-promise: + specifier: ^4.2.1 + version: 4.2.1(request@2.88.0) + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot-express-middleware/test/fixtures/app-with-console-log: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot-express-middleware/test/fixtures/app-with-metadata: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot-express-middleware/test/fixtures/basic-app: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot-express-middleware/test/fixtures/hot-swap-app: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot-express-middleware/test/fixtures/multivalue-headers: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot-express-middleware/test/fixtures/rejected-promise: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/app-with-console-log: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/app-with-dependencies: + dependencies: + foo: + specifier: workspace:* + version: link:../../../../../../../../test-packages/foo + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/app-with-multiple-config: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/app-with-prototype-mutations: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/basic-app: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/boot-time-failing-app: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/config-app: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/config-not-in-meta-app: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/custom-body-attrs: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/custom-body-attrs-with-no-default-classes: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/custom-html-attrs: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/custom-html-attrs-with-no-default-classes: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/custom-sandbox: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/empty-package-json: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/higher-schema-version: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/hot-swap-app: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/html-entrypoint: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/multiple-app-files: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/onerror-per-visit: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/rejected-promise: {} + + packages/ember-cli-fastboot/tmp/precooked_node_modules/fastboot/test/fixtures/shoebox: {} + packages/fastboot: dependencies: chalk: @@ -2577,7 +2763,7 @@ packages: '@babel/helper-split-export-declaration': 7.18.6 '@babel/parser': 7.21.9 '@babel/types': 7.21.5 - debug: 4.3.3 + debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -6280,7 +6466,7 @@ packages: dependencies: async-promise-queue: 1.0.5 broccoli-plugin: 1.3.1 - debug: 4.3.3 + debug: 4.3.4 lodash.defaultsdeep: 4.6.1 matcher-collection: 2.0.1 mkdirp: 0.5.6 @@ -8112,7 +8298,7 @@ packages: lodash: 4.17.21 mkdirp: 0.5.6 pkg-up: 2.0.0 - resolve: 1.22.0 + resolve: 1.22.2 rimraf: 2.7.1 symlink-or-copy: 1.3.1 typescript-memoize: 1.1.1 @@ -8356,7 +8542,7 @@ packages: ensure-posix-path: 1.1.1 fixturify-project: 1.10.0 resolve-package-path: 3.1.0 - rimraf: 3.0.1 + rimraf: 3.0.2 semver: 5.7.1 transitivePeerDependencies: - supports-color @@ -9209,7 +9395,7 @@ packages: broccoli-merge-trees: 4.2.0 ember-cli-babel: 7.26.11 ember-cli-version-checker: 5.1.2 - resolve: 1.22.0 + resolve: 1.22.2 transitivePeerDependencies: - '@babel/core' - supports-color @@ -9321,7 +9507,7 @@ packages: globby: 11.1.0 is-valid-glob: 1.0.0 micromatch: 4.0.5 - resolve: 1.22.0 + resolve: 1.22.2 yargs: 15.4.1 transitivePeerDependencies: - supports-color @@ -9801,7 +9987,7 @@ packages: eslint-utils: 2.1.0 ignore: 5.2.4 minimatch: 3.1.2 - resolve: 1.22.0 + resolve: 1.22.2 semver: 6.3.0 dev: true @@ -9816,7 +10002,7 @@ packages: eslint-utils: 2.1.0 ignore: 5.2.4 minimatch: 3.1.2 - resolve: 1.22.0 + resolve: 1.22.2 semver: 6.3.0 dev: true @@ -9831,7 +10017,7 @@ packages: eslint-utils: 2.1.0 ignore: 5.2.4 minimatch: 3.1.2 - resolve: 1.22.0 + resolve: 1.22.2 semver: 6.3.0 dev: true @@ -9852,6 +10038,23 @@ packages: prettier-linter-helpers: 1.0.0 dev: true + /eslint-plugin-prettier@3.4.1(eslint-config-prettier@6.10.0)(eslint@6.8.0)(prettier@1.19.1): + resolution: {integrity: sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==} + engines: {node: '>=6.0.0'} + peerDependencies: + eslint: '>=5.0.0' + eslint-config-prettier: '*' + prettier: '>=1.13.0' + peerDependenciesMeta: + eslint-config-prettier: + optional: true + dependencies: + eslint: 6.8.0 + eslint-config-prettier: 6.10.0(eslint@6.8.0) + prettier: 1.19.1 + prettier-linter-helpers: 1.0.0 + dev: true + /eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0)(eslint@7.32.0)(prettier@2.8.8): resolution: {integrity: sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==} engines: {node: '>=6.0.0'} @@ -9938,7 +10141,7 @@ packages: ajv: 6.12.6 chalk: 2.4.2 cross-spawn: 6.0.5 - debug: 4.3.3 + debug: 4.3.4 doctrine: 3.0.0 eslint-scope: 5.1.1 eslint-utils: 1.4.3 @@ -9985,7 +10188,7 @@ packages: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 - debug: 4.3.3 + debug: 4.3.4 doctrine: 3.0.0 enquirer: 2.3.6 eslint-scope: 5.1.1 @@ -10870,7 +11073,7 @@ packages: dependencies: asynckit: 0.4.0 combined-stream: 1.0.8 - mime-types: 2.1.27 + mime-types: 2.1.35 dev: true /form-data@4.0.0: @@ -11815,7 +12018,7 @@ packages: dependencies: '@tootallnate/once': 2.0.0 agent-base: 6.0.2 - debug: 4.3.3 + debug: 4.3.4 transitivePeerDependencies: - supports-color @@ -11876,7 +12079,7 @@ packages: engines: {node: '>= 6'} dependencies: agent-base: 6.0.2 - debug: 4.3.3 + debug: 4.3.4 transitivePeerDependencies: - supports-color @@ -15683,7 +15886,7 @@ packages: peerDependencies: release-it: ^14.0.0 dependencies: - execa: 4.0.3 + execa: 4.1.0 lerna-changelog: 1.0.1 mdast-util-from-markdown: 0.8.5 release-it: 14.2.2 @@ -16003,7 +16206,7 @@ packages: resolution: {integrity: sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==} hasBin: true dependencies: - glob: 7.1.3 + glob: 7.2.3 dev: true /rimraf@2.7.1: @@ -16016,7 +16219,8 @@ packages: resolution: {integrity: sha512-IQ4ikL8SjBiEDZfk+DFVwqRK8md24RWMEJkdSlgNLkyyAImcjf8SWvU1qFMDOb4igBClbTQ/ugPqXcRwdFTxZw==} hasBin: true dependencies: - glob: 7.1.3 + glob: 7.2.3 + dev: true /rimraf@3.0.2: resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} @@ -16391,7 +16595,7 @@ packages: engines: {node: '>=4'} hasBin: true dependencies: - glob: 7.1.3 + glob: 7.2.3 interpret: 1.4.0 rechoir: 0.6.2 dev: true @@ -17057,7 +17261,7 @@ packages: debug: 4.3.4 heimdalljs: 0.2.6 mkdirp: 0.5.6 - rimraf: 3.0.1 + rimraf: 3.0.2 username-sync: 1.0.3 transitivePeerDependencies: - supports-color @@ -17415,7 +17619,7 @@ packages: resolution: {integrity: sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==} engines: {node: '>=8.17.0'} dependencies: - rimraf: 3.0.1 + rimraf: 3.0.2 dev: true /tmpl@1.0.5: From f8a0963caff56c2c2407ca74832632b1b3a8abae Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Tue, 17 Oct 2023 14:22:50 -0400 Subject: [PATCH 22/23] increase timeouts --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29bbe8db..a7d31584 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,7 +69,7 @@ jobs: integration-tests: name: Integration Tests runs-on: ${{ matrix.os }} - timeout-minutes: 15 + timeout-minutes: 30 strategy: fail-fast: false @@ -94,7 +94,7 @@ jobs: test-packages: name: Test Packages runs-on: ${{ matrix.os }} - timeout-minutes: 15 + timeout-minutes: 30 strategy: fail-fast: false @@ -121,7 +121,7 @@ jobs: test-legacy-mocha: name: Legacy Mocha Tests - ${{ matrix.node-version }} runs-on: ubuntu-latest - timeout-minutes: 15 + timeout-minutes: 30 strategy: fail-fast: false From fbc82e0270536f84832622749ffd4e16ba786c99 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Tue, 17 Oct 2023 15:22:43 -0400 Subject: [PATCH 23/23] workaround for legacy-mocha-tests on node 14 --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7d31584..8a086548 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,6 +140,7 @@ jobs: node-version: ${{ matrix.node-version }} cache: pnpm - run: pnpm install --frozen-lockfile + - run: npm i -g npm@8 - run: pnpm --filter ember-cli-fastboot pretest:precook - run: pnpm --filter ember-cli-fastboot test:mocha