From ea701d020e22ab4cd4dc9fad74684a1bd052e2d1 Mon Sep 17 00:00:00 2001 From: Jeldrik Hanschke Date: Mon, 16 Oct 2023 23:01:50 +0200 Subject: [PATCH 1/3] upgrade Ember CLI and blueprints to v4.4 --- .ember-cli | 8 +- .eslintignore | 3 + .eslintrc.js | 2 +- .github/workflows/ci.yml | 45 +++++++++ .gitignore | 7 ++ .prettierignore | 4 + README.md | 8 ++ app/index.html | 1 - config/ember-cli-update.json | 2 +- package.json | 27 +++-- tests/helpers/.gitkeep | 0 tests/helpers/index.js | 42 ++++++++ tests/index.html | 1 - yarn.lock | 184 ++++++++++++++++++----------------- 14 files changed, 227 insertions(+), 107 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 tests/helpers/.gitkeep create mode 100644 tests/helpers/index.js diff --git a/.ember-cli b/.ember-cli index ee64cfed2..4ccb4bf43 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/.eslintignore b/.eslintignore index 0277a45fd..478473dc5 100644 --- a/.eslintignore +++ b/.eslintignore @@ -20,4 +20,7 @@ # ember-try /.node_modules.ember-try/ /bower.json.ember-try +/npm-shrinkwrap.json.ember-try /package.json.ember-try +/package-lock.json.ember-try +/yarn.lock.ember-try diff --git a/.eslintrc.js b/.eslintrc.js index 15267b0f9..a16af5890 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -58,7 +58,7 @@ module.exports = { }, }, { - // Test files: + // test files files: ['tests/**/*-test.{js,ts}'], extends: ['plugin:qunit/recommended'], rules: { diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..6287d3264 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,45 @@ +name: CI + +on: + push: + branches: + - main + - master + pull_request: {} + +concurrency: + group: ci-${{ github.head_ref || github.ref }} + cancel-in-progress: true + +jobs: + lint: + name: "Lint" + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Install Node + uses: actions/setup-node@v3 + with: + node-version: 12.x + cache: yarn + - name: Install Dependencies + run: yarn install --frozen-lockfile + - name: Lint + run: yarn lint + + test: + name: "Test" + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Install Node + uses: actions/setup-node@v3 + with: + node-version: 12.x + cache: yarn + - name: Install Dependencies + run: yarn install --frozen-lockfile + - name: Run Tests + run: yarn test diff --git a/.gitignore b/.gitignore index fac8b59b0..35a053797 100644 --- a/.gitignore +++ b/.gitignore @@ -27,8 +27,15 @@ # ember-try /.node_modules.ember-try/ /bower.json.ember-try +/npm-shrinkwrap.json.ember-try /package.json.ember-try +/package-lock.json.ember-try +/yarn.lock.ember-try + +# broccoli-debug +/DEBUG/ + # BrowserStack /*.pid /*.log diff --git a/.prettierignore b/.prettierignore index 922165552..4178fd571 100644 --- a/.prettierignore +++ b/.prettierignore @@ -14,8 +14,12 @@ /coverage/ !.* .eslintcache +.lint-todo/ # ember-try /.node_modules.ember-try/ /bower.json.ember-try +/npm-shrinkwrap.json.ember-try /package.json.ember-try +/package-lock.json.ember-try +/yarn.lock.ember-try diff --git a/README.md b/README.md index 059cb6da7..604e981d0 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,15 @@ Croodle is an end-to-end encrypted web application to schedule a date or to do a This is an alpha version. Changes could brake backward compatibility. It is also not well tested and some features are missing. It is not meant for productive use yet. +<<<<<<< HEAD Croodle is inspired by [PrivateBin](https://github.com/PrivateBin/PrivateBin) and, of course, by Doodle. +======= +* [Git](https://git-scm.com/) +* [Node.js](https://nodejs.org/) +* [Yarn](https://yarnpkg.com/) +* [Ember CLI](https://cli.emberjs.com/release/) +* [Google Chrome](https://google.com/chrome/) +>>>>>>> e9ac386 (v3.28.6...v4.4.1) ## Security notice diff --git a/app/index.html b/app/index.html index 9609b0190..da481770a 100644 --- a/app/index.html +++ b/app/index.html @@ -2,7 +2,6 @@ - Croodle diff --git a/config/ember-cli-update.json b/config/ember-cli-update.json index ca06f88e7..cb65aad59 100644 --- a/config/ember-cli-update.json +++ b/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "ember-cli", - "version": "3.28.6", + "version": "4.4.1", "blueprints": [ { "name": "app", diff --git a/package.json b/package.json index 0f1d3689f..26cd7fc1b 100644 --- a/package.json +++ b/package.json @@ -27,16 +27,16 @@ "devDependencies": { "@ember/optional-features": "^2.0.0", "@ember/string": "^3.1.1", - "@ember/test-helpers": "^2.6.0", - "@glimmer/component": "^1.0.4", - "@glimmer/tracking": "^1.0.4", + "@ember/test-helpers": "^2.7.0", + "@glimmer/component": "^1.1.2", + "@glimmer/tracking": "^1.1.2", "babel-eslint": "^10.1.0", "bootstrap": "^4.3.1", "broccoli-asset-rev": "^3.0.0", - "ember-auto-import": "^2.0.0", + "ember-auto-import": "^2.4.1", "ember-bootstrap": "^5.0.0", "ember-classic-decorator": "^3.0.0", - "ember-cli": "~3.28.6", + "ember-cli": "~4.4.1", "ember-cli-app-version": "^6.0.0", "ember-cli-babel": "^8.0.0", "ember-cli-browser-navigation-button-test-helper": "^0.3.0", @@ -44,10 +44,10 @@ "ember-cli-bundlesize": "^0.3.0", "ember-cli-clipboard": "^0.16.0", "ember-cli-content-security-policy": "^2.0.0", - "ember-cli-dependency-checker": "^3.2.0", + "ember-cli-dependency-checker": "^3.3.1", "ember-cli-deprecation-workflow": "^2.0.0", "ember-cli-flash": "^4.0.0", - "ember-cli-htmlbars": "^6.0.0", + "ember-cli-htmlbars": "^6.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-mirage": "^3.0.0", "ember-cli-page-object": "^2.0.0", @@ -63,7 +63,6 @@ "ember-intl": "^5.0.0", "ember-load-initializers": "^2.1.2", "ember-math-helpers": "^3.0.0", - "ember-maybe-import-regenerator": "^1.0.0", "ember-modifier": "^4.0.0", "ember-page-title": "^8.0.0", "ember-power-calendar": "^0.20.0", @@ -71,30 +70,30 @@ "ember-qunit": "^6.0.0", "ember-resolver": "^11.0.0", "ember-source": "~4.4.0", - "ember-template-lint": "^4.0.0", + "ember-template-lint": "^4.8.0", "ember-test-selectors": "^6.0.0", "ember-truth-helpers": "^4.0.0", "eslint": "^7.32.0", - "eslint-config-prettier": "^8.3.0", + "eslint-config-prettier": "^8.5.0", "eslint-plugin-ember": "^11.0.0", "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^4.0.0", - "eslint-plugin-qunit": "^6.2.0", + "eslint-plugin-qunit": "^7.2.0", "fs-extra": "^9.0.0", "lerna-changelog": "^1.0.0", "loader.js": "^4.7.0", "miragejs": "^0.1.47", "npm-run-all": "^4.1.5", "open-iconic": "^1.1.1", - "prettier": "^2.5.1", - "qunit": "^2.17.2", + "prettier": "^2.6.2", + "qunit": "^2.19.1", "qunit-dom": "^3.0.0", "release-it": "^16.0.0", "release-it-lerna-changelog": "^5.0.0", "sass": "^1.19.0", "sjcl": "^1.0.8", "tracked-built-ins": "^3.3.0", - "webpack": "^5.0.0" + "webpack": "^5.72.1" }, "engines": { "node": "18.* || >=20" diff --git a/tests/helpers/.gitkeep b/tests/helpers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/helpers/index.js b/tests/helpers/index.js new file mode 100644 index 000000000..7f70de80f --- /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 e54aeca58..1bd2e3376 100644 --- a/tests/index.html +++ b/tests/index.html @@ -2,7 +2,6 @@ - Croodle Tests diff --git a/yarn.lock b/yarn.lock index 69bc167d3..c5bb6e75c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -35,7 +35,7 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.2.tgz#6a12ced93455827037bfb5ed8492820d60fc32cc" integrity sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ== -"@babel/core@^7.0.0", "@babel/core@^7.1.6", "@babel/core@^7.12.0", "@babel/core@^7.13.8", "@babel/core@^7.16.10", "@babel/core@^7.16.7", "@babel/core@^7.22.20", "@babel/core@^7.3.4": +"@babel/core@^7.0.0", "@babel/core@^7.1.6", "@babel/core@^7.12.0", "@babel/core@^7.16.10", "@babel/core@^7.16.7", "@babel/core@^7.17.9", "@babel/core@^7.22.20", "@babel/core@^7.3.4": version "7.23.2" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.2.tgz#ed10df0d580fff67c5f3ee70fd22e2e4c90a9f94" integrity sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ== @@ -640,7 +640,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.20.11", "@babel/plugin-transform-modules-amd@^7.23.0": +"@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.16.7", "@babel/plugin-transform-modules-amd@^7.20.11", "@babel/plugin-transform-modules-amd@^7.23.0": version "7.23.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz#05b2bc43373faa6d30ca89214731f76f966f3b88" integrity sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw== @@ -1010,7 +1010,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.21.0", "@babel/runtime@^7.8.4": +"@babel/runtime@^7.14.0", "@babel/runtime@^7.21.0", "@babel/runtime@^7.8.4": version "7.23.2" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885" integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg== @@ -1247,7 +1247,7 @@ dependencies: ember-cli-babel "^7.26.6" -"@ember/test-helpers@^2.6.0": +"@ember/test-helpers@^2.7.0": version "2.9.4" resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.9.4.tgz#985022e9ba05cfc918bcf08b77cbb355f85b723e" integrity sha512-z+Qs1NYWyIVDmrY6WdmOS5mdG1lJ5CFfzh6dRhLfs9lq45deDaDrVNcaCYhnNeJZTvUBK2XR2SvPcZm0RloXdA== @@ -2617,7 +2617,7 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -anymatch@~3.1.2: +anymatch@^3.1.1, anymatch@~3.1.2: version "3.1.3" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== @@ -3946,7 +3946,7 @@ broccoli-terser-sourcemap@^4.1.0: walk-sync "^2.2.0" workerpool "^6.0.0" -broccoli@^3.5.1: +broccoli@^3.5.2: version "3.5.2" resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-3.5.2.tgz#60921167d57b43fb5bad527420d62fe532595ef4" integrity sha512-sWi3b3fTUSVPDsz5KsQ5eCQNVAtLgkIE/HYFkEZXR/07clqmd4E/gFiuwSaqa9b+QTXc1Uemfb7TVWbEIURWDg== @@ -4425,12 +4425,7 @@ chrome-trace-event@^1.0.2: resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== -ci-info@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" - integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== - -ci-info@^3.2.0, ci-info@^3.4.0: +ci-info@^3.2.0, ci-info@^3.3.0, ci-info@^3.4.0: version "3.9.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4" integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ== @@ -5406,7 +5401,7 @@ ember-auto-import@^1.11.3, ember-auto-import@^1.5.3: walk-sync "^0.3.3" webpack "^4.43.0" -ember-auto-import@^2.0.0, ember-auto-import@^2.2.3, ember-auto-import@^2.2.4, ember-auto-import@^2.4.0, ember-auto-import@^2.4.1, ember-auto-import@^2.6.0, ember-auto-import@^2.6.3: +ember-auto-import@^2.2.3, ember-auto-import@^2.2.4, ember-auto-import@^2.4.0, ember-auto-import@^2.4.1, ember-auto-import@^2.6.0, ember-auto-import@^2.6.3: version "2.6.3" resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.6.3.tgz#f18d1b93dd10b08ba5496518436f9d56dd4e000a" integrity sha512-uLhrRDJYWCRvQ4JQ1e64XlSrqAKSd6PXaJ9ZsZI6Tlms9T4DtQFxNXasqji2ZRJBVrxEoLCRYX3RTldsQ0vNGQ== @@ -5655,7 +5650,7 @@ ember-cli-content-security-policy@^2.0.0: ember-cli-babel "^7.26.3" ember-cli-version-checker "^5.0.2" -ember-cli-dependency-checker@^3.2.0: +ember-cli-dependency-checker@^3.3.1: version "3.3.2" resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-3.3.2.tgz#94ed7e8e3d47e494082eb9ccfaa489d603ab6017" integrity sha512-PwkrW5oYsdPWwt+0Tojufmv/hxVETTjkrEdK7ANQB2VSnqpA5UcYubwpQM9ONuR2J8wyNDMwEHlqIrk/FYtBsQ== @@ -5972,18 +5967,18 @@ ember-cli-version-checker@^5.0.2, ember-cli-version-checker@^5.1.1, ember-cli-ve semver "^7.3.4" silent-error "^1.1.1" -ember-cli@~3.28.6: - version "3.28.6" - resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.28.6.tgz#477a6a134501639d6cb03da6746158501c41efce" - integrity sha512-aGHIDXM5KujhU+tHyfp1X5bUp3yj47sIWI0zgybyIw6vv6ErAu/eKWWMSib5PF8cQDdXG9vttBcXnvQ4QBNIPQ== +ember-cli@~4.4.1: + version "4.4.1" + resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-4.4.1.tgz#6cd8e571808cf283a780c5c0f5eeeef6c11e055e" + integrity sha512-+38vmpKrAYTLXzmirFQGQ/9QJHJHhNX4F1/qKh+njdZnkPHDfvqxTdewXw+6+pF68LR+/26cw1bxaWxq52/48A== dependencies: - "@babel/core" "^7.13.8" - "@babel/plugin-transform-modules-amd" "^7.12.1" + "@babel/core" "^7.17.9" + "@babel/plugin-transform-modules-amd" "^7.16.7" amd-name-resolver "^1.3.1" babel-plugin-module-resolver "^4.1.0" bower-config "^1.4.3" bower-endpoint-parser "0.2.2" - broccoli "^3.5.1" + broccoli "^3.5.2" broccoli-amd-funnel "^2.0.1" broccoli-babel-transpiler "^7.8.0" broccoli-builder "^0.18.14" @@ -5991,17 +5986,17 @@ ember-cli@~3.28.6: broccoli-config-loader "^1.0.1" broccoli-config-replace "^1.1.2" broccoli-debug "^0.6.5" - broccoli-funnel "^3.0.5" + broccoli-funnel "^3.0.8" broccoli-funnel-reducer "^1.0.0" - broccoli-merge-trees "^3.0.2" + broccoli-merge-trees "^4.2.0" broccoli-middleware "^2.1.1" broccoli-slow-trees "^3.1.0" - broccoli-source "^3.0.0" + broccoli-source "^3.0.1" broccoli-stew "^3.0.0" calculate-cache-key-for-tree "^2.0.0" capture-exit "^2.0.0" - chalk "^4.1.0" - ci-info "^2.0.0" + chalk "^4.1.2" + ci-info "^3.3.0" clean-base-url "^1.0.0" compression "^1.7.4" configstore "^5.0.1" @@ -6016,10 +6011,10 @@ ember-cli@~3.28.6: ember-cli-string-utils "^1.1.0" ember-source-channel-url "^3.0.0" ensure-posix-path "^1.1.1" - execa "^5.0.0" + execa "^5.1.1" exit "^0.1.2" - express "^4.17.1" - filesize "^6.1.0" + express "^4.17.2" + filesize "^8.0.6" find-up "^5.0.0" find-yarn-workspace-root "^2.0.0" fixturify-project "^2.1.1" @@ -6027,46 +6022,47 @@ ember-cli@~3.28.6: fs-tree-diff "^2.0.1" get-caller-file "^2.0.5" git-repo-info "^2.1.1" - glob "^7.1.6" + glob "^7.2.0" heimdalljs "^0.2.6" - heimdalljs-fs-monitor "^1.1.0" + heimdalljs-fs-monitor "^1.1.1" heimdalljs-graph "^1.0.0" heimdalljs-logger "^0.1.10" http-proxy "^1.18.1" - inflection "^1.12.0" + inflection "^1.13.1" is-git-url "^1.0.0" - is-language-code "^2.0.0" - isbinaryfile "^4.0.6" + is-language-code "^3.1.0" + isbinaryfile "^4.0.8" js-yaml "^3.14.0" - json-stable-stringify "^1.0.1" leek "0.0.24" lodash.template "^4.5.0" - markdown-it "^12.0.4" + markdown-it "^12.2.0" markdown-it-terminal "0.2.1" - minimatch "^3.0.4" + minimatch "^5.0.1" morgan "^1.10.0" nopt "^3.0.6" - npm-package-arg "^8.1.1" + npm-package-arg "^8.1.5" p-defer "^3.0.0" portfinder "^1.0.28" promise-map-series "^0.3.0" - promise.hash.helper "^1.0.7" + promise.hash.helper "^1.0.8" quick-temp "^0.1.8" + remove-types "^1.0.0" resolve "^1.20.0" resolve-package-path "^3.1.0" - sane "^4.1.0" - semver "^7.3.4" + safe-stable-stringify "^2.3.1" + sane "^5.0.1" + semver "^7.3.5" silent-error "^1.1.1" - sort-package-json "^1.49.0" + sort-package-json "^1.55.0" symlink-or-copy "^1.3.1" temp "0.9.4" - testem "^3.2.0" + testem "^3.6.0" tiny-lr "^2.0.0" tree-sync "^2.1.0" uuid "^8.3.2" walk-sync "^2.2.0" - watch-detector "^1.0.0" - workerpool "^6.1.4" + watch-detector "^1.0.1" + workerpool "^6.2.0" yam "^1.0.0" ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0, ember-compatibility-helpers@^1.2.1, ember-compatibility-helpers@^1.2.5: @@ -6308,16 +6304,6 @@ ember-math-helpers@^3.0.0: ember-cli-babel "^7.26.11" ember-cli-htmlbars "^6.1.1" -ember-maybe-import-regenerator@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ember-maybe-import-regenerator/-/ember-maybe-import-regenerator-1.0.0.tgz#c05453dfd3b65dbec2b569612b01ae70b672dd7e" - integrity sha512-wtjgjEV0Hk4fgiAwFjOfPrGWfmFrbRW3zgNZO4oA3H5FlbMssMvWuR8blQ3QSWYHODVK9r+ThsRAs8lG4kbxqA== - dependencies: - broccoli-funnel "^2.0.1" - broccoli-merge-trees "^3.0.0" - ember-cli-babel "^7.26.6" - regenerator-runtime "^0.13.2" - ember-modifier-manager-polyfill@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/ember-modifier-manager-polyfill/-/ember-modifier-manager-polyfill-1.2.0.tgz#cf4444e11a42ac84f5c8badd85e635df57565dda" @@ -6520,7 +6506,7 @@ ember-template-imports@^3.4.0, ember-template-imports@^3.4.2: string.prototype.matchall "^4.0.6" validate-peer-dependencies "^1.1.0" -ember-template-lint@^4.0.0: +ember-template-lint@^4.8.0: version "4.18.2" resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-4.18.2.tgz#18e5e5fc6ea7301e7a075e024008271d2a781e1e" integrity sha512-yI8kQ8IQ2x5HVq0tQAISXABOHr0Is5sAg6rwceO6M8CYozq7HMxUPEj0VbdcbyIE70SWw/8d24M1rBI4km544Q== @@ -6879,7 +6865,7 @@ escodegen@^2.1.0: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@^8.3.0: +eslint-config-prettier@^8.5.0: version "8.10.0" resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz#3a06a662130807e2502fc3ff8b4143d8a0658e11" integrity sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg== @@ -6930,10 +6916,10 @@ eslint-plugin-prettier@^4.0.0: dependencies: prettier-linter-helpers "^1.0.0" -eslint-plugin-qunit@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-6.2.0.tgz#f4efda29da99523e560848d9592c39c0590c308d" - integrity sha512-KvPmkIC2MHpfRxs/r8WUeeGkG6y+3qwSi2AZIBtjcM/YG6Z3k0GxW5Hbu3l7X0TDhljVCeBb9Q5puUkHzl83Mw== +eslint-plugin-qunit@^7.2.0: + version "7.3.4" + resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-7.3.4.tgz#2465b6f29ff56fbe9b741bde2740dec109ee9bec" + integrity sha512-EbDM0zJerH9zVdUswMJpcFF7wrrpvsGuYfNexUpa5hZkkdFhaFcX+yD+RSK4Nrauw4psMGlcqeWUMhaVo+Manw== dependencies: eslint-utils "^3.0.0" requireindex "^1.2.0" @@ -7123,7 +7109,7 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.1" -exec-sh@^0.3.2: +exec-sh@^0.3.2, exec-sh@^0.3.4: version "0.3.6" resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc" integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w== @@ -7226,7 +7212,7 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -express@^4.10.7, express@^4.17.1: +express@^4.10.7, express@^4.17.2: version "4.18.2" resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== @@ -7398,7 +7384,7 @@ faye-websocket@^0.11.3: dependencies: websocket-driver ">=0.5.1" -fb-watchman@^2.0.0: +fb-watchman@^2.0.0, fb-watchman@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c" integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA== @@ -7452,10 +7438,10 @@ file-uri-to-path@1.0.0: resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== -filesize@^6.1.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.4.0.tgz#914f50471dd66fdca3cefe628bd0cde4ef769bcd" - integrity sha512-mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ== +filesize@^8.0.6: + version "8.0.7" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-8.0.7.tgz#695e70d80f4e47012c132d57a059e80c6b580bd8" + integrity sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ== fill-range@^4.0.0: version "4.0.0" @@ -8080,7 +8066,7 @@ glob@^5.0.10: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.0.4, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.0.0, glob@^7.0.4, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -8417,7 +8403,7 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.1" -heimdalljs-fs-monitor@^1.1.0: +heimdalljs-fs-monitor@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/heimdalljs-fs-monitor/-/heimdalljs-fs-monitor-1.1.1.tgz#bb4021007e88484202402cdf594e3962d70dc4f4" integrity sha512-BHB8oOXLRlrIaON0MqJSEjGVPDyqt2Y6gu+w2PaEZjrCxeVtZG7etEZp7M4ZQ80HNvnr66KIQ2lot2qdeG8HgQ== @@ -8708,7 +8694,7 @@ inflected@^2.0.4: resolved "https://registry.yarnpkg.com/inflected/-/inflected-2.1.0.tgz#2816ac17a570bbbc8303ca05bca8bf9b3f959687" integrity sha512-hAEKNxvHf2Iq3H60oMBHkB4wl5jn3TPF3+fXek/sRwAB5gP9xWs4r7aweSF95f99HFoz69pnZTcu8f0SIHV18w== -inflection@^1.12.0, inflection@^1.13.2, inflection@~1.13.1: +inflection@^1.13.1, inflection@^1.13.2, inflection@~1.13.1: version "1.13.4" resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.13.4.tgz#65aa696c4e2da6225b148d7a154c449366633a32" integrity sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw== @@ -9089,10 +9075,12 @@ is-lambda@^1.0.1: resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== -is-language-code@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-language-code/-/is-language-code-2.0.0.tgz#6f4d59c551d73b98c45cf9f1d3ce65cee060e65b" - integrity sha512-6xKmRRcP2YdmMBZMVS3uiJRPQgcMYolkD6hFw2Y4KjqyIyaJlCGxUt56tuu0iIV8q9r8kMEo0Gjd/GFwKrgjbw== +is-language-code@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/is-language-code/-/is-language-code-3.1.0.tgz#b2386b49227e7010636f16d0c2c681ca40136ab5" + integrity sha512-zJdQ3QTeLye+iphMeK3wks+vXSRFKh68/Pnlw7aOfApFSEIOhYa8P9vwwa6QrImNNBMJTiL1PpYF0f4BxDuEgA== + dependencies: + "@babel/runtime" "^7.14.0" is-map@^2.0.2: version "2.0.2" @@ -9296,7 +9284,7 @@ isarray@^2.0.5: resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== -isbinaryfile@^4.0.6: +isbinaryfile@^4.0.8: version "4.0.10" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== @@ -10211,7 +10199,7 @@ markdown-it-terminal@0.2.1: lodash.merge "^4.6.2" markdown-it "^8.3.1" -markdown-it@^12.0.4: +markdown-it@^12.2.0: version "12.3.2" resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90" integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg== @@ -11075,7 +11063,7 @@ npm-git-info@^1.0.3: resolved "https://registry.yarnpkg.com/npm-git-info/-/npm-git-info-1.0.3.tgz#a933c42ec321e80d3646e0d6e844afe94630e1d5" integrity sha512-i5WBdj4F/ULl16z9ZhsJDMl1EQCMQhHZzBwNnKL2LOA+T8IHNeRkLCVz9uVV9SzUdGTbDq+1oXhIYMe+8148vw== -npm-package-arg@^8.1.1: +npm-package-arg@^8.1.5: version "8.1.5" resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44" integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q== @@ -11848,7 +11836,7 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^2.5.1: +prettier@^2.5.1, prettier@^2.6.2: version "2.8.8" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== @@ -11937,7 +11925,7 @@ promise.allsettled@1.0.7: get-intrinsic "^1.2.1" iterate-value "^1.0.2" -promise.hash.helper@^1.0.7: +promise.hash.helper@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/promise.hash.helper/-/promise.hash.helper-1.0.8.tgz#8c5fa0570f6f96821f52364fd72292b2c5a114f7" integrity sha512-KYcnXctWUWyVD3W3Ye0ZDuA1N8Szrh85cVCxpG6xYrOk/0CttRtYCmU30nWsUch0NuExQQ63QXvzRE6FLimZmg== @@ -12097,7 +12085,7 @@ qunit-dom@^3.0.0: resolved "https://registry.yarnpkg.com/qunit-dom/-/qunit-dom-3.0.0.tgz#326e83e4ce8d492bdff91a8cb4d5b54a20917fcc" integrity sha512-rqGZ9ZgOvtOY+Ph2ElCJ4pRIHouMZmI3DWK35Xr3x3c17/gIwOHHyKAQk6XetqhqepS6p+oXvK6Bx1uZu5jJuw== -qunit@^2.17.2: +qunit@^2.19.1: version "2.20.0" resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.20.0.tgz#66a404a0142781316bbda91535869ce5671555b1" integrity sha512-N8Fp1J55waE+QG1KwX2LOyqulZUToRrrPBqDOfYfuAMkEglFL15uwvmH1P4Tq/omQ/mGbBI8PEB3PhIfvUb+jg== @@ -12273,7 +12261,7 @@ regenerator-runtime@^0.11.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== -regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.4: +regenerator-runtime@^0.13.4: version "0.13.11" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== @@ -12770,12 +12758,17 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" +safe-stable-stringify@^2.3.1: + version "2.4.3" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886" + integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g== + "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sane@^4.0.0, sane@^4.1.0: +sane@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded" integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA== @@ -12790,6 +12783,21 @@ sane@^4.0.0, sane@^4.1.0: minimist "^1.1.1" walker "~1.0.5" +sane@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/sane/-/sane-5.0.1.tgz#ae94cb06acf5ad158242ff23f563d8cbe0ec1e4b" + integrity sha512-9/0CYoRz0MKKf04OMCO3Qk3RQl1PAwWAhPSQSym4ULiLpTZnrY1JoZU0IEikHu8kdk2HvKT/VwQMq/xFZ8kh1Q== + dependencies: + "@cnakazawa/watch" "^1.0.3" + anymatch "^3.1.1" + capture-exit "^2.0.0" + exec-sh "^0.3.4" + execa "^4.0.0" + fb-watchman "^2.0.1" + micromatch "^4.0.2" + minimist "^1.1.1" + walker "~1.0.5" + sass@^1.19.0: version "1.69.3" resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.3.tgz#f8a0c488697e6419519834a13335e7b65a609c11" @@ -13171,7 +13179,7 @@ sort-object-keys@^1.1.3: resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45" integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg== -sort-package-json@^1.49.0: +sort-package-json@^1.55.0: version "1.57.0" resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.57.0.tgz#e95fb44af8ede0bb6147e3f39258102d4bb23fc4" integrity sha512-FYsjYn2dHTRb41wqnv+uEqCUvBpK3jZcTp9rbz2qDTmel7Pmdtf+i2rLaaPMRZeSVM60V3Se31GyWFpmKs4Q5Q== @@ -13785,7 +13793,7 @@ terser@^5.16.8, terser@^5.3.0: commander "^2.20.0" source-map-support "~0.5.20" -testem@^3.2.0: +testem@^3.6.0: version "3.10.1" resolved "https://registry.yarnpkg.com/testem/-/testem-3.10.1.tgz#bab8a83bec11e975f7d1e47e924eed6135957e5b" integrity sha512-42c4e7qlAelwMd8O3ogtVGRbgbr6fJnX6H51ACOIG1V1IjsKPlcQtxPyOwaL4iikH22Dfh+EyIuJnMG4yxieBQ== @@ -14507,7 +14515,7 @@ walker@~1.0.5: dependencies: makeerror "1.0.12" -watch-detector@^1.0.0: +watch-detector@^1.0.0, watch-detector@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/watch-detector/-/watch-detector-1.0.2.tgz#95deb9189f8c89c0a9f211739cef6d01cffcf452" integrity sha512-MrJK9z7kD5Gl3jHBnnBVHvr1saVGAfmkyyrvuNzV/oe0Gr1nwZTy5VSA0Gw2j2Or0Mu8HcjUa44qlBvC2Ofnpg== @@ -14601,7 +14609,7 @@ webpack@^4.43.0: watchpack "^1.7.4" webpack-sources "^1.4.1" -webpack@^5.0.0: +webpack@^5.72.1: version "5.89.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.89.0.tgz#56b8bf9a34356e93a6625770006490bf3a7f32dc" integrity sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw== @@ -14751,7 +14759,7 @@ workerpool@^3.1.1: object-assign "4.1.1" rsvp "^4.8.4" -workerpool@^6.0.0, workerpool@^6.0.2, workerpool@^6.1.4, workerpool@^6.4.0: +workerpool@^6.0.0, workerpool@^6.0.2, workerpool@^6.2.0, workerpool@^6.4.0: version "6.5.1" resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544" integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA== From f261c9ff04afaed93cbe82e8186df8b5c7249ce6 Mon Sep 17 00:00:00 2001 From: Jeldrik Hanschke Date: Mon, 16 Oct 2023 23:06:51 +0200 Subject: [PATCH 2/3] remove duplicated GitHub actions --- .github/workflows/ci.yml | 174 ++++++++++++++++++++++------ .github/workflows/test-workflow.yml | 153 ------------------------ 2 files changed, 141 insertions(+), 186 deletions(-) delete mode 100644 .github/workflows/test-workflow.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6287d3264..bb8c5c945 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,45 +1,153 @@ -name: CI - +name: Test Frontend and backend +# This workflow is triggered on pushes to the repository. on: push: branches: - - main - master - pull_request: {} - -concurrency: - group: ci-${{ github.head_ref || github.ref }} - cancel-in-progress: true + pull_request: jobs: - lint: - name: "Lint" + lint-javascript: + name: lint javascript runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Install Node - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v3 with: - node-version: 12.x - cache: yarn - - name: Install Dependencies - run: yarn install --frozen-lockfile - - name: Lint - run: yarn lint - - test: - name: "Test" + node-version: 18 + - name: Install node modules + run: yarn install + - name: Run lint + run: yarn lint:js + lint-templates: + name: lint ember templates runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Install Node - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v3 + with: + node-version: 18 + - name: Install node modules + run: yarn install + - name: Run lint + run: yarn lint:hbs + test-bundlesize: + name: test bundlesize + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Install php + uses: shivammathur/setup-php@v2 + with: + php-version: '7.4' + extensions: mbstring, zip + - uses: actions/setup-node@v3 + with: + node-version: 18 + - name: Install node modules + run: yarn install + - name: Run tests + run: yarn test:bundlesize + test-csp-header: + name: test CSP in .htaccess + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v3 + with: + node-version: 18 + - name: Install node modules + run: yarn install + - name: Run tests + run: yarn test:csp-header + test-chrome: + name: test against Chrome + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v3 + with: + node-version: 18 + - name: Install node modules + run: yarn install + - name: Install chrome browser + run: | + wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb + sudo apt install ./google-chrome-stable_current_amd64.deb + - name: Build with test environment + env: + CI: true + run: yarn build --environment test + - name: run tests in chrome + run: yarn test:ember --launch Chrome --path dist + test-firefox: + name: test against Firefox + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v3 + with: + node-version: 18 + - name: Install node modules + run: yarn install + - name: Setup firefox + uses: browser-actions/setup-firefox@latest + with: + firefox-version: 102.0.1 + - name: Build with test environment + env: + CI: true + run: yarn build --environment test + - name: run tests in firefox + run: yarn test:ember --launch Firefox --path dist + test-browserstack: + name: test against additional browser in BrowserStack + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v3 + with: + node-version: 18 + - name: Install node modules + run: yarn install + - name: Build with test environment + env: + CI: true + run: yarn build --environment test + - name: 'BrowserStack Env Setup' + uses: 'browserstack/github-actions/setup-env@master' + with: + username: 'jeldrikhanschke1' + access-key: 'xaM9Uxurv2GyxFLKQXgj' + - name: 'Start BrowserStackLocal Tunnel' + uses: 'browserstack/github-actions/setup-local@master' + with: + local-testing: 'start' + local-logging-level: 'all-logs' + local-identifier: 'random' + - name: 'Running test on BrowserStack' + run: yarn test:ember --config-file testem.browserstack.js --path dist + - name: 'BrowserStackLocal Stop' + uses: browserstack/github-actions/setup-local@master + with: + local-testing: stop + test-backend: + name: Test php backend + runs-on: ubuntu-latest + strategy: + matrix: + php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2'] + steps: + - name: Checkout repository files + uses: actions/checkout@v4 + - name: Install php + uses: shivammathur/setup-php@v2 with: - node-version: 12.x - cache: yarn - - name: Install Dependencies - run: yarn install --frozen-lockfile - - name: Run Tests - run: yarn test + php-version: ${{ matrix.php-versions }} + extensions: mbstring, zip + - name: Install php dependencies + run: composer install + working-directory: ./api + - name: Run backend tests + run: ./vendor/bin/codecept run + working-directory: ./api diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml deleted file mode 100644 index bb8c5c945..000000000 --- a/.github/workflows/test-workflow.yml +++ /dev/null @@ -1,153 +0,0 @@ -name: Test Frontend and backend -# This workflow is triggered on pushes to the repository. -on: - push: - branches: - - master - pull_request: - -jobs: - lint-javascript: - name: lint javascript - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 - with: - node-version: 18 - - name: Install node modules - run: yarn install - - name: Run lint - run: yarn lint:js - lint-templates: - name: lint ember templates - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 - with: - node-version: 18 - - name: Install node modules - run: yarn install - - name: Run lint - run: yarn lint:hbs - test-bundlesize: - name: test bundlesize - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Install php - uses: shivammathur/setup-php@v2 - with: - php-version: '7.4' - extensions: mbstring, zip - - uses: actions/setup-node@v3 - with: - node-version: 18 - - name: Install node modules - run: yarn install - - name: Run tests - run: yarn test:bundlesize - test-csp-header: - name: test CSP in .htaccess - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 - with: - node-version: 18 - - name: Install node modules - run: yarn install - - name: Run tests - run: yarn test:csp-header - test-chrome: - name: test against Chrome - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 - with: - node-version: 18 - - name: Install node modules - run: yarn install - - name: Install chrome browser - run: | - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb - sudo apt install ./google-chrome-stable_current_amd64.deb - - name: Build with test environment - env: - CI: true - run: yarn build --environment test - - name: run tests in chrome - run: yarn test:ember --launch Chrome --path dist - test-firefox: - name: test against Firefox - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 - with: - node-version: 18 - - name: Install node modules - run: yarn install - - name: Setup firefox - uses: browser-actions/setup-firefox@latest - with: - firefox-version: 102.0.1 - - name: Build with test environment - env: - CI: true - run: yarn build --environment test - - name: run tests in firefox - run: yarn test:ember --launch Firefox --path dist - test-browserstack: - name: test against additional browser in BrowserStack - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 - with: - node-version: 18 - - name: Install node modules - run: yarn install - - name: Build with test environment - env: - CI: true - run: yarn build --environment test - - name: 'BrowserStack Env Setup' - uses: 'browserstack/github-actions/setup-env@master' - with: - username: 'jeldrikhanschke1' - access-key: 'xaM9Uxurv2GyxFLKQXgj' - - name: 'Start BrowserStackLocal Tunnel' - uses: 'browserstack/github-actions/setup-local@master' - with: - local-testing: 'start' - local-logging-level: 'all-logs' - local-identifier: 'random' - - name: 'Running test on BrowserStack' - run: yarn test:ember --config-file testem.browserstack.js --path dist - - name: 'BrowserStackLocal Stop' - uses: browserstack/github-actions/setup-local@master - with: - local-testing: stop - test-backend: - name: Test php backend - runs-on: ubuntu-latest - strategy: - matrix: - php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2'] - steps: - - name: Checkout repository files - uses: actions/checkout@v4 - - name: Install php - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php-versions }} - extensions: mbstring, zip - - name: Install php dependencies - run: composer install - working-directory: ./api - - name: Run backend tests - run: ./vendor/bin/codecept run - working-directory: ./api From 0d7a0f2d480f4df37910d5cb950263424ab85ef5 Mon Sep 17 00:00:00 2001 From: Jeldrik Hanschke Date: Mon, 16 Oct 2023 23:11:27 +0200 Subject: [PATCH 3/3] fix linting --- .eslintrc.js | 1 + 1 file changed, 1 insertion(+) diff --git a/.eslintrc.js b/.eslintrc.js index a16af5890..510482afd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -62,6 +62,7 @@ module.exports = { files: ['tests/**/*-test.{js,ts}'], extends: ['plugin:qunit/recommended'], rules: { + 'qunit/no-assert-equal': 'warn', 'qunit/no-assert-logical-expression': 'warn', 'qunit/no-async-module-callbacks': 'warn', 'qunit/require-expect': 'warn',