update the ts-app-template with ember-cli-update

embroider-build · Oct 25, 2023 · eaa3c34 · eaa3c34
1 parent b71cb85
commit eaa3c34
Show file tree

Hide file tree

Showing 12 changed files with 990 additions and 552 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/ts-app-template/.eslintignore b/tests/ts-app-template/.eslintignore
@@ -1,25 +1,13 @@
 # unconventional js
 /blueprints/*/files/
-/vendor/
 
 # compiled output
 /dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
 
 # misc
 /coverage/
 !.*
 .*/
-.eslintcache
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
-/npm-shrinkwrap.json.ember-try
-/package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try
diff --git a/tests/ts-app-template/.gitignore b/tests/ts-app-template/.gitignore
@@ -1,28 +1,21 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
 # compiled output
 /dist/
-/tmp/
+/declarations/
 
 # dependencies
-/bower_components/
 /node_modules/
 
 # misc
 /.env*
 /.pnp*
-/.sass-cache
 /.eslintcache
-/connect.lock
 /coverage/
-/libpeerconnection.log
 /npm-debug.log*
 /testem.log
 /yarn-error.log
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
 /npm-shrinkwrap.json.ember-try
 /package.json.ember-try
 /package-lock.json.ember-try

diff --git a/tests/ts-app-template/.watchmanconfig b/tests/ts-app-template/.watchmanconfig
@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp", "dist"]
+  "ignore_dirs": ["dist"]
 }
diff --git a/tests/ts-app-template/README.md b/tests/ts-app-template/README.md
@@ -8,15 +8,16 @@ A short introduction of this app could easily go here.
 You will need the following things properly installed on your computer.
 
 * [Git](https://git-scm.com/)
-* [Node.js](https://nodejs.org/) (with npm)
+* [Node.js](https://nodejs.org/)
+* [pnpm](https://pnpm.io/)
 * [Ember CLI](https://cli.emberjs.com/release/)
 * [Google Chrome](https://google.com/chrome/)
 
 ## Installation
 
 * `git clone <repository-url>` this repository
 * `cd ts-app-template`
-* `npm install`
+* `pnpm install`
 
 ## Running / Development
 
@@ -35,8 +36,8 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Linting
 
-* `npm run lint`
-* `npm run lint:fix`
+* `pnpm lint`
+* `pnpm lint:fix`
 
 ### Building
 

diff --git a/tests/ts-app-template/app/config/environment.d.ts b/tests/ts-app-template/app/config/environment.d.ts
@@ -2,13 +2,13 @@ export default config;
 
 /**
  * Type declarations for
- *    import config from 'my-app/config/environment'
+ *    import config from 'ts-app-template/config/environment'
  */
 declare const config: {
   environment: string;
   modulePrefix: string;
   podModulePrefix: string;
-  locationType: 'history' | 'hash' | 'none' | 'auto';
+  locationType: 'history' | 'hash' | 'none';
   rootURL: string;
   APP: Record<string, unknown>;
 };
diff --git a/tests/ts-app-template/config/ember-cli-update.json b/tests/ts-app-template/config/ember-cli-update.json
@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "4.12.1",
+      "version": "5.3.0",
       "blueprints": [
         {
           "name": "app",

diff --git a/tests/ts-app-template/ember-cli-build.js b/tests/ts-app-template/ember-cli-build.js
@@ -5,10 +5,7 @@ const { maybeEmbroider } = require('@embroider/test-setup');
 
 module.exports = function (defaults) {
   const app = new EmberApp(defaults, {
-    // Add options here
-    'ember-cli-babel': {
-      enableTypeScriptTransform: true,
-    },
+    'ember-cli-babel': { enableTypeScriptTransform: true },
   });
 
   return maybeEmbroider(app, {

diff --git a/tests/ts-app-template/package.json b/tests/ts-app-template/package.json
@@ -25,11 +25,11 @@
     "test:ember": "ember test"
   },
   "devDependencies": {
-    "@babel/core": "^7.19.3",
+    "@babel/core": "^7.22.20",
     "@babel/eslint-parser": "^7.21.3",
     "@babel/plugin-proposal-decorators": "^7.21.0",
     "@ember/optional-features": "^2.0.0",
-    "@ember/string": "^3.0.1",
+    "@ember/string": "^3.1.1",
     "@ember/test-helpers": "^3.2.0",
     "@embroider/compat": "workspace:*",
     "@embroider/core": "workspace:*",
@@ -40,43 +40,45 @@
     "@glimmer/interfaces": "^0.84.2",
     "@glimmer/reference": "^0.84.2",
     "@glimmer/tracking": "^1.1.2",
-    "@glint/template": "^1.0.0",
+    "@glint/environment-ember-loose": "^1.1.0",
+    "@glint/template": "^1.1.0",
     "@tsconfig/ember": "^1.0.0",
     "@types/htmlbars-inline-precompile": "^3.0.0",
-    "@types/qunit": "^2.19.2",
+    "@types/qunit": "^2.19.6",
     "@types/rsvp": "^4.0.4",
     "broccoli-asset-rev": "^3.0.0",
-    "concurrently": "^8.0.1",
+    "concurrently": "^8.2.1",
     "ember-auto-import": "^2.6.3",
-    "ember-cli": "~4.12.1",
-    "ember-cli-app-version": "^6.0.0",
-    "ember-cli-babel": "^7.26.11",
-    "ember-cli-dependency-checker": "^3.3.1",
-    "ember-cli-htmlbars": "^6.2.0",
+    "ember-cli": "~5.3.0",
+    "ember-cli-app-version": "^6.0.1",
+    "ember-cli-babel": "^8.0.0",
+    "ember-cli-clean-css": "^3.0.0",
+    "ember-cli-dependency-checker": "^3.3.2",
+    "ember-cli-htmlbars": "^6.3.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
     "ember-modifier": "^4.1.0",
-    "ember-page-title": "^7.0.0",
-    "ember-qunit": "^7.0.0",
-    "ember-resolver": "^10.1.0",
-    "ember-source": "~4.12.0",
-    "eslint-plugin-n": "^15.7.0",
+    "ember-page-title": "^8.0.0",
+    "ember-qunit": "^8.0.1",
+    "ember-resolver": "^11.0.1",
+    "ember-source": "~5.3.0",
+    "eslint-plugin-n": "^16.1.0",
     "loader.js": "^4.7.0",
-    "prettier": "^2.8.7",
+    "prettier": "^3.0.3",
     "qunit": "^2.19.4",
     "qunit-dom": "^2.0.0",
-    "stylelint": "^15.4.0",
-    "stylelint-config-standard": "^32.0.0",
-    "stylelint-prettier": "^3.0.0",
-    "tracked-built-ins": "^3.1.1",
+    "stylelint": "^15.10.3",
+    "stylelint-config-standard": "^34.0.0",
+    "stylelint-prettier": "^4.0.2",
+    "tracked-built-ins": "^3.2.0",
     "typescript": "^5.1.6",
-    "webpack": "^5.78.0"
+    "webpack": "^5.88.2"
   },
   "engines": {
-    "node": "14.* || 16.* || >= 18"
+    "node": "16.* || >= 18"
   },
   "ember": {
     "edition": "octane"

diff --git a/tests/ts-app-template/tests/helpers/index.js b/tests/ts-app-template/tests/helpers/index.js
@@ -4,7 +4,7 @@ import {
   setupTest as upstreamSetupTest,
 } from 'ember-qunit';
 
-// This file exists to provide wrappers around ember-qunit's / ember-mocha's
+// This file exists to provide wrappers around ember-qunit's
 // test setup functions. This way, you can easily extend the setup that is
 // needed per test type.
 

diff --git a/tests/ts-app-template/types/ember-data/types/registries/model.d.ts b/tests/ts-app-template/types/ember-data/types/registries/model.d.ts
@@ -2,5 +2,6 @@
  * Catch-all for ember-data.
  */
 export default interface ModelRegistry {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   [key: string]: any;
 }
diff --git a/tests/ts-app-template/types/global.d.ts b/tests/ts-app-template/types/global.d.ts
@@ -1,6 +1 @@
-// Types for compiled templates
-declare module 'ts-app-template/templates/*' {
-  import { TemplateFactory } from 'htmlbars-inline-precompile';
-  const tmpl: TemplateFactory;
-  export default tmpl;
-}
+import '@glint/environment-ember-loose';