diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aefb1aef..155d93d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,10 +20,9 @@ jobs: steps: - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 - - uses: actions/setup-node@v4 with: - node-version: 18.x + node-version: 20.x cache: pnpm - name: 'Install dependencies' @@ -46,7 +45,7 @@ jobs: - name: Install Node uses: actions/setup-node@v4 with: - node-version: 18.x + node-version: 20.x cache: pnpm - name: Install Dependencies @@ -57,7 +56,7 @@ jobs: - name: Run Tests run: pnpm --filter test-app test:ember - + test-shadow-dom: name: "Tests Shadow dom" runs-on: ubuntu-latest @@ -66,19 +65,19 @@ jobs: steps: - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 - + - name: Install Node uses: actions/setup-node@v4 with: - node-version: 18.x + node-version: 20.x cache: 'pnpm' - + - name: Install Dependencies run: pnpm install --frozen-lockfile - run: pnpm build - run: pnpm i -f # re-sync injected deps - + - name: Run Tests run: pnpm --filter test-app test:ember-shadow-dom @@ -90,10 +89,9 @@ jobs: steps: - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 - - uses: actions/setup-node@v4 with: - node-version: 18.x + node-version: 20.x cache: pnpm - name: Install Dependencies @@ -122,6 +120,7 @@ jobs: - ember-lts-5.4 - ember-lts-5.8 - ember-lts-5.12 + - ember-lts-6.4 - glimmer-component-v1 - ember-release - ember-beta @@ -136,7 +135,7 @@ jobs: - name: Install Node uses: actions/setup-node@v4 with: - node-version: 18.x + node-version: 20.x cache: pnpm - name: Install Dependencies diff --git a/.github/workflows/push-dist.yml b/.github/workflows/push-dist.yml index 52cd627a..1d52343f 100644 --- a/.github/workflows/push-dist.yml +++ b/.github/workflows/push-dist.yml @@ -14,13 +14,15 @@ on: jobs: push-dist: name: Push dist + permissions: + contents: write runs-on: ubuntu-latest timeout-minutes: 10 steps: - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 - + - uses: actions/setup-node@v4 with: node-version: 18 @@ -31,4 +33,4 @@ jobs: with: branch: dist token: ${{ secrets.GITHUB_TOKEN }} - working-directory: 'ember-basic-dropdown' \ No newline at end of file + working-directory: 'ember-basic-dropdown' diff --git a/config/ember-cli-update.json b/config/ember-cli-update.json index d969b890..44ab3566 100644 --- a/config/ember-cli-update.json +++ b/config/ember-cli-update.json @@ -4,7 +4,7 @@ "packages": [ { "name": "@embroider/addon-blueprint", - "version": "4.0.0", + "version": "4.1.2", "blueprints": [ { "name": "@embroider/addon-blueprint", diff --git a/docs/.gitignore b/docs/.gitignore index 71ad79d0..f0dde6db 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -14,12 +14,5 @@ /testem.log /yarn-error.log -# ember-try -/.node_modules.ember-try/ -/npm-shrinkwrap.json.ember-try -/package.json.ember-try -/package-lock.json.ember-try -/yarn.lock.ember-try - # broccoli-debug /DEBUG/ diff --git a/docs/.prettierignore b/docs/.prettierignore index e8f376b0..70e28508 100644 --- a/docs/.prettierignore +++ b/docs/.prettierignore @@ -3,8 +3,7 @@ # misc !.* -.lint-todo/ - -# ember-try -/.node_modules.ember-try/ -/pnpm-lock.ember-try.yaml +.*/ +/pnpm-lock.yaml +ember-cli-update.json +*.html diff --git a/docs/.prettierrc.js b/docs/.prettierrc.js index 7c49e9de..8e62a451 100644 --- a/docs/.prettierrc.js +++ b/docs/.prettierrc.js @@ -5,12 +5,6 @@ module.exports = { overrides: [ { files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}', - options: { - singleQuote: true, - }, - }, - { - files: '*.{gjs,gts}', options: { singleQuote: true, templateSingleQuote: false, diff --git a/docs/.stylelintignore b/docs/.stylelintignore index a0cf71cb..fc178a0b 100644 --- a/docs/.stylelintignore +++ b/docs/.stylelintignore @@ -3,6 +3,3 @@ # compiled output /dist/ - -# addons -/.node_modules.ember-try/ diff --git a/docs/.stylelintrc.js b/docs/.stylelintrc.js index 021c539a..56a013c9 100644 --- a/docs/.stylelintrc.js +++ b/docs/.stylelintrc.js @@ -1,5 +1,5 @@ 'use strict'; module.exports = { - extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'], + extends: ['stylelint-config-standard'], }; diff --git a/docs/app/app.ts b/docs/app/app.ts index d1c5f3b0..cd81bd6b 100644 --- a/docs/app/app.ts +++ b/docs/app/app.ts @@ -3,6 +3,7 @@ import Resolver from 'ember-resolver'; import loadInitializers from 'ember-load-initializers'; import config from 'docs/config/environment'; import Prism from 'prismjs'; +import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros'; import 'prismjs/plugins/normalize-whitespace/prism-normalize-whitespace'; import 'prismjs/components/prism-css'; import 'prismjs/components/prism-scss'; @@ -14,6 +15,10 @@ import { setup } from 'prismjs-glimmer'; import 'prismjs/themes/prism.css'; +if (macroCondition(isDevelopingApp())) { + importSync('./deprecation-workflow'); +} + // eslint-disable-next-line @typescript-eslint/no-unsafe-call setup(Prism); diff --git a/docs/app/components/code-block.hbs b/docs/app/components/code-block.hbs index 759d83f7..92803647 100644 --- a/docs/app/components/code-block.hbs +++ b/docs/app/components/code-block.hbs @@ -1,5 +1,5 @@ 
   {{~! ~}}
diff --git a/docs/app/components/code-example.hbs b/docs/app/components/code-example.hbs
index 69cd1e04..a5ddde6e 100644
--- a/docs/app/components/code-example.hbs
+++ b/docs/app/components/code-example.hbs
@@ -1,22 +1,42 @@
 

   
-  {{#if (and @hbs (eq this.activeTab 'hbs'))}}
+  {{#if (and @hbs (eq this.activeTab "hbs"))}}
     {{#let (get-code-snippet @hbs) as |snippet|}}
       
     {{/let}}
@@ -26,18 +46,21 @@
       
     {{/let}}
   {{/if}}
-  {{#if (and @js (eq this.activeTab 'js'))}}
+  {{#if (and @js (eq this.activeTab "js"))}}
     {{#let (get-code-snippet @js) as |snippet|}}
       
     {{/let}}
   {{/if}}
-  {{#if (and @css (eq this.activeTab 'css'))}}
+  {{#if (and @css (eq this.activeTab "css"))}}
     {{#let (get-code-snippet @css) as |snippet|}}
       
     {{/let}}
   {{/if}}
   {{#if (and this.showResult (has-block))}}
-    

+    

       {{yield this.partialName}}
     

   {{/if}}
diff --git a/docs/app/components/code-inline.hbs b/docs/app/components/code-inline.hbs
index 469cccd2..6cf4785e 100644
--- a/docs/app/components/code-inline.hbs
+++ b/docs/app/components/code-inline.hbs
@@ -1,7 +1,3 @@
-
+
   {{~! ~}}{{this.prismCode}}{{~! ~}}
 
\ No newline at end of file
diff --git a/docs/app/components/snippets/animations-1.hbs b/docs/app/components/snippets/animations-1.hbs
index 15a914a3..0257c78d 100644
--- a/docs/app/components/snippets/animations-1.hbs
+++ b/docs/app/components/snippets/animations-1.hbs
@@ -1,7 +1,7 @@
 
-  Animate me
+  Animate me
 
-  
+  
     
  • Miguel
    • 
     
  • Matthew
    • 
     
  • Dan
    • 
diff --git a/docs/app/components/snippets/content-events-1.hbs b/docs/app/components/snippets/content-events-1.hbs
index f3694827..f774449c 100644
--- a/docs/app/components/snippets/content-events-1.hbs
+++ b/docs/app/components/snippets/content-events-1.hbs
@@ -1,37 +1,37 @@
-
    
-