Skip to content

Commit

Permalink
chore: bump to latest versions of deps (#320)
Browse files Browse the repository at this point in the history 
* chore: bump to latest versions of deps

* move to dep

* use turbo

* remove accidentally added files

* get more working

* fix ref

* fix secret

* fix
  • Loading branch information
@runspired
runspired authored Nov 1, 2024
1 parent 6e454e1 commit 024a2e0
Show file tree
Hide file tree
Showing 15 changed files with 804 additions and 4,020 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ jobs:
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
- uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
- name: 'Setup local TurboRepo server'
uses: felixmosh/turborepo-gh-artifacts@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/setup-node@v4
with:
registry-url: 'https://registry.npmjs.org'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ testem.log
/packages/*/package.json.ember-try

.idea/
.turbo/
2 changes: 1 addition & 1 deletion .prettier-cache
View file

Large diffs are not rendered by default.

11 changes: 0 additions & 11 deletions lerna.json
View file

This file was deleted.

14 changes: 11 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "flexi-root",
"private": true,
"version": "2.1.0",
"version": "3.0.0-alpha.0",
"workspaces": [
"packages/*"
],
Expand All @@ -28,7 +28,7 @@
"lint:js": "eslint --cache --ext=js,ts .",
"lint:prettier": "prettier --check --cache --cache-location=.prettier-cache --log-level=warn .",
"lint:prettier:fix": "prettier --write --cache --cache-location=.prettier-cache --log-level=warn .",
"test:development": "lerna run --stream --parallel --no-private test:development"
"test:development": "pnpm turbo test:development"
},
"packageManager": "pnpm@9.12.3",
"volta": {
Expand All @@ -40,6 +40,14 @@
"npm": "use pnpm",
"yarn": "use pnpm"
},
"overrides": {
"ember-cli-babel": "8.2.0",
"ember-cli-htmlbars": "6.3.0",
"ember-auto-import": "2.9.0",
"broccoli-funnel": "3.0.8",
"broccoli-merge-trees": "4.2.0",
"@embroider/macros": "1.16.9"
},
"devDependencies": {
"@babel/eslint-parser": "^7.25.9",
"@babel/plugin-proposal-decorators": "^7.25.9",
Expand All @@ -55,7 +63,7 @@
"eslint-plugin-simple-import-sort": "^12.1.1",
"eslint-plugin-unicorn": "56.0.0",
"eslint-plugin-unused-imports": "^4.1.4",
"lerna": "^4.0.0",
"turbo": "^2.2.3",
"prettier": "^3.3.3"
}
}
2 changes: 1 addition & 1 deletion packages/flexi-config/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
"edition": "octane"
},
"volta": {
"extends": "../package.json"
"extends": "../../package.json"
}
}
11 changes: 6 additions & 5 deletions packages/flexi-default-styles/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,15 @@
"homepage": "https://flexi.readme.io/docs",
"scripts": {},
"dependencies": {
"@html-next/flexi-config": "^3.0.0-alpha.0",
"@html-next/flexi-config": "workspace:*",
"broccoli-merge-trees": "^4.2.0",
"broccoli-plugin": "^4.0.7",
"ember-cli-sass": "^10.0.1",
"sass": "^1.15.2"
"ember-cli-sass": "^11.0.1",
"ember-cli-babel": "^8.2.0",
"sass": "^1.80.5"
},
"devDependencies": {
"ember-cli": "^4.2.0"
"ember-cli": "^5.12.0"
},
"engines": {
"node": "18.* || 20.* || >= 22"
Expand All @@ -50,7 +51,7 @@
"edition": "octane"
},
"volta": {
"extends": "../package.json"
"extends": "../../package.json"
},
"ember-addon": {
"configPath": "tests/dummy/config"
Expand Down
6 changes: 3 additions & 3 deletions packages/flexi-dsl/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
"homepage": "https://flexi.readme.io/docs",
"scripts": {},
"dependencies": {
"@html-next/flexi-config": "^3.0.0-alpha.0"
"@html-next/flexi-config": "workspace:*"
},
"devDependencies": {
"ember-cli": "^4.2.0"
"ember-cli": "^5.12.0"
},
"engines": {
"node": "18.* || 20.* || >= 22"
Expand All @@ -49,7 +49,7 @@
"edition": "octane"
},
"volta": {
"extends": "../package.json"
"extends": "../../package.json"
},
"ember-addon": {
"configPath": "tests/dummy/config"
Expand Down
54 changes: 25 additions & 29 deletions packages/flexi-layouts/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,52 +39,48 @@
"test:development": "ember test --test-port=0"
},
"dependencies": {
"@ember/render-modifiers": "^2.0.4",
"@embroider/macros": "^1.5.0",
"@ember/render-modifiers": "^2.1.0",
"@embroider/macros": "^1.16.9",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@html-next/flexi-config": "^3.0.0-alpha.0",
"@html-next/flexi-config": "workspace:*",
"broccoli-funnel": "^3.0.8",
"broccoli-merge-trees": "^4.2.0",
"broccoli-plugin": "^4.0.7",
"chalk": "^4.1.2",
"debug": "^4.3.4",
"ember-cached-decorator-polyfill": "^0.1.4",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.0.1",
"ember-cli-preprocess-registry": "^3.3.0",
"ember-window-mock": "^0.8.1"
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-preprocess-registry": "^5.0.1",
"ember-auto-import": "^2.9.0",
"ember-window-mock": "^1.0.2"
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@html-next/flexi-default-styles": "^3.0.0-alpha.0",
"@html-next/flexi-dsl": "^3.0.0-alpha.0",
"@ember/optional-features": "^2.2.0",
"@ember/test-helpers": "^4.0.1",
"@html-next/flexi-default-styles": "workspace:*",
"@html-next/flexi-dsl": "workspace:*",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.2.2",
"ember-cli": "^4.2.0",
"ember-cli-babel": "^7.26.11",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-htmlbars": "^6.0.1",
"ember-cli": "^5.12.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sass": "^10.0.1",
"ember-cli-sass": "^11.0.1",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "^1.0.0",
"ember-load-initializers": "^3.0.1",
"ember-native-dom-helpers": "^0.7.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "^3.28.8",
"ember-qunit": "^8.1.1",
"ember-resolver": "^13.0.2",
"ember-source": "^5.12.0",
"ember-source-channel-url": "^3.0.0",
"ember-try": "^2.0.0",
"ember-try": "^3.0.0",
"loader.js": "^4.7.0",
"qunit": "^2.18.0",
"qunit-dom": "^2.0.0",
"sass": "^1.49.9",
"webpack": "^5.70.0"
"qunit": "^2.22.0",
"qunit-dom": "^3.2.1",
"sass": "^1.80.5",
"webpack": "^5.96.0"
},
"engines": {
"node": "18.* || 20.* || >= 22"
Expand All @@ -93,7 +89,7 @@
"edition": "octane"
},
"volta": {
"extends": "../package.json"
"extends": "../../package.json"
},
"ember-addon": {
"versionCompatibility": {
Expand Down
2 changes: 1 addition & 1 deletion packages/flexi-layouts/tests/integration/components/flexi-container-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import config from 'dummy/config/environment';
import hbs from 'htmlbars-inline-precompile';
import { module, skip, test } from 'qunit';

import { htmlSafe } from '@ember/string';
import { htmlSafe } from '@ember/template';
import { render } from '@ember/test-helpers';

import { setupRenderingTest } from '../../helpers/index';
Expand Down
4 changes: 2 additions & 2 deletions packages/flexi-layouts/tests/integration/components/flexi-grid-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import hbs from 'htmlbars-inline-precompile';
import { module, test } from 'qunit';

import EmberObject from '@ember/object';
import { htmlSafe } from '@ember/string';
import { htmlSafe } from '@ember/template';
import { render, settled } from '@ember/test-helpers';

import { setupRenderingTest } from '../../helpers';
Expand Down Expand Up @@ -66,7 +66,7 @@ module('Integration | Component | flexi grid', function (hooks) {
this.set('widths', widths);

await render(hbs`
<div style={{widths.mobile}}>
<div style={{this.widths.mobile}}>
<grid>
template block text
</grid>
Expand Down
49 changes: 22 additions & 27 deletions packages/flexi-sustain/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,44 +38,39 @@
},
"dependencies": {
"@ember/render-modifiers": "^2.0.4",
"@embroider/macros": "^1.5.0",
"@embroider/macros": "^1.16.9",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"ember-cached-decorator-polyfill": "^0.1.4",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.0.1"
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0"
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@html-next/flexi-config": "^3.0.0-alpha.0",
"@html-next/flexi-default-styles": "^3.0.0-alpha.0",
"@html-next/flexi-dsl": "^3.0.0-alpha.0",
"@html-next/flexi-layouts": "^3.0.0-alpha.0",
"@ember/optional-features": "^2.2.0",
"@ember/test-helpers": "^4.0.4",
"@html-next/flexi-config": "workspace:*",
"@html-next/flexi-default-styles": "workspace:*",
"@html-next/flexi-dsl": "workspace:*",
"@html-next/flexi-layouts": "workspace:*",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.2.2",
"ember-cli": "^4.2.0",
"ember-cli-babel": "^7.26.11",
"ember-auto-import": "^2.9.0",
"ember-cli": "^5.12.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-htmlbars": "^6.0.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sass": "^10.0.1",
"ember-cli-sass": "^11.0.1",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "^1.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "^3.28.8",
"ember-load-initializers": "^3.0.1",
"ember-qunit": "^8.1.1",
"ember-resolver": "^13.0.2",
"ember-source": "^5.12.0",
"ember-source-channel-url": "^3.0.0",
"ember-try": "^2.0.0",
"ember-try": "^3.0.0",
"loader.js": "^4.7.0",
"qunit": "^2.18.0",
"qunit-dom": "^2.0.0",
"sass": "^1.49.9",
"webpack": "^5.70.0"
"qunit": "^2.22.0",
"qunit-dom": "^3.2.1",
"sass": "^1.80.5",
"webpack": "^5.96.0"
},
"engines": {
"node": "18.* || 20.* || >= 22"
Expand All @@ -84,7 +79,7 @@
"edition": "octane"
},
"volta": {
"extends": "../package.json"
"extends": "../../package.json"
},
"ember-addon": {
"versionCompatibility": {
Expand Down
36 changes: 17 additions & 19 deletions packages/flexi/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,39 +46,37 @@
"semver": "^7.3.5"
},
"devDependencies": {
"@ember/jquery": "^2.0.0",
"@ember/optional-features": "^2.0.0",
"@ember/optional-features": "^2.2.0",
"@ember/test-helpers": "^2.6.0",
"@html-next/flexi-config": "^3.0.0-alpha.0",
"@html-next/flexi-default-styles": "^3.0.0-alpha.0",
"@html-next/flexi-dsl": "^3.0.0-alpha.0",
"@html-next/flexi-layouts": "^3.0.0-alpha.0",
"@html-next/flexi-sustain": "^3.0.0-alpha.0",
"@html-next/flexi-config": "workspace:*",
"@html-next/flexi-default-styles": "workspace:*",
"@html-next/flexi-dsl": "workspace:*",
"@html-next/flexi-layouts": "workspace:*",
"@html-next/flexi-sustain": "workspace:*",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.2.2",
"ember-cli": "^4.2.0",
"ember-cli-babel": "^7.26.11",
"ember-auto-import": "^2.9.0",
"ember-cli": "^5.12.0",
"ember-cli-babel": "^8.2.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-htmlbars": "^6.0.1",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sass": "^10.0.1",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-code-snippet": "^3.0.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.2",
"ember-load-initializers": "^3.0.1",
"ember-maybe-import-regenerator": "^1.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "^3.28.8",
"ember-resolver": "^13.0.2",
"ember-source": "^5.12.0",
"ember-source-channel-url": "^3.0.0",
"liquid-fire": "^0.34.0",
"loader.js": "^4.7.0",
"qunit": "^2.18.0",
"qunit-dom": "^2.0.0",
"qunit": "^2.22.0",
"qunit-dom": "^3.2.1",
"sass": "^1.49.9",
"webpack": "^5.70.0"
"webpack": "^5.96.0"
},
"engines": {
"node": "18.* || 20.* || >= 22"
Expand All @@ -87,7 +85,7 @@
"edition": "octane"
},
"volta": {
"extends": "../package.json"
"extends": "../../package.json"
},
"ember-addon": {
"versionCompatibility": {
Expand Down
Loading

0 comments on commit 024a2e0

Please sign in to comment.