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.

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

Updated project dependencies #224

Merged
merged 7 commits into from
Feb 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v3
with:
version: latest

Expand All @@ -54,7 +54,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v3
with:
version: latest

Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v3
with:
version: latest

Expand Down Expand Up @@ -162,7 +162,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v3
with:
version: latest

Expand Down Expand Up @@ -202,7 +202,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v3
with:
version: latest

Expand Down
41 changes: 3 additions & 38 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,45 +7,10 @@ Here are some guidelines to help you and everyone else.

## Local development

<details>

<summary>Install dependencies</summary>

1. Fork and clone this repo.

```sh
git clone [email protected]:<your-github-handle>/ember-container-query.git
```

1. Change directory.

```sh
cd ember-container-query
```

1. Use [`pnpm`](https://pnpm.io/installation) to install dependencies.

```sh
pnpm install
```
You can get started in 2 steps:

</details>


<details>

<summary>Run the demo app</summary>

1. Once dependencies have been installed, you can run the demo app (also called `docs-app`).

```sh
# From the workspace root
pnpm start
```

1. Open the app at [http://localhost:4200](http://localhost:4200).

</details>
1. Run `pnpm install` to install project dependencies. This will build the addon `ember-container-query`.
1. Run `pnpm start` to start `docs-app` ([http://localhost:4200](http://localhost:4200)) and `test-app` ([http://localhost:4300/tests](http://localhost:4300/tests?hidepassed)).


<details>
Expand Down
2 changes: 1 addition & 1 deletion configs/ember-template-lint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"devDependencies": {
"@shared-configs/prettier": "workspace:*",
"concurrently": "^8.2.2",
"prettier": "^3.1.1"
"prettier": "^3.2.5"
},
"peerDependencies": {
"ember-template-lint": "^5.13.0"
Expand Down
18 changes: 9 additions & 9 deletions configs/eslint/ember/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,29 @@
"lint:js:fix": "prettier --write \"**/*.js\""
},
"dependencies": {
"@rushstack/eslint-patch": "^1.6.1",
"@typescript-eslint/eslint-plugin": "^6.17.0",
"@typescript-eslint/parser": "^6.17.0",
"@rushstack/eslint-patch": "^1.7.2",
"@typescript-eslint/eslint-plugin": "^7.0.1",
"@typescript-eslint/parser": "^7.0.1",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-ember": "^11.12.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-n": "^16.6.1",
"eslint-plugin-prettier": "^5.1.2",
"eslint-plugin-qunit": "^8.0.1",
"eslint-plugin-simple-import-sort": "^10.0.0",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-qunit": "^8.1.1",
"eslint-plugin-simple-import-sort": "^12.0.0",
"eslint-plugin-typescript-sort-keys": "^3.1.0"
},
"devDependencies": {
"@shared-configs/eslint-config-node": "workspace:*",
"@shared-configs/prettier": "workspace:*",
"concurrently": "^8.2.2",
"eslint": "^8.56.0",
"prettier": "^3.1.1"
"prettier": "^3.2.5"
},
"peerDependencies": {
"eslint": "^8.56.0",
"prettier": "^3.1.1"
"prettier": "^3.2.5"
},
"peerDependenciesMeta": {
"eslint": {
Expand Down
20 changes: 10 additions & 10 deletions configs/eslint/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,28 @@
"lint:js:fix": "prettier --write \"**/*.js\""
},
"dependencies": {
"@babel/core": "^7.23.7",
"@babel/eslint-parser": "7.23.3",
"@rushstack/eslint-patch": "^1.6.1",
"@typescript-eslint/eslint-plugin": "^6.17.0",
"@typescript-eslint/parser": "^6.17.0",
"@babel/core": "^7.23.9",
"@babel/eslint-parser": "7.23.10",
"@rushstack/eslint-patch": "^1.7.2",
"@typescript-eslint/eslint-plugin": "^7.0.1",
"@typescript-eslint/parser": "^7.0.1",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-n": "^16.6.1",
"eslint-plugin-prettier": "^5.1.2",
"eslint-plugin-simple-import-sort": "^10.0.0",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-simple-import-sort": "^12.0.0",
"eslint-plugin-typescript-sort-keys": "^3.1.0"
},
"devDependencies": {
"@shared-configs/prettier": "workspace:*",
"concurrently": "^8.2.2",
"eslint": "^8.56.0",
"prettier": "^3.1.1"
"prettier": "^3.2.5"
},
"peerDependencies": {
"eslint": "^8.56.0",
"prettier": "^3.1.1"
"prettier": "^3.2.5"
},
"peerDependenciesMeta": {
"eslint": {
Expand Down
4 changes: 2 additions & 2 deletions configs/prettier/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
},
"devDependencies": {
"concurrently": "^8.2.2",
"prettier": "^3.1.1"
"prettier": "^3.2.5"
},
"peerDependencies": {
"prettier": "^3.1.1"
"prettier": "^3.2.5"
},
"peerDependenciesMeta": {
"prettier": {
Expand Down
6 changes: 3 additions & 3 deletions configs/stylelint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
"devDependencies": {
"@shared-configs/prettier": "workspace:*",
"concurrently": "^8.2.2",
"prettier": "^3.1.1"
"prettier": "^3.2.5"
},
"peerDependencies": {
"prettier": "^3.1.1",
"stylelint": "^16.1.0"
"prettier": "^3.2.5",
"stylelint": "^16.2.1"
},
"peerDependenciesMeta": {
"prettier": {
Expand Down
2 changes: 1 addition & 1 deletion configs/testem/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"devDependencies": {
"@shared-configs/prettier": "workspace:*",
"concurrently": "^8.2.2",
"prettier": "^3.1.1"
"prettier": "^3.2.5"
},
"peerDependenciesMeta": {},
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions configs/typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
"dependencies": {
"@tsconfig/ember": "^3.0.3",
"@tsconfig/node18": "^18.2.2",
"@tsconfig/strictest": "^2.0.2"
"@tsconfig/strictest": "^2.0.3"
},
"devDependencies": {
"@shared-configs/prettier": "workspace:*",
"concurrently": "^8.2.2",
"prettier": "^3.1.1"
"prettier": "^3.2.5"
},
"peerDependencies": {
"typescript": "^5.3.3"
Expand Down
2 changes: 1 addition & 1 deletion docs-app/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": "5.5.0",
"version": "5.6.0",
"blueprints": [
{
"name": "app",
Expand Down
14 changes: 10 additions & 4 deletions docs-app/ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use strict';

const sideWatch = require('@embroider/broccoli-side-watch');
const { Webpack } = require('@embroider/webpack');
const EmberApp = require('ember-cli/lib/broccoli/ember-app');

Expand All @@ -13,9 +14,16 @@ module.exports = function (defaults) {
autoImport: {
watchDependencies: ['ember-container-query'],
},

'ember-cli-babel': {
enableTypeScriptTransform: true,
},

trees: {
app: sideWatch('app', {
watching: ['../ember-container-query/src'],
}),
},
});

const options = {
Expand All @@ -28,8 +36,7 @@ module.exports = function (defaults) {
mode: (resourcePath) => {
// We want to enable the local mode only for our own host app.
// All other addons should be loaded in the global mode.
const hostAppLocation =
'docs-app/node_modules/.embroider/rewritten-app';
const hostAppLocation = 'docs-app';

return resourcePath.includes(hostAppLocation) ? 'local' : 'global';
},
Expand All @@ -41,8 +48,7 @@ module.exports = function (defaults) {
module: {
rules: [
{
exclude: /node_modules/,
test: /\.css$/i,
test: /(node_modules\/\.embroider\/rewritten-app\/)(.*\.css)$/i,
use: [
{
loader: 'postcss-loader',
Expand Down
51 changes: 26 additions & 25 deletions docs-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,36 +37,37 @@
"lint:js:fix": "eslint . --fix",
"prelint:types": "type-css-modules --src app",
"lint:types": "glint",
"start": "ember serve",
"start": "ember serve --port=4200",
"test": "DEVICE='w3-h3' ember test --test-port=0",
"test:device": "ember test"
},
"devDependencies": {
"@babel/core": "^7.23.7",
"@babel/core": "^7.23.9",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.2.1",
"@embroider/compat": "^3.4.3",
"@embroider/core": "^3.4.3",
"@embroider/macros": "^1.13.4",
"@ember/test-helpers": "^3.3.0",
"@embroider/broccoli-side-watch": "0.0.2-unstable.ba9fd29",
"@embroider/compat": "^3.4.4",
"@embroider/core": "^3.4.4",
"@embroider/macros": "^1.13.5",
"@embroider/router": "^2.1.6",
"@embroider/webpack": "^3.2.1",
"@embroider/webpack": "^3.2.2",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@glint/core": "^1.2.1",
"@glint/environment-ember-loose": "^1.2.1",
"@glint/environment-ember-template-imports": "^1.2.1",
"@glint/template": "^1.2.1",
"@percy/cli": "^1.27.6",
"@glint/core": "^1.3.0",
"@glint/environment-ember-loose": "^1.3.0",
"@glint/environment-ember-template-imports": "^1.3.0",
"@glint/template": "^1.3.0",
"@percy/cli": "^1.28.0",
"@percy/ember": "^4.2.0",
"@shared-configs/ember-template-lint": "workspace:*",
"@shared-configs/eslint-config-ember": "workspace:*",
"@shared-configs/prettier": "workspace:*",
"@shared-configs/stylelint": "workspace:*",
"@shared-configs/testem": "workspace:*",
"@shared-configs/typescript": "workspace:*",
"@types/qunit": "^2.19.9",
"autoprefixer": "^10.4.16",
"@types/qunit": "^2.19.10",
"autoprefixer": "^10.4.17",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.2.2",
"d3-array": "^3.2.4",
Expand All @@ -77,7 +78,7 @@
"ember-a11y-refocus": "^3.0.2",
"ember-a11y-testing": "^6.1.1",
"ember-auto-import": "^2.7.2",
"ember-cli": "~5.5.0",
"ember-cli": "~5.6.0",
"ember-cli-app-version": "^6.0.1",
"ember-cli-babel": "^8.2.0",
"ember-cli-clean-css": "^3.0.0",
Expand All @@ -89,27 +90,27 @@
"ember-container-query": "workspace:*",
"ember-load-initializers": "^2.1.2",
"ember-modifier": "^4.1.0",
"ember-page-title": "^8.1.0",
"ember-page-title": "^8.2.2",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.5.0",
"ember-svg-jar": "^2.4.7",
"ember-source": "~5.6.0",
"ember-svg-jar": "^2.4.8",
"ember-template-imports": "^3.4.2",
"ember-template-lint": "^5.13.0",
"ember-test-selectors": "^6.0.0",
"ember-truth-helpers": "^4.0.3",
"embroider-css-modules": "^2.0.2",
"embroider-css-modules": "^2.0.3",
"eslint": "^8.56.0",
"loader.js": "^4.7.0",
"postcss": "^8.4.33",
"postcss-loader": "^7.3.4",
"prettier": "^3.1.1",
"qunit": "^2.20.0",
"postcss": "^8.4.35",
"postcss-loader": "^8.1.0",
"prettier": "^3.2.5",
"qunit": "^2.20.1",
"qunit-dom": "^3.0.0",
"stylelint": "^16.1.0",
"stylelint": "^16.2.1",
"type-css-modules": "^1.0.5",
"typescript": "^5.3.3",
"webpack": "^5.89.0"
"webpack": "^5.90.3"
},
"engines": {
"node": "18.* || >= 20"
Expand Down
Loading