Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Upgrade all dependencies & focus-trap to v7 #81

Closed
wants to merge 2 commits into from
Closed

Upgrade all dependencies & focus-trap to v7 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd31eb1
Upgrade all dependencies
josemarluedke Aug 17, 2023
ed6f67b
Update ci node
josemarluedke Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: volta-cli/action@v1
with:
node-version: 14.x
node-version: 18.x
yarn-version: 1.x
- uses: actions/checkout@v2
- name: Install dependencies
Expand Down Expand Up @@ -47,10 +47,10 @@ jobs:
- embroider-optimized

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: volta-cli/action@v1
with:
node-version: 14.x
node-version: 18.x
yarn-version: 1.x
- name: Install dependencies
run: yarn install
Expand Down
2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
"eslint-plugin-qunit": "^7.2.0"
},
"resolutions": {
"@frontile/core": "^0.15.0",
"@frontile/overlays": "^0.15.0",
"@embroider/macros": "^1.0.0"
}
}
15 changes: 8 additions & 7 deletions packages/ember-focus-trap/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,17 @@
"ember-source": "^4.0.0 || ^5.0.0"
},
"dependencies": {
"@embroider/addon-shim": "^1.0.0",
"focus-trap": "^6.7.1"
"@embroider/addon-shim": "^1.8.6",
"focus-trap": "^7.5.2"
},
"devDependencies": {
"@babel/core": "7.16.7",
"@babel/plugin-proposal-class-properties": "7.16.7",
"@embroider/addon-dev": "^1.0.0",
"@rollup/plugin-babel": "5.3.0",
"@babel/core": "7.22.10",
"@babel/plugin-proposal-class-properties": "7.18.6",
"@embroider/addon-dev": "^4.1.0",
"@rollup/plugin-babel": "6.0.3",
"ember-source": "^5.2.0",
"npm-run-all": "4.1.5",
"rollup": "2.66.1"
"rollup": "3.28.0"
},
"engines": {
"node": "12.* || >= 14"
Expand Down
6 changes: 3 additions & 3 deletions packages/ember-focus-trap/rollup.config.js → packages/ember-focus-trap/rollup.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Addon } from '@embroider/addon-dev/rollup';

const addon = new Addon({
srcDir: 'src',
destDir: 'dist'
destDir: 'dist',
});

export default {
Expand Down Expand Up @@ -40,6 +40,6 @@ export default {
addon.keepAssets(['**/*.css']),

// Remove leftover build artifacts when starting a new build.
addon.clean()
]
addon.clean(),
],
};
49 changes: 27 additions & 22 deletions packages/test-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,45 +18,50 @@
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@embroider/test-setup": "^1.0.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@underline/eslint-config-ember-typescript": "^0.12.0",
"@underline/eslint-config-node": "^0.12.0",
"@underline/eslint-config-typescript": "^0.12.0",
"@ember/test-helpers": "^3.2.0",
"@embroider/test-setup": "^3.0.1",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@underline/eslint-config-ember-typescript": "^0.15.0",
"@underline/eslint-config-node": "^0.15.0",
"@underline/eslint-config-typescript": "^0.15.0",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.4.0",
"ember-cli": "~4.1.1",
"ember-auto-import": "^2.6.3",
"ember-cli": "~5.1.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.2",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-focus-trap": "^1.0.2",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "^4.1.0",
"ember-page-title": "^8.0.0",
"ember-qunit": "^7.0.0",
"ember-resolver": "^11.0.1",
"ember-source": "^4.12.3",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^3.15.0",
"ember-try": "^2.0.0",
"eslint": "^8.6.0",
"ember-template-lint": "^5.11.2",
"ember-try": "^3.0.0",
"eslint": "^8.47.0",
"lerna": "^7.1.5",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.5.1",
"qunit": "^2.17.2",
"prettier": "^3.0.2",
"qunit": "^2.19.4",
"qunit-dom": "^2.0.0",
"sinon": "^12.0.1",
"webpack": "^5.67.0"
"sinon": "^15.2.0",
"typescript": "^5.1.6",
"webpack": "^5.88.2"
},
"engines": {
"node": "12.* || 14.* || >= 16"
},
"ember": {
"edition": "octane"
},
"dependencies": {
"eslint-plugin-qunit": "^8.0.0"
}
}
20 changes: 10 additions & 10 deletions site/.github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,36 @@ 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"
name: 'Lint'
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Node
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 12.x
node-version: 18.x
cache: npm
- name: Install Dependencies
run: npm ci
- name: Lint
run: npm run lint

test:
name: "Test"
name: 'Test'
runs-on: ubuntu-latest

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: 18.x
cache: npm
- name: Install Dependencies
run: npm ci
Expand Down
7 changes: 4 additions & 3 deletions site/app/styles/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@
@apply text-primary-600 dark:text-primary-400 -ml-6 pr-2 absolute opacity-100;
}

@apply lg:ml-0;
@screen lg {
@apply ml-0;

&::before {
@apply opacity-0 pr-1;
}
Expand All @@ -51,7 +50,9 @@
padding: 0.65rem 1.2rem;
border: 0.0625rem solid #3d4852;
border-radius: 0.25rem;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.12), 0 2px 4px 0 rgba(0, 0, 0, 0.08);
box-shadow:
0 4px 8px 0 rgba(0, 0, 0, 0.12),
0 2px 4px 0 rgba(0, 0, 0, 0.08);

&:focus {
outline: 5px solid rgba(255, 215, 35, 0.6);
Expand Down
58 changes: 30 additions & 28 deletions site/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,54 +19,56 @@
"test:ember": "ember test"
},
"devDependencies": {
"@docfy/ember": "^0.4.4",
"@docfy/plugin-with-prose": "^0.4.4",
"@docfy/ember": "^0.7.0",
"@docfy/plugin-with-prose": "^0.7.0",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@frontile/core": "^0.12.2",
"@frontile/overlays": "^0.12.2",
"@glimmer/component": "^1.0.4",
"@ember/test-helpers": "^3.2.0",
"@frontile/core": "^0.15.0",
"@frontile/overlays": "^0.15.0",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.0.3 | ^2.0.0-beta.17",
"@tailwindcss/typography": "^0.4.1",
"autoprefixer": "^10.3.5",
"@tailwindcss/typography": "^0.5.9",
"autoprefixer": "^10.4.15",
"broccoli-asset-rev": "^3.0.0",
"docfy-theme-ember": "josemarluedke/docfy-theme-ember",
"ember-auto-import": "^2.4.0",
"ember-cli": "~4.1.1",
"ember-cli-app-version": "^5.0.0",
"ember-auto-import": "^2.6.3",
"ember-cli": "~5.1.0",
"ember-cli-babel": "^7.26.11",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-fastboot": "^3.2.0-beta.5",
"ember-cli-htmlbars": "^6.0.1",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-fastboot": "^4.1.1",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-postcss": "^8.0.0",
"ember-cli-postcss": "^8.2.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-focus-trap": "^1.0.2",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "~4.1.0",
"ember-template-lint": "^3.15.0",
"eslint-plugin-qunit": "^7.2.0",
"ember-page-title": "^8.0.0",
"ember-qunit": "^7.0.0",
"ember-resolver": "^11.0.1",
"ember-source": "~5.2.0",
"ember-template-lint": "^5.11.2",
"eslint-plugin-qunit": "^8.0.0",
"loader.js": "^4.7.0",
"postcss-import": "^14.0.2",
"postcss-nested": "^5.0.6",
"prember": "^1.0.5",
"prettier": "^2.5.1",
"qunit": "^2.17.2",
"postcss-import": "^15.1.0",
"postcss-nested": "^6.0.1",
"prember": "^2.0.0",
"prettier": "^3.0.2",
"qunit": "^2.19.4",
"qunit-dom": "^2.0.0",
"rehype-highlight": "^4.1.0",
"remark-autolink-headings": "^6.0.1",
"remark-code-titles": "^0.1.2",
"tailwindcss": "^2.2.15",
"webpack": "^5.67.0"
"tailwindcss": "^3.3.3",
"webpack": "^5.88.2"
},
"engines": {
"node": "12.* || 14.* || >= 16"
},
"ember": {
"edition": "octane"
},
"dependencies": {
"eslint-plugin-qunit": "^8.0.0"
}
}
Loading
Loading