Skip to content

Commit

Permalink
Merge pull request #683 from ember-animation/sync-embroider-addon-blu…
Browse files Browse the repository at this point in the history
…eprint

Sync with embroider-addon blueprint
  • Loading branch information
SergeAstapov committed Feb 21, 2024
2 parents 6559ae8 + 1aaafca commit b8eca66
Show file tree
Hide file tree
Showing 11 changed files with 2,323 additions and 4,990 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ jobs:
try-scenario:
- ember-lts-4.8
- ember-lts-4.12
- ember-lts-5.4
- ember-release
- ember-beta
- ember-canary
Expand Down Expand Up @@ -153,6 +154,7 @@ jobs:
- typescript@5.0
- typescript@5.1
- typescript@5.2
- typescript@5.3
- typescript@next

steps:
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/push-dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: wyvox/action-setup-pnpm@v3
- uses: pnpm/action-setup@v3
with:
version: 8
- uses: actions/setup-node@v4
with:
node-version: 18
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- uses: kategengler/put-built-npm-package-contents-on-branch@v2.0.0
with:
branch: dist
token: ${{ secrets.GITHUB_TOKEN }}
working-directory: addon
working-directory: 'addon'
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ node_modules/
.sass-cache
coverage/
.DS_Store

/.idea/
9 changes: 7 additions & 2 deletions addon/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@
/LICENSE.md

# compiled output
/dist
/declarations
dist/
declarations/

# npm/pnpm/yarn pack output
*.tgz

# deps & caches
node_modules/
.eslintcache
.prettiercache
68 changes: 34 additions & 34 deletions addon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,51 +68,51 @@
"ember-element-helper": ">=0.6.1"
},
"devDependencies": {
"@babel/core": "^7.23.6",
"@babel/core": "^7.23.9",
"@babel/plugin-transform-typescript": "^7.23.6",
"@babel/runtime": "^7.23.6",
"@embroider/addon-dev": "^4.1.2",
"@babel/runtime": "^7.23.9",
"@embroider/addon-dev": "^4.2.1",
"@glimmer/env": "^0.1.7",
"@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",
"@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",
"@rollup/plugin-babel": "^6.0.4",
"@tsconfig/ember": "^3.0.3",
"@types/ember": "^4.0.10",
"@types/ember__application": "^4.0.10",
"@types/ember__array": "^4.0.9",
"@types/ember__component": "^4.0.21",
"@types/ember__controller": "^4.0.11",
"@types/ember__debug": "^4.0.7",
"@types/ember__destroyable": "^4.0.4",
"@types/ember__engine": "^4.0.10",
"@types/ember__error": "^4.0.5",
"@types/ember__helper": "^4.0.5",
"@types/ember__modifier": "^4.0.8",
"@types/ember__object": "^4.0.11",
"@types/ember__owner": "^4.0.8",
"@types/ember__polyfills": "^4.0.5",
"@types/ember__routing": "^4.0.19",
"@types/ember__runloop": "^4.0.8",
"@types/ember__service": "^4.0.8",
"@types/ember": "^4.0.11",
"@types/ember__application": "^4.0.11",
"@types/ember__array": "^4.0.10",
"@types/ember__component": "^4.0.22",
"@types/ember__controller": "^4.0.12",
"@types/ember__debug": "^4.0.8",
"@types/ember__destroyable": "^4.0.5",
"@types/ember__engine": "^4.0.11",
"@types/ember__error": "^4.0.6",
"@types/ember__helper": "^4.0.7",
"@types/ember__modifier": "^4.0.9",
"@types/ember__object": "^4.0.12",
"@types/ember__owner": "^4.0.9",
"@types/ember__polyfills": "^4.0.6",
"@types/ember__routing": "^4.0.22",
"@types/ember__runloop": "^4.0.10",
"@types/ember__service": "^4.0.9",
"@types/ember__string": "^3.16.3",
"@types/ember__template": "^4.0.5",
"@types/ember__test": "^4.0.5",
"@types/ember__utils": "^4.0.6",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
"@types/ember__template": "^4.0.7",
"@types/ember__test": "^4.0.6",
"@types/ember__utils": "^4.0.7",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"babel-plugin-ember-template-compilation": "^2.2.1",
"concurrently": "^8.2.2",
"ember-template-lint": "^5.13.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^11.12.0",
"eslint-plugin-n": "^16.6.0",
"eslint-plugin-prettier": "^5.0.1",
"prettier": "^3.1.1",
"prettier-plugin-ember-template-tag": "^1.1.0",
"rollup": "^4.9.1",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.1.3",
"prettier": "^3.2.5",
"prettier-plugin-ember-template-tag": "^2.0.0",
"rollup": "^4.12.0",
"typescript": "^5.3.3"
},
"peerDependencies": {
Expand Down
3 changes: 1 addition & 2 deletions config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "@embroider/addon-blueprint",
"version": "2.7.0",
"version": "2.13.0",
"blueprints": [
{
"name": "@embroider/addon-blueprint",
Expand All @@ -12,7 +12,6 @@
"--addon-location=addon",
"--ci-provider=github",
"--pnpm",
"--release-it",
"--test-app-location=test-app",
"--typescript"
]
Expand Down
48 changes: 24 additions & 24 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,24 @@
"test:ember-compatibility": "ember try:each"
},
"devDependencies": {
"@babel/core": "^7.23.3",
"@babel/eslint-parser": "^7.23.3",
"@babel/plugin-proposal-decorators": "^7.23.3",
"@babel/core": "^7.23.9",
"@babel/eslint-parser": "^7.23.10",
"@babel/plugin-proposal-decorators": "^7.23.9",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.2.1",
"@faker-js/faker": "^8.3.1",
"@ember/test-helpers": "^3.3.0",
"@faker-js/faker": "^8.4.1",
"@fortawesome/ember-fontawesome": "^0.3.4",
"@fortawesome/free-solid-svg-icons": "^5.15.4",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.2.2",
"ember-animated": "workspace:*",
"ember-animated-tools": "^1.0.0",
"ember-auto-import": "^2.7.0",
"ember-cli": "~5.3.0",
"ember-cli-addon-docs": "^7.0.0",
"ember-animated-tools": "^2.0.0",
"ember-auto-import": "^2.7.2",
"ember-cli": "~5.6.0",
"ember-cli-addon-docs": "^7.0.1",
"ember-cli-addon-docs-yuidoc": "^1.0.0",
"ember-cli-app-version": "^6.0.1",
"ember-cli-babel": "^8.2.0",
Expand All @@ -68,26 +68,26 @@
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-simple-track-helper": "^2.0.0",
"ember-source": "~5.4.0",
"ember-template-lint": "^5.12.0",
"ember-source": "~5.6.0",
"ember-template-lint": "^5.13.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.0.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^11.12.0",
"eslint-plugin-n": "^16.6.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-qunit": "^8.0.1",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-qunit": "^8.1.1",
"loader.js": "^4.7.0",
"moment": "^2.29.4",
"prettier": "^3.1.0",
"qunit": "^2.20.0",
"moment": "^2.30.1",
"prettier": "^3.2.5",
"qunit": "^2.20.1",
"qunit-dom": "^3.0.0",
"rollup": "^4.6.1",
"sass": "^1.69.5",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^4.1.0",
"rollup": "^4.12.0",
"sass": "^1.71.1",
"stylelint": "^16.2.1",
"stylelint-config-standard": "^36.0.0",
"stylelint-prettier": "^5.0.0",
"tracked-built-ins": "^3.3.0",
"webpack": "^5.89.0"
"webpack": "^5.90.3"
},
"engines": {
"node": "16.* || >= 18"
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
"devDependencies": {
"@fortawesome/fontawesome-svg-core": "^1.3.0",
"@fortawesome/free-solid-svg-icons": "^5.15.4",
"@release-it-plugins/lerna-changelog": "^6.0.0",
"@release-it-plugins/workspaces": "^4.0.0",
"@release-it-plugins/lerna-changelog": "^6.1.0",
"@release-it-plugins/workspaces": "^4.2.0",
"concurrently": "^8.2.2",
"release-it": "^16.2.1"
"release-it": "^17.1.1"
},
"volta": {
"node": "18.18.2",
Expand Down
Loading

0 comments on commit b8eca66

Please sign in to comment.