type=module

bin/changelog.cjs

@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 /* eslint-disable no-console */
 
 'use strict';

lib/index.cjs

@@ -156,7 +156,6 @@ const shim = addonV1Shim(path.join(__dirname, '..'), {
           './dist/dev/packages/ember/version.js',
           './dist/dev/packages/route-recognizer/index.js',
           './dist/dev/packages/router_js/index.js',
-          './dist/dev/packages/rsvp/index.js',
         ].map((x) => (isProduction ? x.replace('/dist/dev/', '/dist/prod/') : x)),
         'implicit-test-modules': [
           './dist/dev/packages/ember-testing/index.js',

pnpm-workspace.yaml

@@ -8,3 +8,6 @@ packages:
   - 'packages/*/*/test'
   - 'smoke-tests/*'
   - 'tests/*'
+
+patchedDependencies:
+  ember-cli@6.12.0: patches/ember-cli@6.12.0.patch

rollup.config.mjs

@@ -266,7 +266,6 @@ function rolledUpPackages() {
 export function exposedDependencies() {
   return {
     'backburner.js': require.resolve('backburner.js/dist/es6/backburner.js'),
-    rsvp: require.resolve('rsvp/lib/rsvp.js'),
     'dag-map': require.resolve('dag-map/dag-map.js'),
     router_js: require.resolve('router_js'),
     'route-recognizer': require.resolve('route-recognizer/dist/route-recognizer.es.js'),
@@ -426,6 +425,10 @@ export function resolvePackages(deps, params) {
           return { external: true, id: pkgName };
         }
 
+        if (pkgName === 'rsvp') {
+          return { external: true, id: pkgName };
+        }
+
         if (isExternal?.(source)) {
           return { external: true, id: source };
         }
@@ -550,9 +553,6 @@ function packageMeta() {
 }
 
 const allowedCycles = [
-  // external and not causing problems
-  'node_modules/rsvp/lib/rsvp',
-
   // TODO: these would be good to fix once they're in this repo
   'packages/@glimmer/debug',
   'packages/@glimmer/runtime',

smoke-tests/app-template/eslint.config.mjs

@@ -84,8 +84,8 @@ export default [
       '**/*.cjs',
       'config/**/*.js',
       'tests/dummy/config/**/*.js',
-      'testem.js',
-      'testem*.js',
+      'testem.*',
+      'testem*.*',
       'index.js',
       '.prettierrc.js',
       '.stylelintrc.js',

smoke-tests/v2-app-hello-world-template/vite.config.mjs

@@ -3,6 +3,20 @@ import { extensions, ember } from '@embroider/vite';
 import { babel } from '@rollup/plugin-babel';
 
 export default defineConfig({
+  build: {
+    rolldownOptions: {
+      treeshake: {
+        moduleSideEffects: [
+          { test: /\.css$/, sideEffects: true },
+          { test: /@ember/, sideEffects: false, external: false },
+          { test: /router_js/, sideEffects: false, external: false },
+          { test: /rsvp/, sideEffects: false, external: false },
+          { test: /backburner/, sideEffects: false, external: false },
+        ],
+
+      }
+    }
+  },
   plugins: [
     ember(),
     babel({