ember-cli 5.12.0 → 6.0.0-beta.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # ember-cli Changelog
 
+## v6.0.0-beta.0
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v5.12.0...v6.0.0-beta.0)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v5.12.0...v6.0.0-beta.0)
+
+#### Changelog
+
+- [#10453](https://github.com/ember-cli/ember-cli/pull/10453) [ENHANCEMENT] Allow specifying no CI provider [@deanylev](https://github.com/deanylev)
+- [#10505](https://github.com/ember-cli/ember-cli/pull/10505) use our fork of remove-types with config: false [@mansona](https://github.com/mansona)
+- [#10506](https://github.com/ember-cli/ember-cli/pull/10506) [ENHANCEMENT] Use the official types in the blueprints [@Windvis](https://github.com/Windvis)
+- [#10507](https://github.com/ember-cli/ember-cli/pull/10507) Official types in blueprints amendments [@Windvis](https://github.com/Windvis)
+
+Thank you to all who took the time to contribute!
+
 ## v5.12.0
 
 #### Blueprint Changes

package/blueprints/addon/files/tsconfig.json

@@ -14,5 +14,8 @@
       "<%= addonName %>/test-support/*": ["addon-test-support/*"],
       "*": ["types/*"]
     }
-  }
+  },
+  "types": [
+    "ember-source/types"
+  ]
 }

package/blueprints/addon/index.js

@@ -69,12 +69,12 @@ module.exports = {
     delete contents.devDependencies['ember-cli-htmlbars'];
 
     // 95% of addons don't need ember-data or ember-fetch, make them opt-in instead
-    delete contents.devDependencies['ember-data'];
-    delete contents.devDependencies['@types/ember-data'];
-    delete contents.devDependencies['@types/ember-data__adapter'];
-    delete contents.devDependencies['@types/ember-data__model'];
-    delete contents.devDependencies['@types/ember-data__serializer'];
-    delete contents.devDependencies['@types/ember-data__store'];
+    let deps = Object.keys(contents.devDependencies);
+    for (let depName of deps) {
+      if (depName.includes('ember-data') || depName.includes('warp-drive')) {
+        delete contents.devDependencies[depName];
+      }
+    }
     delete contents.devDependencies['ember-fetch'];
 
     // `@ember/string` is a peer dependency of `ember-data`.
@@ -206,13 +206,17 @@ module.exports = {
   },
 
   files(options) {
-    let appFiles = this.lookupBlueprint(this.appBlueprintName)
-      .files(options)
-      .filter((file) => !['types/ember-data/types/registries/model.d.ts'].includes(file));
+    let appFiles = this.lookupBlueprint(this.appBlueprintName).files(options);
     let addonFilesPath = this.filesPath(this.options);
-    let ignoredCITemplate = this.options.ciProvider !== 'travis' ? '.travis.yml' : '.github';
+    let ignore = [];
+    if (this.options.ciProvider !== 'travis') {
+      ignore.push('.travis.yml');
+    }
+    if (this.options.ciProvider !== 'github') {
+      ignore.push('.github');
+    }
 
-    let addonFiles = walkSync(addonFilesPath, { ignore: [ignoredCITemplate] });
+    let addonFiles = walkSync(addonFilesPath, { ignore });
 
     if (options.packageManager !== 'pnpm') {
       addonFiles = addonFiles.filter((file) => !file.endsWith('.npmrc'));

package/blueprints/app/files/package.json

@@ -26,10 +26,20 @@
     "test:ember": "ember test"
   },
   "devDependencies": {
-    "@babel/core": "^7.25.2",
-    "<% if (!typescript) { %>@babel/eslint-parser": "^7.25.1",
-    "@babel/plugin-proposal-decorators": "^7.24.7",
-    "<% } %>@ember/optional-features": "^2.1.0",
+    "@babel/core": "^7.25.2<% if (!typescript) { %>",
+    "@babel/eslint-parser": "^7.25.1",
+    "@babel/plugin-proposal-decorators": "^7.24.7<% } %><% if (typescript) { %>",
+    "@ember-data/adapter": "~5.4.0-beta.11",
+    "@ember-data/graph": "~5.4.0-beta.11",
+    "@ember-data/json-api": "~5.4.0-beta.11",
+    "@ember-data/legacy-compat": "~5.4.0-beta.11",
+    "@ember-data/model": "~5.4.0-beta.11",
+    "@ember-data/request": "~5.4.0-beta.11",
+    "@ember-data/request-utils": "~5.4.0-beta.11",
+    "@ember-data/serializer": "~5.4.0-beta.11",
+    "@ember-data/store": "~5.4.0-beta.11",
+    "@ember-data/tracking": "~5.4.0-beta.11<% } %>",
+    "@ember/optional-features": "^2.1.0",
     "@ember/string": "^4.0.0",
     "@ember/test-helpers": "^3.3.1<% if (embroider) { %>",
     "@embroider/compat": "^3.6.1",
@@ -40,36 +50,11 @@
     "@glint/environment-ember-loose": "^1.4.0",
     "@glint/template": "^1.4.0",
     "@tsconfig/ember": "^3.0.8",
-    "@types/ember": "^4.0.11",
-    "@types/ember-data": "^4.4.16",
-    "@types/ember-data__adapter": "^4.0.6",
-    "@types/ember-data__model": "^4.0.5",
-    "@types/ember-data__serializer": "^4.0.6",
-    "@types/ember-data__store": "^4.0.7",
-    "@types/ember__application": "^4.0.11",
-    "@types/ember__array": "^4.0.10",
-    "@types/ember__component": "^4.0.22",
-    "@types/ember__controller": "^4.0.12",
-    "@types/ember__debug": "^4.0.8",
-    "@types/ember__destroyable": "^4.0.5",
-    "@types/ember__engine": "^4.0.11",
-    "@types/ember__error": "^4.0.6",
-    "@types/ember__helper": "^4.0.8",
-    "@types/ember__modifier": "^4.0.9",
-    "@types/ember__object": "^4.0.12",
-    "@types/ember__owner": "^4.0.9",
-    "@types/ember__polyfills": "^4.0.6",
-    "@types/ember__routing": "^4.0.22",
-    "@types/ember__runloop": "^4.0.10",
-    "@types/ember__service": "^4.0.9",
-    "@types/ember__string": "^3.16.3",
-    "@types/ember__template": "^4.0.7",
-    "@types/ember__test": "^4.0.6",
-    "@types/ember__utils": "^4.0.7",
     "@types/qunit": "^2.19.10",
     "@types/rsvp": "^4.0.9",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "^7.18.0<% } %>",
+    "@typescript-eslint/parser": "^7.18.0",
+    "@warp-drive/core-types": "~0.0.0-beta.11<% } %>",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^8.2.2",
     "ember-auto-import": "^2.8.1",
@@ -82,14 +67,14 @@
     "ember-cli-inject-live-reload": "^2.1.0<% if (!embroider) { %>",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2<% } %>",
-    "ember-data": "~5.3.8",
+    "ember-data": "~5.4.0-beta.11",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
     "ember-modifier": "^4.2.0",
     "ember-page-title": "^8.2.3",
     "ember-qunit": "^8.1.0",
     "ember-resolver": "^12.0.1",
-    "ember-source": "~5.12.0",
+    "ember-source": "~6.0.0-beta.1",
     "ember-template-lint": "^6.0.0<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.2<% } %>",
     "eslint": "^8.57.1",

package/blueprints/app/files/tsconfig.json

@@ -9,6 +9,21 @@
       "<%= name %>/tests/*": ["tests/*"],
       "<%= name %>/*": ["app/*"],
       "*": ["types/*"]
-    }
+    },
+    "types": [
+      "ember-source/types",
+      "./node_modules/ember-data/unstable-preview-types",
+      "./node_modules/@ember-data/store/unstable-preview-types",
+      "./node_modules/@ember-data/adapter/unstable-preview-types",
+      "./node_modules/@ember-data/graph/unstable-preview-types",
+      "./node_modules/@ember-data/json-api/unstable-preview-types",
+      "./node_modules/@ember-data/legacy-compat/unstable-preview-types",
+      "./node_modules/@ember-data/request/unstable-preview-types",
+      "./node_modules/@ember-data/request-utils/unstable-preview-types",
+      "./node_modules/@ember-data/model/unstable-preview-types",
+      "./node_modules/@ember-data/serializer/unstable-preview-types",
+      "./node_modules/@ember-data/tracking/unstable-preview-types",
+      "./node_modules/@warp-drive/core-types/unstable-preview-types"
+    ]
   }
 }

package/blueprints/app/index.js

@@ -90,7 +90,9 @@ module.exports = {
     let files = this._super();
     if (options.ciProvider !== 'travis') {
       files = files.filter((file) => file !== '.travis.yml');
-    } else {
+    }
+
+    if (options.ciProvider !== 'github') {
       files = files.filter((file) => file.indexOf('.github') < 0);
     }
 

package/lib/commands/addon.js

@@ -26,9 +26,9 @@ module.exports = NewCommand.extend({
     },
     {
       name: 'ci-provider',
-      type: ['travis', 'github'],
+      type: ['travis', 'github', 'none'],
       default: 'github',
-      description: 'Installs the default CI blueprint. Either Travis or Github Actions is supported.',
+      description: 'Installs the optional default CI blueprint. Either Travis or Github Actions is supported.',
     },
     { name: 'typescript', type: Boolean, default: false, description: 'Set up the addon to use TypeScript' },
   ],

package/lib/commands/init.js

@@ -42,9 +42,9 @@ module.exports = Command.extend({
     { name: 'embroider', type: Boolean, default: false, description: 'Enables the build system to use Embroider' },
     {
       name: 'ci-provider',
-      type: ['travis', 'github'],
+      type: ['travis', 'github', 'none'],
       default: 'github',
-      description: 'Installs the default CI blueprint. Either Travis or Github Actions is supported.',
+      description: 'Installs the optional default CI blueprint. Either Travis or Github Actions is supported.',
     },
     { name: 'typescript', type: Boolean, default: false, description: 'Set up the app to use TypeScript' },
   ],

package/lib/commands/new.js

@@ -39,8 +39,8 @@ module.exports = Command.extend({
     { name: 'embroider', type: Boolean, default: false, description: 'Enables the build system to use Embroider' },
     {
       name: 'ci-provider',
-      type: ['travis', 'github'],
-      description: 'Installs the default CI blueprint. Either Travis or Github Actions is supported.',
+      type: ['travis', 'github', 'none'],
+      description: 'Installs the optional default CI blueprint. Either Travis or Github Actions is supported.',
     },
     {
       name: 'interactive',

package/lib/models/blueprint.js

@@ -529,7 +529,7 @@ let Blueprint = CoreObject.extend({
     @return {Promise}
   */
   async removeTypes(extension, code) {
-    const { removeTypes } = require('remove-types');
+    const { removeTypes } = require('babel-remove-types');
 
     if (extension === '.gts') {
       const { Preprocessor } = require('content-tag');

package/lib/tasks/interactive-new.js

@@ -115,6 +115,10 @@ class InteractiveNewTask extends Task {
             name: 'Travis CI',
             value: 'travis',
           },
+          {
+            name: 'None',
+            value: 'none',
+          },
           {
             name: 'Ignore/Skip',
             value: null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "5.12.0",
+  "version": "6.0.0-beta.0",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",
@@ -104,7 +104,7 @@
     "promise-map-series": "^0.3.0",
     "promise.hash.helper": "^1.0.8",
     "quick-temp": "^0.1.8",
-    "remove-types": "^1.0.0",
+    "babel-remove-types": "^1.0.0",
     "resolve": "^1.22.1",
     "resolve-package-path": "^4.0.3",
     "safe-stable-stringify": "^2.4.3",

package/blueprints/app/files/types/ember-data/types/registries/model.d.ts

@@ -1,7 +0,0 @@
-/**
- * Catch-all for ember-data.
- */
-export default interface ModelRegistry {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  [key: string]: any;
-}