diff --git a/.ember-cli b/.ember-cli index ee64cfe..4ccb4bf 100644 --- a/.ember-cli +++ b/.ember-cli @@ -5,5 +5,11 @@ Setting `disableAnalytics` to true will prevent any data from being sent. */ - "disableAnalytics": false + "disableAnalytics": false, + + /** + Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript + rather than JavaScript by default, when a TypeScript version of a given blueprint is available. + */ + "isTypeScriptProject": false } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06541de..83762c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,20 +8,21 @@ on: pull_request: {} concurrency: - group: ci-${{ github.head_ref || github.ref }} - cancel-in-progress: true + group: ci-${{ github.head_ref || github.ref }} + cancel-in-progress: true jobs: lint: name: "Lint" runs-on: ubuntu-latest + timeout-minutes: 10 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: - node-version: 12.x + node-version: 14.x cache: npm - name: Install Dependencies run: npm ci @@ -31,13 +32,14 @@ jobs: test: name: "Test" runs-on: ubuntu-latest + timeout-minutes: 10 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: - node-version: 12.x + node-version: 14.x cache: npm - name: Install Dependencies run: npm ci diff --git a/.gitignore b/.gitignore index e325dde..ce6b63d 100644 --- a/.gitignore +++ b/.gitignore @@ -28,5 +28,8 @@ /package-lock.json.ember-try /yarn.lock.ember-try +# broccoli-debug +/DEBUG/ + #custom /data/ diff --git a/config/ember-cli-update.json b/config/ember-cli-update.json index 2c4637b..ddf2eef 100644 --- a/config/ember-cli-update.json +++ b/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "ember-cli", - "version": "4.2.0", + "version": "4.6.0", "blueprints": [ { "name": "app", diff --git a/config/environment.js b/config/environment.js index 17efa0f..7cc9228 100644 --- a/config/environment.js +++ b/config/environment.js @@ -11,10 +11,6 @@ module.exports = function (environment) { // Here you can enable experimental features on an ember canary build // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true }, - EXTEND_PROTOTYPES: { - // Prevent Ember Data from overriding Date.parse. - Date: false, - }, }, APP: { diff --git a/package.json b/package.json index 0d8318c..8692b7e 100644 --- a/package.json +++ b/package.json @@ -29,12 +29,12 @@ }, "devDependencies": { "@ember/optional-features": "^2.0.0", - "@ember/test-helpers": "^2.6.0", + "@ember/test-helpers": "^2.8.1", "@embroider/compat": "^1.6.0", "@embroider/core": "^1.6.0", "@embroider/webpack": "^1.6.0", - "@glimmer/component": "^1.0.4", - "@glimmer/tracking": "^1.0.4", + "@glimmer/component": "^1.1.2", + "@glimmer/tracking": "^1.1.2", "@types/ember": "^3.16.3", "@types/ember__application": "^3.16.2", "@types/ember__array": "^3.16.3", @@ -56,19 +56,18 @@ "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "els-addon-typed-templates": "^4.2.4", - "ember-auto-import": "^2.4.0", - "ember-cli": "~4.2.0", + "ember-auto-import": "^2.4.2", + "ember-cli": "~4.6.0", "ember-cli-app-version": "^5.0.0", "ember-cli-babel": "^7.26.11", - "ember-cli-dependency-checker": "^3.2.0", - "ember-cli-htmlbars": "^6.0.1", + "ember-cli-dependency-checker": "^3.3.1", + "ember-cli-htmlbars": "^6.1.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-postcss": "^8.0.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", "ember-composable-helpers": "^5.0.0", - "ember-data": "~4.2.0", - "ember-export-application-global": "^2.0.1", + "ember-data": "~4.4.0", "ember-fetch": "^8.1.1", "ember-load-initializers": "^2.1.2", "ember-mdi": "file:../ember-mdi-0.10.0.tgz", @@ -79,27 +78,27 @@ "ember-resources": "^4.7.1", "ember-set-helper": "^2.0.1", "ember-sortable": "^3.0.1", - "ember-source": "~4.2.0", - "ember-template-lint": "^4.2.0", + "ember-source": "~4.6.0", + "ember-template-lint": "^4.10.1", "ember-truth-helpers": "^3.0.0", "eslint": "^7.32.0", - "eslint-config-prettier": "^8.4.0", - "eslint-plugin-ember": "^10.5.9", + "eslint-config-prettier": "^8.5.0", + "eslint-plugin-ember": "^11.0.2", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^4.0.0", - "eslint-plugin-qunit": "^7.2.0", + "eslint-plugin-prettier": "^4.2.1", + "eslint-plugin-qunit": "^7.3.1", "loader.js": "^4.7.0", "meilisearch": "^0.25.0", "npm-run-all": "^4.1.5", - "prettier": "^2.5.1", - "qunit": "^2.18.0", + "prettier": "^2.7.1", + "qunit": "^2.19.1", "qunit-dom": "^2.0.0", "tailwindcss": "^3.0.23", "tracked-built-ins": "^2.0.1", - "webpack": "^5.72.0" + "webpack": "^5.74.0" }, "engines": { - "node": "12.* || 14.* || >= 16" + "node": "14.* || >= 16" }, "ember": { "edition": "octane" diff --git a/tests/helpers/.gitkeep b/tests/helpers/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/tests/helpers/index.js b/tests/helpers/index.js new file mode 100644 index 0000000..7f70de8 --- /dev/null +++ b/tests/helpers/index.js @@ -0,0 +1,42 @@ +import { + setupApplicationTest as upstreamSetupApplicationTest, + setupRenderingTest as upstreamSetupRenderingTest, + setupTest as upstreamSetupTest, +} from 'ember-qunit'; + +// This file exists to provide wrappers around ember-qunit's / ember-mocha's +// test setup functions. This way, you can easily extend the setup that is +// needed per test type. + +function setupApplicationTest(hooks, options) { + upstreamSetupApplicationTest(hooks, options); + + // Additional setup for application tests can be done here. + // + // For example, if you need an authenticated session for each + // application test, you could do: + // + // hooks.beforeEach(async function () { + // await authenticateSession(); // ember-simple-auth + // }); + // + // This is also a good place to call test setup functions coming + // from other addons: + // + // setupIntl(hooks); // ember-intl + // setupMirage(hooks); // ember-cli-mirage +} + +function setupRenderingTest(hooks, options) { + upstreamSetupRenderingTest(hooks, options); + + // Additional setup for rendering tests can be done here. +} + +function setupTest(hooks, options) { + upstreamSetupTest(hooks, options); + + // Additional setup for unit tests can be done here. +} + +export { setupApplicationTest, setupRenderingTest, setupTest }; diff --git a/tests/index.html b/tests/index.html index a96eef1..5a9c49f 100644 --- a/tests/index.html +++ b/tests/index.html @@ -2,7 +2,6 @@ - MeilisearchAdmin Tests