diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e597f45c..3e4638d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - uses: pnpm/action-setup@v4 - uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 22 cache: pnpm - run: pnpm install --frozen-lockfile - run: pnpm lint @@ -29,7 +29,7 @@ jobs: - uses: pnpm/action-setup@v4 - uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 22 cache: pnpm - run: pnpm install --frozen-lockfile - run: pnpm test diff --git a/eslint.config.mjs b/eslint.config.mjs index 99ee8fef..d2895c57 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -4,7 +4,7 @@ import eslintConfigPrettier from 'eslint-config-prettier'; export default [ { - files: ['**/*.js'], + files: ['**/*.js', '**/*.cjs'], languageOptions: { sourceType: 'commonjs' }, }, { @@ -25,6 +25,6 @@ export default [ 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'], }, ]; 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/_js_babel.config.cjs b/files/_js_babel.config.cjs index 419088af..7ae014f6 100644 --- a/files/_js_babel.config.cjs +++ b/files/_js_babel.config.cjs @@ -6,7 +6,7 @@ const { module.exports = { plugins: [ [ - 'babel-plugin-ember-template-compilation', + 'module:babel-plugin-ember-template-compilation', { compilerPath: 'ember-source/dist/ember-template-compiler.js', enableLegacyModules: [ diff --git a/files/_js_eslint.config.mjs b/files/_js_eslint.config.mjs index 7e5a2d6e..4c6539b2 100644 --- a/files/_js_eslint.config.mjs +++ b/files/_js_eslint.config.mjs @@ -20,7 +20,7 @@ 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 }, diff --git a/files/_ts_babel.config.cjs b/files/_ts_babel.config.cjs index 95729872..1a45565e 100644 --- a/files/_ts_babel.config.cjs +++ b/files/_ts_babel.config.cjs @@ -14,7 +14,7 @@ module.exports = { }, ], [ - 'babel-plugin-ember-template-compilation', + 'module:babel-plugin-ember-template-compilation', { compilerPath: 'ember-source/dist/ember-template-compiler.js', enableLegacyModules: [ diff --git a/files/_ts_eslint.config.mjs b/files/_ts_eslint.config.mjs index 84bb692e..475a6d6c 100644 --- a/files/_ts_eslint.config.mjs +++ b/files/_ts_eslint.config.mjs @@ -23,7 +23,7 @@ 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 parserOptions = { esm: { 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 diff --git a/files/package.json b/files/package.json index 8293c807..4c976a84 100644 --- a/files/package.json +++ b/files/package.json @@ -36,7 +36,7 @@ "@babel/runtime": "^7.27.1", "@babel/plugin-transform-runtime": "^7.27.1<% if (typescript) { %>", "@babel/plugin-transform-typescript": "^7.27.1<% } %>", - "@babel/eslint-parser": "^7.27.1<% if (typescript && emberData) { %>", + "@babel/eslint-parser": "^7.27.5<% if (typescript && emberData) { %>", "@ember-data/adapter": "~5.5.0", "@ember-data/graph": "~5.5.0", "@ember-data/json-api": "~5.5.0", @@ -68,7 +68,7 @@ "@types/rsvp": "^4.0.9<% if (emberData) {%>", "@warp-drive/core-types": "~5.5.0<% }} %><% if (emberData) { %>", "@warp-drive/ember": "~5.5.0<% } %>", - "babel-plugin-ember-template-compilation": "^2.4.1", + "babel-plugin-ember-template-compilation": "^3.0.0", "concurrently": "^9.1.2", "decorator-transforms": "^2.3.0", "ember-auto-import": "^2.10.0", diff --git a/tests/default.test.mjs b/tests/default.test.mjs index 8b9485ff..8fd62c98 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