Skip to content

Commit

Permalink
v4.4.0...v4.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
betocantu93 committed Jan 8, 2024
1 parent feaed50 commit dfd7574
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 77 deletions.
75 changes: 33 additions & 42 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,57 +18,51 @@ jobs:
name: Base Tests
timeout-minutes: 5
runs-on: ubuntu-latest
strategy:
matrix:
node:
- "14"
- "16"
steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
with:
node-version: ${{ matrix.node }}

- run: yarn install --frozen-lockfile

- name: Test with Node ${{ matrix.node }}
run: yarn ember test

floating-dependencies:
if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
name: Floating Dependencies
timeout-minutes: 5
runs-on: ubuntu-latest
strategy:
matrix:
node:
- "14"
- "16"
timeout-minutes: 10

steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
with:
node-version: ${{ matrix.node }}
node-version: 14.x
cache: yarn
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Lint
run: yarn lint
- name: Run Tests
run: yarn test:ember

- run: yarn install --no-lockfile
floating:
name: "Floating Dependencies"
runs-on: ubuntu-latest
timeout-minutes: 10

- name: Test with Node ${{ matrix.node }}
run: yarn ember test
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 14.x
cache: yarn
- name: Install Dependencies
run: yarn install --no-lockfile
- name: Run Tests
run: yarn test:ember

try-scenarios:
if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
name: "Compatibility"
timeout-minutes: 7
runs-on: ubuntu-latest
needs: tests
needs: "test"
timeout-minutes: 10

strategy:
fail-fast: true
matrix:
ember-try-scenario:
- ember-lts-3.24
try-scenario:
- ember-lts-3.28
- ember-lts-4.4
- ember-release
- ember-beta
- ember-canary
Expand All @@ -93,12 +87,9 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
persist-credentials: false
- uses: volta-cli/action@v1
- run: yarn install

- name: Release
run: yarn semantic-release
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
node-version: 14.x
cache: yarn
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ View the [Documentation](https://nullvoxpopuli.github.io/ember-jsqr/)

## Compatibility

* Ember.js v3.24 or above
* Ember CLI v3.24 or above
* Node.js v12 or above
* Ember.js v3.28 or above
* Ember CLI v3.28 or above
* Node.js v14 or above


## Installation
Expand Down
8 changes: 4 additions & 4 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ module.exports = async function () {
useYarn: true,
scenarios: [
{
name: 'ember-lts-3.24',
name: 'ember-lts-3.28',
npm: {
devDependencies: {
'ember-source': '~3.24.3',
'ember-source': '~3.28.0',
},
},
},
{
name: 'ember-lts-3.28',
name: 'ember-lts-4.4',
npm: {
devDependencies: {
'ember-source': '~3.28.0',
'ember-source': '~4.4.0',
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function (defaults) {
let app = new EmberAddon(defaults, {
const app = new EmberAddon(defaults, {
// Add options here
});

Expand Down
41 changes: 20 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
},
"scripts": {
"build": "ember build --environment=production",
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
"lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
"lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"start": "ember serve",
"test": "npm-run-all lint test:*",
"test": "npm-run-all --print-name \"lint\" \"test:*\"",
"test:try-one": "ember try:one",
"test:all": "ember try:each",
"prepublishOnly": "ember ts:precompile",
Expand All @@ -44,22 +44,24 @@
"dependencies": {
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"ember-auto-import": "^2.4.1",
"ember-auto-import": "^2.4.3",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.0.1",
"ember-cli-htmlbars": "^6.1.1",
"ember-cli-typescript": "^5.0.0",
"ember-modifier": "^4.1.0",
"jsqr": "^1.4.0"
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/render-modifiers": "^2.0.4",
"@ember/test-helpers": "^2.7.0",
"@embroider/test-setup": "^1.6.0",
"@ember/test-helpers": "^2.8.1",
"@embroider/test-setup": "^1.8.3",
"@nullvoxpopuli/eslint-configs": "^2.1.20",
"@semantic-release/changelog": "^6.0.1",
"@semantic-release/git": "^10.0.1",
"@types/ember": "^4.0.4",
"@types/ember-qunit": "^3.4.15",
"@types/ember-resolver": "^5.0.11",
"@types/ember__application": "^4.0.6",
"@types/ember__array": "^4.0.4",
"@types/ember__component": "^4.0.14",
Expand All @@ -80,47 +82,44 @@
"@types/ember__template": "^4.0.2",
"@types/ember__test": "^4.0.2",
"@types/ember__utils": "^4.0.3",
"@types/ember-qunit": "^3.4.15",
"@types/ember-resolver": "^5.0.11",
"@types/qunit": "^2.11.3",
"@types/rsvp": "^4.0.4",
"@typescript-eslint/eslint-plugin": "^5.10.1",
"@typescript-eslint/parser": "^5.10.1",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~4.4.0",
"ember-cli": "~4.8.0",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-data": "^4.1.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
"ember-qunit": "^6.0.0",
"ember-resolver": "^8.0.3",
"ember-source": "~4.4.0",
"ember-source": "~4.8.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^4.8.0",
"ember-template-lint": "^4.16.1",
"ember-try": "^2.0.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^10.6.1",
"eslint-plugin-ember": "^11.1.0",
"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",
"npm-run-all": "^4.1.5",
"prettier": "^2.6.2",
"qunit": "^2.19.1",
"prettier": "^2.7.1",
"qunit": "^2.19.2",
"qunit-dom": "^2.0.0",
"semantic-release": "^19.0.2",
"typescript": "^4.5.5",
"webpack": "^5.72.1"
"webpack": "^5.74.0"
},
"engines": {
"node": "14.* || >= 16"
"node": "14.* || 16.* || >= 18"
},
"ember": {
"edition": "octane"
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "4.4.0",
"version": "4.8.0",
"blueprints": [
{
"name": "addon",
Expand Down
6 changes: 1 addition & 5 deletions tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

module.exports = function (environment) {
let ENV = {
const ENV = {
modulePrefix: 'dummy',
environment,
rootURL: '/',
Expand All @@ -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: {
Expand Down

0 comments on commit dfd7574

Please sign in to comment.