Update packages + remove ember-data import #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

rrglomsk merged 25 commits into master from update

Jul 1, 2025

.eslintrc.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,10 +4,13 @@ module.exports = { @@
       root: true,
       parser: '@babel/eslint-parser',
       parserOptions: {
-        ecmaVersion: 2018,
+        ecmaVersion: 'latest',
         sourceType: 'module',
-        ecmaFeatures: {
-          legacyDecorators: true,
+        requireConfigFile: false,
+        babelOptions: {
+          plugins: [
+            ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
+          ],
         },
       },
       plugins: ['ember'],
@@ Expand All / @@ -19,13 +22,19 @@ module.exports = { @@
       env: {
         browser: true,
       },
-      rules: {},
+      rules: {
+        'ember/no-classic-classes': 'off',
+        'ember/no-new-mixins': 'off',
+        'ember/no-runloop': 'off',
+        'ember/use-ember-data-rfc-395-imports': 'off',
+      },
       overrides: [
         // node files
         {
           files: [
             './.eslintrc.js',
             './.prettierrc.js',
+            './.stylelintrc.js',
             './.template-lintrc.js',
             './ember-cli-build.js',
             './index.js',
@@ Expand All / @@ -47,6 +56,10 @@ module.exports = { @@
           // test files
           files: ['tests/**/*-test.{js,ts}'],
           extends: ['plugin:qunit/recommended'],
+          rules: {
+            'qunit/no-conditional-assertions': 'off',
+            'qunit/require-expect': 'off',
+          },
         },
       ],
     };

.github/workflows/ci.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -18,11 +18,11 @@ jobs:
  
        timeout-minutes: 10

        steps:

          - uses: actions/checkout@v3

          - uses: actions/checkout@v4

          - name: Install Node

            uses: actions/setup-node@v3

            uses: actions/setup-node@v4

            with:

              node-version: 16.x

              node-version: 22.x

              cache: npm

          - name: Install Dependencies

            run: npm ci

    @@ -37,10 +37,10 @@ jobs:
  
        timeout-minutes: 10

        steps:

          - uses: actions/checkout@v3

          - uses: actions/setup-node@v3

          - uses: actions/checkout@v4

          - uses: actions/setup-node@v4

            with:

              node-version: 16.x

              node-version: 22.x

              cache: npm

          - name: Install Dependencies

            run: npm install --no-shrinkwrap

    @@ -57,19 +57,20 @@ jobs:
  
          fail-fast: false

          matrix:

            try-scenario:

              - ember-lts-4.8

              - ember-lts-5.8

              - ember-lts-5.12

              - ember-release

              - ember-beta

              - ember-canary

              - embroider-safe

              - embroider-optimized

        steps:

          - uses: actions/checkout@v3

          - uses: actions/checkout@v4

          - name: Install Node

            uses: actions/setup-node@v3

            uses: actions/setup-node@v4

            with:

              node-version: 16.x

              node-version: 22.x

              cache: npm

          - name: Install Dependencies

            run: npm ci

addon/-private/options.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ export default class Options { @@
         attribute,
         options = {},
         defaultOptions = {},
-        globalOptions = {}
+        globalOptions = {},
       ) {
         Object.assign(this, {
           model,
@@ Expand Down @@

addon/decorators/factory.js

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -92,7 +92,7 @@ export default function buildValidations(validations = {}, globalOptions = {}) {
  
                this,

                createCache(() => {

                  return new this.__VALIDATIONS_CLASS__(this);

                })

                }),

              );

            }

    @@ -105,7 +105,7 @@ export default function buildValidations(validations = {}, globalOptions = {}) {
  
            if (!ValidationsClass) {

              ValidationsClass = createValidationsClass(

                Object.getPrototypeOf(this)?.__VALIDATIONS_CLASS__,

                validations

                validations,

              );

            }

            return ValidationsClass;

    @@ -179,12 +179,14 @@ function createValidationsClass(inheritedValidationsClass, validations) {
  
        validationRules = Object.assign(

          validationRules,

          inheritedValidations._validationRules

          inheritedValidations._validationRules,

        );

        validatableAttributes = [

          ...new Set(

            inheritedValidations.validatableAttributes.concat(validatableAttributes)

            inheritedValidations.validatableAttributes.concat(

              validatableAttributes,

            ),

          ),

        ];

      }

    @@ -365,15 +367,15 @@ function createAttrsClass(validatableAttributes) {
  
                        validator.getValue(),

                        options,

                        model,

                        attribute

                      )

                        attribute,

                      ),

                  );

                  return ResultCollection.create({

                    attribute,

                    content: validationResults,

                  });

                })

                }),

              );

            }

    @@ -483,7 +485,7 @@ function createValidatorsFor(attribute, model) {
  
      // We must have an owner to be able to lookup our validators

      if (isNone(owner)) {

        throw new TypeError(

          `[@eflexsystems/ember-tracked-validations] ${model.toString()} is missing a container or owner.`

          `[@eflexsystems/ember-tracked-validations] ${model.toString()} is missing a container or owner.`,

        );

      }

    @@ -562,7 +564,8 @@ function validateAttribute(attribute, value) {
  
        attribute,

        model,

        validators,

        (validator, options) => validator.validate(value, options, model, attribute)

        (validator, options) =>

          validator.validate(value, options, model, attribute),

      );

      let validations = ResultCollection.create({

addon/utils/lookup-validator.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,15 +9,15 @@ @@
     export default function lookupValidator(owner, type) {
       if (!owner) {
         throw new Error(
-          `[@eflexsystems/ember-tracked-validations] \`lookupValidator\` requires owner/container access.`
+          `[@eflexsystems/ember-tracked-validations] \`lookupValidator\` requires owner/container access.`,
         );
       }
       const validatorClass = owner.factoryFor(`validator:${type}`);
       if (!validatorClass) {
         throw new Error(
-          `[@eflexsystems/ember-tracked-validations] Validator not found of type: ${type}.`
+          `[@eflexsystems/ember-tracked-validations] Validator not found of type: ${type}.`,
         );
       }
@@ Expand Down @@

addon/utils/utils.js

-Original file line number
+Diff line change
@@ -1,18 +1,34 @@
     import { isArray } from '@ember/array';
-    // eslint-disable-next-line ember/use-ember-data-rfc-395-imports
-    import DS from 'ember-data';
     import Model from '@ember-data/model';
+    import {
+      macroCondition,
+      dependencySatisfies,
+      importSync,
+    } from '@embroider/macros';
+    let DS;
+    if (macroCondition(dependencySatisfies('ember-data', '*'))) {
+      DS = importSync('ember-data').default;
+    }
     export function isValidatable(value) {
       return value && value instanceof Model ? !value.isDeleted : true;
     }
+    export function isDSManyArray(o) {
+      return !!(
+        DS &&
+        o &&
+        (o instanceof DS.PromiseManyArray || o instanceof DS.ManyArray)
+      );
+    }
     export function getValidatableValue(value) {
       if (!value) {
         return value;
       }
-      if (value && isArray(value) && value instanceof DS.ManyArray) {
+      if (value && isArray(value) && value && isDSManyArray(value)) {
         return value.filter((v) => isValidatable(v));
       }
@@ Expand Down @@

addon/validations/result-collection.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -171,7 +171,7 @@ export default class ValidationsResultCollection { @@
        */
       get warnings() {
         return this._computeErrorCollection(
-          this.content.map((item) => item.warnings)
+          this.content.map((item) => item.warnings),
         );
       }
@@ Expand Down Expand Up / @@ -208,7 +208,7 @@ export default class ValidationsResultCollection { @@
        */
       get errors() {
         return this._computeErrorCollection(
-          this.content.map((item) => item.errors)
+          this.content.map((item) => item.errors),
         );
       }
@@ Expand Down @@

addon/validations/warning-result-collection.js

-Original file line number
+Diff line change
@@ Expand Up @@
           [
             this.content.map((item) => item.errors),
             this.content.map((item) => item.warnings),
-          ].flat(Infinity)
+          ].flat(Infinity),
         );
       }
     }

addon/validators/base.js

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -105,7 +105,7 @@ export default class ValidatorsBase {
  
        this.options = this.buildOptions(

          props.options,

          props.defaultOptions,

          props.globalOptions

          props.globalOptions,

        );

        this.errorMessages = (errorMessages ?? Messages).create();

      }

    @@ -133,7 +133,7 @@ export default class ValidatorsBase {
  
          this.attribute,

          options,

          defaultOptions,

          globalOptions

          globalOptions,

        );

      }

    @@ -283,7 +283,7 @@ export default class ValidatorsBase {
  
        if (unsupportedTypes.includes(type)) {

          throw new Error(

            `[@eflexsystems/ember-tracked-validations] The \`test\` API does not support validators of type: ${type}.`

            `[@eflexsystems/ember-tracked-validations] The \`test\` API does not support validators of type: ${type}.`,

          );

        }

addon/validators/dependent.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ export default class ValidatorsDependent extends Base { @@
         assert(
           `[validator:dependent] [${attribute}] option 'on' is required`,
-          isPresent(on)
+          isPresent(on),
         );
         if (isNone(model)) {
@@ Expand All / @@ -46,7 +46,7 @@ export default class ValidatorsDependent extends Base { @@
         }
         let dependentValidations = (options.on ?? []).map(
-          (dependent) => model.validations.attrs[dependent]
+          (dependent) => model.validations.attrs[dependent],
         );
         if (!isEmpty(dependentValidations.filter((v) => v.isInvalid))) {
@@ Expand Down @@

blueprints/validator-test/mocha-files/tests/unit/validators/__name__-test.js

-Original file line number
+Diff line change
@@ Expand Up @@
       // Replace this with your real tests.
       it('exists', function () {
         const validator = this.owner.lookup(
-          'validator:<%= dasherizedModuleName %>'
+          'validator:<%= dasherizedModuleName %>',
         );
         expect(validator).to.be.ok;
       });
@@ Expand Down @@

blueprints/validator-test/qunit-files/tests/unit/validators/__name__-test.js

-Original file line number
+Diff line change
@@ Expand Up @@
       // Replace this with your real tests.
       test('it exists', function (assert) {
         const validator = this.owner.lookup(
-          'validator:<%= dasherizedModuleName %>'
+          'validator:<%= dasherizedModuleName %>',
         );
         assert.ok(validator);
       });
@@ Expand Down @@

config/ember-try.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,10 +7,18 @@ module.exports = async function () { @@
       return {
         scenarios: [
           {
-            name: 'ember-lts-4.8',
+            name: 'ember-lts-5.8',
             npm: {
               devDependencies: {
-                'ember-source': '~4.8.4',
+                'ember-source': '~5.8.0',
+              },
+            },
+          },
+          {
+            name: 'ember-lts-5.12',
+            npm: {
+              devDependencies: {
+                'ember-source': '~5.12.0',
               },
             },
           },
@@ Expand Down @@

config/release.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ module.exports = { @@
       afterPublish: function (project, versions) {
         runCommand(
-          'ember github-pages:commit --message "Released ' + versions.next + '"'
+          'ember github-pages:commit --message "Released ' + versions.next + '"',
         );
         runCommand('git push origin gh-pages:gh-pages');
       },
@@ Expand Down @@

ember-cli-build.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,10 +8,16 @@ module.exports = function (defaults) { @@
         snippetPaths: ['snippets', 'tests/dummy/snippets'],
         'ember-bootstrap': {
-          bootstrapVersion: 4,
+          bootstrapVersion: 5,
           importBootstrapFont: false,
           importBootstrapCSS: false,
         },
+        emberData: {
+          deprecations: {
+            DEPRECATE_STORE_EXTENDS_EMBER_OBJECT: false,
+          },
+        },
       });
       /*
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update packages + remove ember-data import #4

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!