ember-cli · ef4 · Apr 10, 2024 · Apr 6, 2024 · Apr 8, 2024 · Apr 8, 2024
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,19 +7,42 @@ on:
     branches: [ master ]
 
 jobs:
-  build:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: pnpm/action-setup@v2
+      name: Install pnpm
+      with:
+        version: 8
+        run_install: false
+    - name: Use Node.js 20
+      uses: actions/setup-node@v3
+      with:
+        node-version: 20
+        cache: pnpm
+    - run: pnpm install
+    - run: pnpm lint
 
+  build:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [6.x, 8.x, 10.x, 12.x, 14.x, 15.x]
+        node-version: [16.x, 18.x, 20.x]
 
     steps:
     - uses: actions/checkout@v2
+    - uses: pnpm/action-setup@v2
+      name: Install pnpm
+      with:
+        version: 8
+        run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
-        node-version: ${{ matrix.node-version }}
-    - run: yarn install --ignore-engines
-    - run: yarn test
+        node-version:  ${{ matrix.node-version }}
+        cache: pnpm
+    - run: pnpm install
+    - run: pnpm test
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -0,0 +1,33 @@
+import js from '@eslint/js';
+import prettier from 'eslint-plugin-prettier/recommended';
+import node from 'eslint-plugin-n';
+import globals from 'globals';
+
+export default [
+  js.configs.recommended,
+  prettier,
+  node.configs['flat/recommended-module'],
+  {
+    languageOptions: {
+      ecmaVersion: 2022,
+      sourceType: 'module',
+      globals: {
+        ...globals.node,
+      },
+    },
+    rules: {
+      'prettier/prettier': 'error',
+    },
+  },
+  {
+    files: ['tests/**/*.js'],
+    languageOptions: {
+      globals: {
+        ...globals.jest,
+      },
+    },
+  },
+  {
+    ignores: ['fixtures/**'],
+  },
+];
diff --git a/fixtures/assert-expansion/expectation6.js b/fixtures/assert-expansion/expectation6.js
diff --git a/fixtures/debug-flag/expectation6.js b/fixtures/debug-flag/expectation6.js
diff --git a/fixtures/debug-flag/expectation7.js b/fixtures/debug-flag/expectation7.js
@@ -1,5 +1,3 @@
-if (true
-/* DEBUG */
-) {
+if (true/* DEBUG */) {
   console.log('woot');
 }
diff --git a/fixtures/default-export-features/expectation6.js b/fixtures/default-export-features/expectation6.js
diff --git a/fixtures/deprecate-expansion/expectation6.js b/fixtures/deprecate-expansion/expectation6.js
diff --git a/fixtures/development-feature-flags/expectation6.js b/fixtures/development-feature-flags/expectation6.js
diff --git a/fixtures/development-svelte-builds/expectation6.js b/fixtures/development-svelte-builds/expectation6.js
diff --git a/fixtures/development-svelte-builds/expectation7.js b/fixtures/development-svelte-builds/expectation7.js
@@ -1,8 +1,6 @@
 export let PartialComponentManager;
 
-if (false
-/* DEPRECATED_PARTIALS */
-) {
+if (false/* DEPRECATED_PARTIALS */) {
   PartialComponentManager = class {
     constructor() {
       this.isDone = true;
@@ -11,29 +9,21 @@ if (false
   };
 }
 
-if (false
-/* DEPRECATED_PARTIALS */
-&& someOtherThing()) {
+if (false/* DEPRECATED_PARTIALS */&& someOtherThing()) {
   doStuff();
 }
 
-if (!false
-/* DEPRECATED_PARTIALS */
-&& someOtherThing()) {
+if (!false/* DEPRECATED_PARTIALS */&& someOtherThing()) {
   doStuff2();
 }
 
-if (false
-/* DEPRECATED_PARTIALS */
-=== false && someOtherThing()) {
+if (false/* DEPRECATED_PARTIALS */=== false && someOtherThing()) {
   doStuff3();
 }
 
 export let ObjectController;
 
-if (true
-/* DEPRECATED_CONTROLLERS */
-) {
+if (true/* DEPRECATED_CONTROLLERS */) {
   ObjectController = class {
     constructor() {
       this.isDoneAsWell = true;

diff --git a/fixtures/does-not-modify-non-imported-flags/expectation6.js b/fixtures/does-not-modify-non-imported-flags/expectation6.js
diff --git a/fixtures/ember-cli-babel-config-pre-3-27/expectation6.js b/fixtures/ember-cli-babel-config-pre-3-27/expectation6.js
diff --git a/fixtures/ember-cli-babel-config-pre-3-27/expectation7.js b/fixtures/ember-cli-babel-config-pre-3-27/expectation7.js
@@ -1,6 +1,4 @@
-if (true
-/* DEBUG */
-) {
+if (true/* DEBUG */) {
   doStuff();
 }
 

diff --git a/fixtures/ember-cli-babel-config/expectation6.js b/fixtures/ember-cli-babel-config/expectation6.js
diff --git a/fixtures/ember-cli-babel-config/expectation7.js b/fixtures/ember-cli-babel-config/expectation7.js
@@ -1,8 +1,6 @@
 import { warn, assert, deprecate } from '@ember/debug';
 
-if (true
-/* DEBUG */
-) {
+if (true/* DEBUG */) {
   doStuff();
 }
 

diff --git a/fixtures/global-external-helpers/expectation6.js b/fixtures/global-external-helpers/expectation6.js
diff --git a/fixtures/hygenic-debug-injection/expectation6.js b/fixtures/hygenic-debug-injection/expectation6.js
diff --git a/fixtures/inject-env-flags/expectation6.js b/fixtures/inject-env-flags/expectation6.js
diff --git a/fixtures/inject-env-flags/expectation7.js b/fixtures/inject-env-flags/expectation7.js
@@ -1,15 +1,11 @@
 let testing;
 
-if (false
-/* TESTING */
-) {
+if (false/* TESTING */) {
   testing = 'WOOT';
 }
 
 let debug;
 
-if (true
-/* DEBUG */
-) {
+if (true/* DEBUG */) {
   debug = 'DEBUG';
 }
diff --git a/fixtures/inline-feature-flags/expectation6.js b/fixtures/inline-feature-flags/expectation6.js
diff --git a/fixtures/inline-feature-flags/expectation7.js b/fixtures/inline-feature-flags/expectation7.js
@@ -1,27 +1,17 @@
 let a;
 
-if (false
-/* FEATURE_A */
-) {
+if (false/* FEATURE_A */) {
   a = () => console.log('hello');
-} else if (true
-/* FEATURE_B */
-) {
+} else if (true/* FEATURE_B */) {
   a = () => console.log('bye');
 }
 
-if (!false
-/* FEATURE_A */
-) {
+if (!false/* FEATURE_A */) {
   console.log('stuff');
 }
 
-a = false
-/* FEATURE_A */
-? 'hello' : 'bye';
+a = false/* FEATURE_A */ ? 'hello' : 'bye';
 
-if (false
-/* FEATURE_A */
-&& window.foo && window.bar) {
+if (false/* FEATURE_A */&& window.foo && window.bar) {
   console.log('wheeee');
 }