Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
4 changes: 2 additions & 2 deletions babel.test.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import baseConfig from './babel.config.mjs';

// eslint-disable-next-line no-redeclare
const require = createRequire(import.meta.url);
const buildDebugMacroPlugin = require('./broccoli/build-debug-macro-plugin.js');
const buildDebugMacroPlugin = require('./broccoli/build-debug-macro-plugin.cjs');
const isProduction = process.env.EMBER_ENV === 'production';

export default {
Expand All @@ -22,7 +22,7 @@ export default {
[
'@babel/preset-env',
{
targets: require('./config/targets.js'),
targets: require('./config/targets.cjs'),
},
],
],
Expand Down
File renamed without changes.
2 changes: 0 additions & 2 deletions bin/changelog.js → bin/changelog.cjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#!/usr/bin/env node

/* eslint-disable no-console */

'use strict';
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions bin/publish-to-s3.mjs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { join } from 'node:path';
import { existsSync, realpathSync, readFileSync } from 'node:fs';
import { S3Client, PutObjectCommand } from '@aws-sdk/client-s3';
import { buildInfo as buildBuildInfo } from '../broccoli/build-info.js';
import projectFileMap from '../config/s3ProjectConfig.js';
import { buildInfo as buildBuildInfo } from '../broccoli/build-info.cjs';
import projectFileMap from '../config/s3ProjectConfig.cjs';

const buildInfo = buildBuildInfo();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ async function run(command, args = []) {
await run('testem', [
'ci',
'-f',
'testem.browserstack.js',
'testem.browserstack.cjs',
'--host',
'127.0.0.1',
'--port',
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

const FEATURES = require('./features');
const FEATURES = require('./features.cjs');

module.exports = function canaryFeatures() {
return [
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion config/browserlists.js → config/browserlists.cjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const allSupportedBrowsers = require('../lib/browsers');
const allSupportedBrowsers = require('../lib/browsers.cjs');

const modernBrowsers = [
'last 1 Chrome versions',
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion config/targets.js → config/targets.cjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
const { allSupportedBrowsers, modernBrowsers } = require('./browserlists');
const { allSupportedBrowsers, modernBrowsers } = require('./browserlists.cjs');

const isProduction = process.env.EMBER_ENV === 'production';
const browsers =
Expand Down
47 changes: 21 additions & 26 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export default [
'qunit/no-commented-tests': 'off',
'qunit/require-expect': 'off',

'disable-features/disable-async-await': 'error',
'disable-features/disable-async-await': 'off',
'disable-features/disable-generator-functions': 'error',
// Doesn't work with package.json#exports
'import/no-unresolved': 'off',
Expand Down Expand Up @@ -232,23 +232,29 @@ export default [
'**/babel.config.mjs',
'**/babel.test.config.mjs',
'node-tests/**/*.js',
'tests/node/**/*.js',
'tests/node/**/*.*',
'smoke-tests/node-template/**/*.js',
'blueprints/**/*.js',
'bin/**/*.js',
'bin/**/*.mjs',
'tests/docs/*.js',
'config/**/*.js',
'lib/**/*.js',
'server/**/*.js',
'**/testem.js',
'**/testem.ci-browsers.js',
'**/testem.browserstack.js',
'broccoli/**/*.js',
'**/ember-cli-build.js',
'bin/**/*',
'tests/docs/*',
'config/**/*',
'lib/**/*',
'server/**/*',
'**/testem.*',
'**/testem.ci-browsers.*',
'**/testem.browserstack.*',
'broccoli/**/*.*',
'**/ember-cli-build.*',
'**/*.cjs',
],
},
{
files: ['lib/index.cjs'],
rules: {
// Seems
'n/no-missing-require': 'off',
},
},
{
files: ['bin/changelog.js'],
rules: {
Expand All @@ -261,19 +267,8 @@ export default [
'**/babel.config.mjs',
'**/babel.test.config.mjs',
'node-tests/**/*.js',
'tests/node/**/*.js',
'tests/node/**/*',
'smoke-tests/node-template/**/*.js',
'blueprints/**/*.js',
'bin/**/*.js',
'bin/**/*.mjs',
'tests/docs/*.js',
'config/**/*.js',
'lib/**/*.js',
'server/**/*.js',
'**/testem.js',
'**/testem.ci-browsers.js',
'**/testem.browserstack.js',
'broccoli/**/*.js',
'**/ember-cli-build.js',
'**/*.cjs',
],
Expand Down Expand Up @@ -303,7 +298,7 @@ export default [
},
},
{
files: ['tests/docs/**/*.js', 'tests/node/**/*.js'],
files: ['tests/docs/**/*', 'tests/node/**/*'],

languageOptions: {
globals: {
Expand Down
File renamed without changes.
5 changes: 2 additions & 3 deletions lib/index.js → lib/index.cjs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict';

const path = require('path');
const Overrides = require('./overrides');
const SupportedBrowsers = require('./browsers');
const Overrides = require('./overrides.cjs');
const SupportedBrowsers = require('./browsers.cjs');

const isProduction = process.env.EMBER_ENV === 'production';

Expand Down Expand Up @@ -157,7 +157,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',
Expand Down
File renamed without changes.
Loading
Loading