Merge pull request #21154 from emberjs/smoke-tests/update-v2-app-template

kategengler · web-flow · commit 1d19a836d6d6 · 2026-03-03T23:20:17.000-05:00
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/smoke-tests/v2-app-template/.editorconfig b/smoke-tests/v2-app-template/.editorconfig
@@ -1,6 +1,6 @@
 # EditorConfig helps developers define and maintain consistent
 # coding styles between different editors and IDEs
-# editorconfig.org
+# https://editorconfig.org/
 
 root = true
 
diff --git a/smoke-tests/v2-app-template/.env.development b/smoke-tests/v2-app-template/.env.development
@@ -0,0 +1,8 @@
+# This file is committed to git and should not contain any secrets.
+# 
+# Vite recommends using .env.local or .env.[mode].local if you need to manage secrets
+# SEE: https://vite.dev/guide/env-and-mode.html#env-files for more information.
+
+
+# Default NODE_ENV with vite build --mode=test is production
+NODE_ENV=development
diff --git a/smoke-tests/v2-app-template/.github/workflows/ci.yml b/smoke-tests/v2-app-template/.github/workflows/ci.yml
@@ -18,36 +18,30 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v4
-        with:
-          version: 9
+      - uses: actions/checkout@v6
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v6
         with:
-          node-version: 18
-          cache: pnpm
+          node-version: 22
+          cache: npm
       - name: Install Dependencies
-        run: pnpm install --frozen-lockfile
+        run: npm ci
       - name: Lint
-        run: pnpm lint
+        run: npm run lint
 
   test:
     name: "Test"
     runs-on: ubuntu-latest
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v4
-        with:
-          version: 9
+      - uses: actions/checkout@v6
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v6
         with:
-          node-version: 18
-          cache: pnpm
+          node-version: 22
+          cache: npm
       - name: Install Dependencies
-        run: pnpm install --frozen-lockfile
+        run: npm ci
       - name: Run Tests
-        run: pnpm test
+        run: npm test
diff --git a/smoke-tests/v2-app-template/.gitignore b/smoke-tests/v2-app-template/.gitignore
@@ -1,13 +1,12 @@
 # compiled output
 /dist/
-/declarations/
 /tmp/
 
 # dependencies
 /node_modules/
 
 # misc
-/.env*
+*.local
 /.pnp*
 /.eslintcache
 /coverage/
diff --git a/smoke-tests/v2-app-template/.prettierrc.mjs b/smoke-tests/v2-app-template/.prettierrc.mjs
@@ -1,6 +1,4 @@
-'use strict';
-
-module.exports = {
+export default {
   plugins: ['prettier-plugin-ember-template-tag'],
   singleQuote: true,
   overrides: [
diff --git a/smoke-tests/v2-app-template/.stylelintrc.mjs b/smoke-tests/v2-app-template/.stylelintrc.mjs
@@ -1,5 +1,3 @@
-'use strict';
-
-module.exports = {
+export default {
   extends: ['stylelint-config-standard'],
 };
diff --git a/smoke-tests/v2-app-template/.template-lintrc.js b/smoke-tests/v2-app-template/.template-lintrc.js
diff --git a/smoke-tests/v2-app-template/.template-lintrc.mjs b/smoke-tests/v2-app-template/.template-lintrc.mjs
@@ -0,0 +1,3 @@
+export default {
+  extends: 'recommended',
+};
diff --git a/smoke-tests/v2-app-template/README.md b/smoke-tests/v2-app-template/README.md
@@ -8,41 +8,38 @@ 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/)
-- [pnpm](https://pnpm.io/)
-- [Ember CLI](https://cli.emberjs.com/release/)
+- [Node.js](https://nodejs.org/) (with npm)
 - [Google Chrome](https://google.com/chrome/)
 
 ## Installation
 
 - `git clone <repository-url>` this repository
 - `cd v2-app-template`
-- `pnpm install`
+- `npm install`
 
 ## Running / Development
 
-- `pnpm start`
+- `npm run start`
 - Visit your app at [http://localhost:4200](http://localhost:4200).
 - Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
 
 ### Code Generators
 
-Make use of the many generators for code, try `ember help generate` for more details
+Make use of the many generators for code, try `npm exec ember help generate` for more details
 
 ### Running Tests
 
-- `pnpm test`
-- `pnpm test:ember --server`
+- `npm run test`
 
 ### Linting
 
-- `pnpm lint`
-- `pnpm lint:fix`
+- `npm run lint`
+- `npm run lint:fix`
 
 ### Building
 
-- `pnpm ember build` (development)
-- `pnpm build` (production)
+- `npm exec vite build --mode development` (development)
+- `npm run build` (production)
 
 ### Deploying
 
@@ -51,7 +48,7 @@ Specify what it takes to deploy your app.
 ## Further Reading / Useful Links
 
 - [ember.js](https://emberjs.com/)
-- [ember-cli](https://cli.emberjs.com/release/)
+- [Vite](https://vite.dev)
 - Development Browser Extensions
   - [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
   - [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
diff --git a/smoke-tests/v2-app-template/app/app.js b/smoke-tests/v2-app-template/app/app.js
@@ -4,6 +4,7 @@ import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from 'v2-app-template/config/environment';
 import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
+import setupInspector from '@embroider/legacy-inspector-support/ember-source-4.12';
 
 if (macroCondition(isDevelopingApp())) {
   importSync('./deprecation-workflow');
@@ -13,6 +14,7 @@ export default class App extends Application {
   modulePrefix = config.modulePrefix;
   podModulePrefix = config.podModulePrefix;
   Resolver = Resolver.withModules(compatModules);
+  inspector = setupInspector(this);
 }
 
 loadInitializers(App, config.modulePrefix, compatModules);
diff --git a/smoke-tests/v2-app-template/app/router.js b/smoke-tests/v2-app-template/app/router.js
@@ -1,4 +1,4 @@
-import EmberRouter from '@ember/routing/router';
+import EmberRouter from '@embroider/router';
 import config from 'v2-app-template/config/environment';
 
 export default class Router extends EmberRouter {
diff --git a/smoke-tests/v2-app-template/app/services/.gitkeep b/smoke-tests/v2-app-template/app/services/.gitkeep
diff --git a/smoke-tests/v2-app-template/app/templates/application.gjs b/smoke-tests/v2-app-template/app/templates/application.gjs
@@ -1,12 +1,8 @@
 import { pageTitle } from 'ember-page-title';
-import { WelcomePage } from 'ember-welcome-page';
 
 <template>
   {{pageTitle "V2AppTemplate"}}
+  <h2 id="title">Welcome to Ember</h2>
 
   {{outlet}}
-
-  {{! The following component displays Ember's default welcome message. }}
-  <WelcomePage />
-  {{! Feel free to remove this! }}
 </template>
diff --git a/smoke-tests/v2-app-template/babel.config.mjs b/smoke-tests/v2-app-template/babel.config.mjs
@@ -1,14 +1,15 @@
-const {
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import {
   babelCompatSupport,
   templateCompatSupport,
-} = require('@embroider/compat/babel');
+} from '@embroider/compat/babel';
 
-module.exports = {
+export default {
   plugins: [
     [
       'babel-plugin-ember-template-compilation',
       {
-        compilerPath: 'ember-source/dist/ember-template-compiler.js',
         enableLegacyModules: [
           'ember-cli-htmlbars',
           'ember-cli-htmlbars-inline-precompile',
@@ -21,14 +22,16 @@ module.exports = {
       'module:decorator-transforms',
       {
         runtime: {
-          import: require.resolve('decorator-transforms/runtime-esm'),
+          import: fileURLToPath(
+            import.meta.resolve('decorator-transforms/runtime-esm'),
+          ),
         },
       },
     ],
     [
       '@babel/plugin-transform-runtime',
       {
-        absoluteRuntime: __dirname,
+        absoluteRuntime: dirname(fileURLToPath(import.meta.url)),
         useESModules: true,
         regenerator: false,
       },
diff --git a/smoke-tests/v2-app-template/config/ember-cli-update.json b/smoke-tests/v2-app-template/config/ember-cli-update.json
@@ -3,14 +3,16 @@
   "packages": [
     {
       "name": "@ember/app-blueprint",
-      "version": "0.6.0",
+      "version": "6.11.1",
       "blueprints": [
         {
           "name": "@ember/app-blueprint",
           "isBaseBlueprint": true,
           "options": [
-            "--pnpm",
-            "--ci-provider=github"
+            "--no-welcome",
+            "--ci-provider=github",
+            "--no-ember-data",
+            "--no-warp-drive"
           ]
         }
       ]
diff --git a/smoke-tests/v2-app-template/config/environment.js b/smoke-tests/v2-app-template/config/environment.js
@@ -7,6 +7,10 @@ module.exports = function (environment) {
     rootURL: '/',
     locationType: 'history',
     EmberENV: {
+              /* The following enables the infrastructure allow us to test as if deprecations
+          have been turned into errors at a specific version.
+        */
+        _OVERRIDE_DEPRECATION_VERSION: process.env.OVERRIDE_DEPRECATION_VERSION,
       EXTEND_PROTOTYPES: false,
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
diff --git a/smoke-tests/v2-app-template/ember-cli-build.js b/smoke-tests/v2-app-template/ember-cli-build.js
@@ -5,16 +5,8 @@ const { compatBuild } = require('@embroider/compat');
 
 module.exports = async function (defaults) {
   const { buildOnce } = await import('@embroider/vite');
+
   let app = new EmberApp(defaults, {
-    emberData: {
-      deprecations: {
-        // New projects can safely leave this deprecation disabled.
-        // If upgrading, to opt-into the deprecated behavior, set this to true and then follow:
-        // https://deprecations.emberjs.com/id/ember-data-deprecate-store-extends-ember-object
-        // before upgrading to Ember Data 6.0
-        DEPRECATE_STORE_EXTENDS_EMBER_OBJECT: false,
-      },
-    },
     // Add options here
   });
 
diff --git a/smoke-tests/v2-app-template/eslint.config.mjs b/smoke-tests/v2-app-template/eslint.config.mjs
@@ -14,31 +14,26 @@
  */
 import globals from 'globals';
 import js from '@eslint/js';
+import { defineConfig, globalIgnores } from 'eslint/config';
 
 import ember from 'eslint-plugin-ember/recommended';
 import eslintConfigPrettier from 'eslint-config-prettier';
 import qunit from 'eslint-plugin-qunit';
 import n from 'eslint-plugin-n';
 
-import babelParser from '@babel/eslint-parser';
+import babelParser from '@babel/eslint-parser/experimental-worker';
 
 const esmParserOptions = {
   ecmaFeatures: { modules: true },
   ecmaVersion: 'latest',
 };
 
-export default [
+export default defineConfig([
+  globalIgnores(['dist/', 'coverage/', '!**/.*']),
   js.configs.recommended,
   eslintConfigPrettier,
   ember.configs.base,
   ember.configs.gjs,
-  /**
-   * Ignores must be in their own object
-   * https://eslint.org/docs/latest/use/configure/ignore
-   */
-  {
-    ignores: ['dist/', 'node_modules/', 'coverage/', '!**/.*'],
-  },
   /**
    * https://eslint.org/docs/latest/use/configure/configuration-files#configuring-linter-options
    */
@@ -72,16 +67,7 @@ export default [
    * CJS node files
    */
   {
-    files: [
-      '**/*.cjs',
-      'config/**/*.js',
-      'testem.js',
-      'testem*.js',
-      '.prettierrc.js',
-      '.stylelintrc.js',
-      '.template-lintrc.js',
-      'ember-cli-build.js',
-    ],
+    files: ['**/*.cjs', 'config/**/*.js', 'ember-cli-build.js'],
     plugins: {
       n,
     },
@@ -112,4 +98,4 @@ export default [
       },
     },
   },
-];
+]);
diff --git a/smoke-tests/v2-app-template/package.json b/smoke-tests/v2-app-template/package.json
diff --git a/smoke-tests/v2-app-template/pnpm-lock.yaml b/smoke-tests/v2-app-template/pnpm-lock.yaml
diff --git a/smoke-tests/v2-app-template/public/robots.txt b/smoke-tests/v2-app-template/public/robots.txt
diff --git a/smoke-tests/v2-app-template/testem.cjs b/smoke-tests/v2-app-template/testem.cjs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export default {`
	`2`	`+ extends: 'recommended',`
	`3`	`+};`