From 66e4504d6ad077bc2e0b956602b601da554d7961 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Tue, 20 May 2025 12:32:55 -0400 Subject: [PATCH 1/6] Set type=module in package.json --- files/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/files/package.json b/files/package.json index 1fb4b1a9..05cf6e9b 100644 --- a/files/package.json +++ b/files/package.json @@ -4,6 +4,7 @@ "private": true, "description": "Small description for <%= name %> goes here", "repository": "", + "type": "module", "license": "MIT", "author": "", "directories": { From 94872e6d93e06a5e9612cd62dc2de1838326d5bc Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Tue, 20 May 2025 12:34:25 -0400 Subject: [PATCH 2/6] Fix file extensions --- files/{.prettierrc.js => .prettierrc.cjs} | 0 files/{.stylelintrc.js => .stylelintrc.cjs} | 0 files/{.template-lintrc.js => .template-lintrc.cjs} | 0 files/{ember-cli-build.js => ember-cli-build.cjs} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename files/{.prettierrc.js => .prettierrc.cjs} (100%) rename files/{.stylelintrc.js => .stylelintrc.cjs} (100%) rename files/{.template-lintrc.js => .template-lintrc.cjs} (100%) rename files/{ember-cli-build.js => ember-cli-build.cjs} (100%) diff --git a/files/.prettierrc.js b/files/.prettierrc.cjs similarity index 100% rename from files/.prettierrc.js rename to files/.prettierrc.cjs diff --git a/files/.stylelintrc.js b/files/.stylelintrc.cjs similarity index 100% rename from files/.stylelintrc.js rename to files/.stylelintrc.cjs diff --git a/files/.template-lintrc.js b/files/.template-lintrc.cjs similarity index 100% rename from files/.template-lintrc.js rename to files/.template-lintrc.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 49e8c79cb5dc14104699f6f25d0513910e8f8435 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Tue, 20 May 2025 12:44:50 -0400 Subject: [PATCH 3/6] Rename config files to cjs and update eslint so that cjs means node --- files/_js_eslint.config.mjs | 11 +---------- files/_ts_eslint.config.mjs | 11 +---------- files/config/{environment.js => environment.cjs} | 0 files/config/{targets.js => targets.cjs} | 0 4 files changed, 2 insertions(+), 20 deletions(-) rename files/config/{environment.js => environment.cjs} (100%) rename files/config/{targets.js => targets.cjs} (100%) 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/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 From dd02f7bbd77d4d1a5a7106f3013522b24dee04a3 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Tue, 20 May 2025 12:46:48 -0400 Subject: [PATCH 4/6] Update our own eslint config --- eslint.config.mjs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 99ee8fef..1eb5230f 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -21,10 +21,20 @@ export default [ }, }, }, + { + files: ['**/*.cjs'], + languageOptions: { + sourceType: 'script', + }, + }, { languageOptions: { globals: globals.node } }, pluginJs.configs.recommended, eslintConfigPrettier, { - ignores: ['tests/fixture/*', 'tests/fixture-ts/*', 'files/ember-cli-build.js'], + ignores: [ + 'tests/fixture/*', + 'tests/fixture-ts/*', + 'files/ember-cli-build.cjs', + ], }, ]; From 1836970ca98ad9e5656dd11cb9bf7595751c3aa1 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Tue, 20 May 2025 12:49:43 -0400 Subject: [PATCH 5/6] Update testem-proxy to cjs --- tests/fixture-ts/{testem-proxy.js => testem-proxy.cjs} | 0 tests/fixture/{testem-proxy.js => testem-proxy.cjs} | 0 2 files changed, 0 insertions(+), 0 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/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 fdc27c4196a5406909b62fc70a4a6db77fcb5320 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Tue, 20 May 2025 13:25:52 -0400 Subject: [PATCH 6/6] Update references in tests of testem*.js to testem*.cjs --- tests/default.test.mjs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/default.test.mjs b/tests/default.test.mjs index be3ce7db..de90dbfe 100644 --- a/tests/default.test.mjs +++ b/tests/default.test.mjs @@ -93,7 +93,7 @@ describe('basic functionality', function () { }); writeFileSync( - join(project.dir(), 'testem-dev.js'), + join(project.dir(), 'testem-dev.cjs'), `module.exports = { test_page: 'tests/index.html?hidepassed', disable_watching: true, @@ -115,7 +115,7 @@ describe('basic functionality', function () { }, }, middleware: [ - require(__dirname + '/testem-proxy.js')('${appURL}') + require(__dirname + '/testem-proxy.cjs')('${appURL}') ], }; `, @@ -124,7 +124,7 @@ describe('basic functionality', function () { let testResult = await project.execa('pnpm', [ 'testem', '--file', - 'testem-dev.js', + 'testem-dev.cjs', 'ci', ]); expect(testResult.exitCode).to.eq(0, testResult.output);