From de18d1ca9e372d6f07c510d8ff3425990d9eef73 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Fri, 3 May 2024 17:16:42 +0100 Subject: [PATCH 1/3] remove ember-data transform re-exports --- addon/transforms/boolean.js | 1 - addon/transforms/string.js | 1 - app/transforms/boolean.js | 1 - app/transforms/string.js | 1 - 4 files changed, 4 deletions(-) delete mode 100644 addon/transforms/boolean.js delete mode 100644 addon/transforms/string.js delete mode 100644 app/transforms/boolean.js delete mode 100644 app/transforms/string.js diff --git a/addon/transforms/boolean.js b/addon/transforms/boolean.js deleted file mode 100644 index b4d4471..0000000 --- a/addon/transforms/boolean.js +++ /dev/null @@ -1 +0,0 @@ -export { BooleanTransform as default } from '@ember-data/serializer/transform'; diff --git a/addon/transforms/string.js b/addon/transforms/string.js deleted file mode 100644 index ba88168..0000000 --- a/addon/transforms/string.js +++ /dev/null @@ -1 +0,0 @@ -export { StringTransform as default } from '@ember-data/serializer/transform'; diff --git a/app/transforms/boolean.js b/app/transforms/boolean.js deleted file mode 100644 index f6f5a57..0000000 --- a/app/transforms/boolean.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'guidemaker/transforms/boolean'; diff --git a/app/transforms/string.js b/app/transforms/string.js deleted file mode 100644 index 725df92..0000000 --- a/app/transforms/string.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'guidemaker/transforms/string'; From bad19f46fbabead8cc41434525ca1b93472260eb Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Fri, 3 May 2024 17:30:31 +0100 Subject: [PATCH 2/3] move no-deprecations job to allowed to fail --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b841486..4d82e4a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,7 +72,6 @@ jobs: - ember-lts-4.12 - ember-release - embroider-safe - - no-deprecations steps: - uses: actions/checkout@v4 @@ -103,6 +102,7 @@ jobs: - ember-beta - ember-canary - embroider-optimized # this will be passing again when we fix fastboot + - no-deprecations # this is to save from Ember data deprecations that we can't support from 3.28 through to 5.x - ember-release-no-deprecations steps: From 4aedafdfb18474b4bef18220818a20d1fc67cbef Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Fri, 3 May 2024 17:30:52 +0100 Subject: [PATCH 3/3] move embroider-optimized job out of allowed to fail --- .github/workflows/ci.yml | 2 +- package.json | 2 +- pnpm-lock.yaml | 47 +++++++++++++++++++++++++++++----------- 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d82e4a..f4e4668 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,6 +72,7 @@ jobs: - ember-lts-4.12 - ember-release - embroider-safe + - embroider-optimized steps: - uses: actions/checkout@v4 @@ -101,7 +102,6 @@ jobs: try-scenario: - ember-beta - ember-canary - - embroider-optimized # this will be passing again when we fix fastboot - no-deprecations # this is to save from Ember data deprecations that we can't support from 3.28 through to 5.x - ember-release-no-deprecations diff --git a/package.json b/package.json index d2df6ee..67189be 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "ember-cli": "~5.4.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.2", - "ember-cli-fastboot": "^4.1.2", + "ember-cli-fastboot": "^4.1.4", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aea1b12..de1c10c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -113,8 +113,8 @@ devDependencies: specifier: ^3.3.2 version: 3.3.2(ember-cli@5.4.1) ember-cli-fastboot: - specifier: ^4.1.2 - version: 4.1.2 + specifier: ^4.1.4 + version: 4.1.4(ember-source@5.4.1) ember-cli-inject-live-reload: specifier: ^2.1.0 version: 2.1.0 @@ -174,7 +174,7 @@ devDependencies: version: 8.1.1(eslint@8.57.0) guidemaker-default-template: specifier: ^7.0.0 - version: 7.0.0(@babel/core@7.23.7)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-cli-fastboot@4.1.2)(ember-cli-head@2.0.0)(ember-source@5.4.1)(showdown@2.1.0)(webpack@5.90.0) + version: 7.0.0(@babel/core@7.23.7)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-cli-fastboot@4.1.4)(ember-cli-head@2.0.0)(ember-source@5.4.1)(showdown@2.1.0)(webpack@5.90.0) lint-to-the-future: specifier: ^1.1.0 version: 1.3.1 @@ -7817,9 +7817,11 @@ packages: - supports-color dev: true - /ember-cli-fastboot@4.1.2: - resolution: {integrity: sha512-cC2ET8AbRTssA4sg9qF9KLX9N/Xnwa7kS0PKZADMMOUXtuBF4jmgnXsjzlvIE+lgWcwK4tc6udgwpMeNMkOg7w==} - engines: {node: 14.* || 16.* || >=18} + /ember-cli-fastboot@4.1.4(ember-source@5.4.1): + resolution: {integrity: sha512-RYgmY8oiEnPHQ5A8T2jKKB5IbZG8JZuxHCiFoMcOnD+85T3rVulgF7Wt7GFzZ3Ic2pocSFZef45jZG+gT1mJnA==} + engines: {node: 14.* || 16.* || >= 18} + peerDependencies: + ember-source: '>=3.16' dependencies: broccoli-concat: 4.2.5 broccoli-file-creator: 2.1.1 @@ -7831,7 +7833,8 @@ packages: ember-cli-lodash-subset: 2.0.1 ember-cli-preprocess-registry: 3.3.0 ember-cli-version-checker: 5.1.2 - fastboot: 4.1.2 + ember-source: 5.4.1(@babel/core@7.23.7)(@glimmer/component@1.1.2)(@glint/template@1.3.0)(rsvp@4.8.5)(webpack@5.90.0) + fastboot: 4.1.4 fastboot-express-middleware: 4.1.2 fastboot-transform: 0.1.3 fs-extra: 10.1.0 @@ -9691,6 +9694,24 @@ packages: - utf-8-validate dev: true + /fastboot@4.1.4: + resolution: {integrity: sha512-p0kyJ5ZcGwihnu02SZJDnbXTpH+Teg81ufM0zsp3vCg1Xd+jmNNOH5X3baqpW+5Hc2D7vS8cpIxCG0fRfFolfg==} + engines: {node: 12.* || 14.* || >=16} + dependencies: + chalk: 4.1.2 + cookie: 0.4.2 + debug: 4.3.4(supports-color@9.4.0) + jsdom: 19.0.0 + resolve: 1.22.8 + simple-dom: 1.4.0 + source-map-support: 0.5.21 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - utf-8-validate + dev: true + /fastest-levenshtein@1.0.16: resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==} engines: {node: '>= 4.9.1'} @@ -10472,7 +10493,7 @@ packages: resolution: {integrity: sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==} dev: true - /guidemaker-default-template@7.0.0(@babel/core@7.23.7)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-cli-fastboot@4.1.2)(ember-cli-head@2.0.0)(ember-source@5.4.1)(showdown@2.1.0)(webpack@5.90.0): + /guidemaker-default-template@7.0.0(@babel/core@7.23.7)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-cli-fastboot@4.1.4)(ember-cli-head@2.0.0)(ember-source@5.4.1)(showdown@2.1.0)(webpack@5.90.0): resolution: {integrity: sha512-99fJb2p+3Ap0Qkc/kkLPJyMV32KsOuJurqxCQlIdqd8ABSH0yXPOZ8nTKyvBntjRZPh49LzRkF/e34mwwDx/tQ==} peerDependencies: ember-cli-fastboot: '>= 3.0.0' @@ -10481,7 +10502,7 @@ packages: '@embroider/addon-shim': 1.8.7 algoliasearch: 4.22.1 decorator-transforms: 1.1.0(@babel/core@7.23.7) - ember-cli-fastboot: 4.1.2 + ember-cli-fastboot: 4.1.4(ember-source@5.4.1) ember-cli-head: 2.0.0 ember-collapsible-panel: 6.1.0(@glint/template@1.3.0)(ember-source@5.4.1) ember-concurrency: 4.0.0(@babel/core@7.23.7)(@glimmer/tracking@1.1.2)(@glint/template@1.3.0)(ember-source@5.4.1) @@ -10490,7 +10511,7 @@ packages: ember-root-url: 1.0.1 ember-route-template: 1.0.3 ember-showdown-prism: 4.4.0(@babel/core@7.23.7)(@glint/template@1.3.0)(ember-source@5.4.1)(showdown@2.1.0)(webpack@5.90.0) - ember-tether: github.com/mansona/ember-tether/6ff38253f736ce894b67a27db300d9dfb0aa05c7(@glint/template@1.3.0)(ember-source@5.4.1)(webpack@5.90.0) + ember-tether: github.com/mansona/ember-tether/2350880b88a684606ebb09ca22f9be77f26e8cae(@glint/template@1.3.0)(ember-source@5.4.1)(webpack@5.90.0) transitivePeerDependencies: - '@babel/core' - '@glimmer/tracking' @@ -16211,9 +16232,9 @@ packages: engines: {node: '>=12.20'} dev: true - github.com/mansona/ember-tether/6ff38253f736ce894b67a27db300d9dfb0aa05c7(@glint/template@1.3.0)(ember-source@5.4.1)(webpack@5.90.0): - resolution: {tarball: https://codeload.github.com/mansona/ember-tether/tar.gz/6ff38253f736ce894b67a27db300d9dfb0aa05c7} - id: github.com/mansona/ember-tether/6ff38253f736ce894b67a27db300d9dfb0aa05c7 + github.com/mansona/ember-tether/2350880b88a684606ebb09ca22f9be77f26e8cae(@glint/template@1.3.0)(ember-source@5.4.1)(webpack@5.90.0): + resolution: {tarball: https://codeload.github.com/mansona/ember-tether/tar.gz/2350880b88a684606ebb09ca22f9be77f26e8cae} + id: github.com/mansona/ember-tether/2350880b88a684606ebb09ca22f9be77f26e8cae name: ember-tether version: 3.0.0 engines: {node: '>= 14'}