From a0a525e0958461db5cef86d32531fc132a4516c9 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Fri, 30 May 2025 15:25:58 -0400 Subject: [PATCH 1/4] Declare our CJS files as CJS --- files/config/{environment.js => environment.cjs} | 0 files/config/{targets.js => targets.cjs} | 0 files/{ember-cli-build.js => ember-cli-build.cjs} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename files/config/{environment.js => environment.cjs} (100%) rename files/config/{targets.js => targets.cjs} (100%) rename files/{ember-cli-build.js => ember-cli-build.cjs} (100%) diff --git a/files/config/environment.js b/files/config/environment.cjs similarity index 100% rename from files/config/environment.js rename to files/config/environment.cjs diff --git a/files/config/targets.js b/files/config/targets.cjs similarity index 100% rename from files/config/targets.js rename to files/config/targets.cjs diff --git a/files/ember-cli-build.js b/files/ember-cli-build.cjs similarity index 100% rename from files/ember-cli-build.js rename to files/ember-cli-build.cjs From 553e983eaaf5502a33ad7238518c6da787cf1d83 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Fri, 30 May 2025 15:33:33 -0400 Subject: [PATCH 2/4] Fix more cjs-needing locations --- eslint.config.mjs | 2 +- files/_js_eslint.config.mjs | 11 +---------- files/_ts_eslint.config.mjs | 11 +---------- tests/default.test.mjs | 2 +- .../fixture-ts/{testem-proxy.js => testem-proxy.cjs} | 0 tests/fixture/{testem-proxy.js => testem-proxy.cjs} | 0 6 files changed, 4 insertions(+), 22 deletions(-) rename tests/fixture-ts/{testem-proxy.js => testem-proxy.cjs} (100%) rename tests/fixture/{testem-proxy.js => testem-proxy.cjs} (100%) diff --git a/eslint.config.mjs b/eslint.config.mjs index e4ae552a..9c5d54db 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -28,7 +28,7 @@ export default [ ignores: [ 'tests/fixture/*', 'tests/fixture-ts/*', - 'files/ember-cli-build.js', + 'files/ember-cli-build.cjs', ], }, ]; diff --git a/files/_js_eslint.config.mjs b/files/_js_eslint.config.mjs index 7e5a2d6e..feeeb166 100644 --- a/files/_js_eslint.config.mjs +++ b/files/_js_eslint.config.mjs @@ -72,16 +72,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'], plugins: { n, }, diff --git a/files/_ts_eslint.config.mjs b/files/_ts_eslint.config.mjs index 84bb692e..d984dd22 100644 --- a/files/_ts_eslint.config.mjs +++ b/files/_ts_eslint.config.mjs @@ -92,16 +92,7 @@ export default ts.config( * CJS node files */ { - files: [ - '**/*.cjs', - 'config/**/*.js', - 'testem.js', - 'testem*.js', - '.prettierrc.js', - '.stylelintrc.js', - '.template-lintrc.js', - 'ember-cli-build.js', - ], + files: ['**/*.cjs'], plugins: { n, }, diff --git a/tests/default.test.mjs b/tests/default.test.mjs index 9ec5dcb9..94b49947 100644 --- a/tests/default.test.mjs +++ b/tests/default.test.mjs @@ -131,7 +131,7 @@ describe('basic functionality', function () { }, }, middleware: [ - require(__dirname + '/testem-proxy.js')('${appURL}') + require(__dirname + '/testem-proxy.cjs')('${appURL}') ], }; `, diff --git a/tests/fixture-ts/testem-proxy.js b/tests/fixture-ts/testem-proxy.cjs similarity index 100% rename from tests/fixture-ts/testem-proxy.js rename to tests/fixture-ts/testem-proxy.cjs diff --git a/tests/fixture/testem-proxy.js b/tests/fixture/testem-proxy.cjs similarity index 100% rename from tests/fixture/testem-proxy.js rename to tests/fixture/testem-proxy.cjs From e5ca34ddb442388d380f2b2af719372557f0d31d Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Wed, 18 Jun 2025 18:27:12 -0400 Subject: [PATCH 3/4] Backout of the changes that ember-cli maybe can't handle --- eslint.config.mjs | 2 +- files/_js_eslint.config.mjs | 2 +- files/_ts_eslint.config.mjs | 2 +- files/config/environment.cjs | 48 ------------------- files/config/targets.cjs | 11 ----- ...ember-cli-build.cjs => ember-cli-build.js} | 0 6 files changed, 3 insertions(+), 62 deletions(-) delete mode 100644 files/config/environment.cjs delete mode 100644 files/config/targets.cjs rename files/{ember-cli-build.cjs => ember-cli-build.js} (100%) diff --git a/eslint.config.mjs b/eslint.config.mjs index 9c5d54db..04b8412d 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -28,7 +28,7 @@ export default [ ignores: [ 'tests/fixture/*', 'tests/fixture-ts/*', - 'files/ember-cli-build.cjs', + 'files/ember-cli-build.*', ], }, ]; diff --git a/files/_js_eslint.config.mjs b/files/_js_eslint.config.mjs index feeeb166..bc5ab150 100644 --- a/files/_js_eslint.config.mjs +++ b/files/_js_eslint.config.mjs @@ -72,7 +72,7 @@ export default [ * CJS node files */ { - files: ['**/*.cjs'], + files: ['**/*.cjs', 'ember-cli-build.*', 'config/*'], plugins: { n, }, diff --git a/files/_ts_eslint.config.mjs b/files/_ts_eslint.config.mjs index d984dd22..de87a30f 100644 --- a/files/_ts_eslint.config.mjs +++ b/files/_ts_eslint.config.mjs @@ -92,7 +92,7 @@ export default ts.config( * CJS node files */ { - files: ['**/*.cjs'], + files: ['**/*.cjs', 'ember-cli-build.*', 'config/*'], plugins: { n, }, diff --git a/files/config/environment.cjs b/files/config/environment.cjs deleted file mode 100644 index 10a7d5bc..00000000 --- a/files/config/environment.cjs +++ /dev/null @@ -1,48 +0,0 @@ -'use strict'; - -module.exports = function (environment) { - const ENV = { - modulePrefix: '<%= modulePrefix %>', - environment, - rootURL: '/', - locationType: 'history', - EmberENV: { - EXTEND_PROTOTYPES: false, - FEATURES: { - // Here you can enable experimental features on an ember canary build - // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true - }, - }, - - APP: { - // Here you can pass flags/options to your application instance - // when it is created - }, - }; - - if (environment === 'development') { - // ENV.APP.LOG_RESOLVER = true; - // ENV.APP.LOG_ACTIVE_GENERATION = true; - // ENV.APP.LOG_TRANSITIONS = true; - // ENV.APP.LOG_TRANSITIONS_INTERNAL = true; - // ENV.APP.LOG_VIEW_LOOKUPS = true; - } - - if (environment === 'test') { - // Testem prefers this... - ENV.locationType = 'none'; - - // keep test console output quieter - ENV.APP.LOG_ACTIVE_GENERATION = false; - ENV.APP.LOG_VIEW_LOOKUPS = false; - - ENV.APP.rootElement = '#ember-testing'; - ENV.APP.autoboot = false; - } - - if (environment === 'production') { - // here you can enable a production-specific feature - } - - return ENV; -}; diff --git a/files/config/targets.cjs b/files/config/targets.cjs deleted file mode 100644 index 1e48e059..00000000 --- a/files/config/targets.cjs +++ /dev/null @@ -1,11 +0,0 @@ -'use strict'; - -const browsers = [ - 'last 1 Chrome versions', - 'last 1 Firefox versions', - 'last 1 Safari versions', -]; - -module.exports = { - browsers, -}; diff --git a/files/ember-cli-build.cjs b/files/ember-cli-build.js similarity index 100% rename from files/ember-cli-build.cjs rename to files/ember-cli-build.js From 0535d2fafbdb04d2b4737ed97cbf2bfca899ff97 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Wed, 18 Jun 2025 18:27:17 -0400 Subject: [PATCH 4/4] Backout of the changes that ember-cli maybe can't handle --- files/config/environment.js | 48 +++++++++++++++++++++++++++++++++++++ files/config/targets.js | 11 +++++++++ 2 files changed, 59 insertions(+) create mode 100644 files/config/environment.js create mode 100644 files/config/targets.js diff --git a/files/config/environment.js b/files/config/environment.js new file mode 100644 index 00000000..10a7d5bc --- /dev/null +++ b/files/config/environment.js @@ -0,0 +1,48 @@ +'use strict'; + +module.exports = function (environment) { + const ENV = { + modulePrefix: '<%= modulePrefix %>', + environment, + rootURL: '/', + locationType: 'history', + EmberENV: { + EXTEND_PROTOTYPES: false, + FEATURES: { + // Here you can enable experimental features on an ember canary build + // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true + }, + }, + + APP: { + // Here you can pass flags/options to your application instance + // when it is created + }, + }; + + if (environment === 'development') { + // ENV.APP.LOG_RESOLVER = true; + // ENV.APP.LOG_ACTIVE_GENERATION = true; + // ENV.APP.LOG_TRANSITIONS = true; + // ENV.APP.LOG_TRANSITIONS_INTERNAL = true; + // ENV.APP.LOG_VIEW_LOOKUPS = true; + } + + if (environment === 'test') { + // Testem prefers this... + ENV.locationType = 'none'; + + // keep test console output quieter + ENV.APP.LOG_ACTIVE_GENERATION = false; + ENV.APP.LOG_VIEW_LOOKUPS = false; + + ENV.APP.rootElement = '#ember-testing'; + ENV.APP.autoboot = false; + } + + if (environment === 'production') { + // here you can enable a production-specific feature + } + + return ENV; +}; diff --git a/files/config/targets.js b/files/config/targets.js new file mode 100644 index 00000000..1e48e059 --- /dev/null +++ b/files/config/targets.js @@ -0,0 +1,11 @@ +'use strict'; + +const browsers = [ + 'last 1 Chrome versions', + 'last 1 Firefox versions', + 'last 1 Safari versions', +]; + +module.exports = { + browsers, +};