diff --git a/patches/ember-cli-addon-docs@6.0.2.patch b/patches/ember-cli-addon-docs@6.0.2.patch index ea590702..3850be74 100644 --- a/patches/ember-cli-addon-docs@6.0.2.patch +++ b/patches/ember-cli-addon-docs@6.0.2.patch @@ -1,3 +1,16 @@ +diff --git a/.vscode/settings.json b/.vscode/settings.json +new file mode 100644 +index 0000000000000000000000000000000000000000..f6e1d59217c5a9a7b520c5b78336c519ca2360f1 +--- /dev/null ++++ b/.vscode/settings.json +@@ -0,0 +1,6 @@ ++{ ++ "eslint.validate": [ ++ "glimmer-ts", ++ "glimmer-js" ++ ] ++} +\ No newline at end of file diff --git a/addon/models/module.js b/addon/models/module.js index 4887ba3bd30829653cd6944f1097ed65db41a9da..8c10bc597ef794f99e52549d0bef31eae12b08a1 100644 --- a/addon/models/module.js @@ -11,3 +24,16 @@ index 4887ba3bd30829653cd6944f1097ed65db41a9da..8c10bc597ef794f99e52549d0bef31ea components; /* +diff --git a/index.js b/index.js +index f91f1ea4d0c64c41595f7b27dca4d6618145cd0d..f4c71b7e9f7d208b31479f34c3c618b71518e88a 100644 +--- a/index.js ++++ b/index.js +@@ -386,7 +386,7 @@ module.exports = { + let addon; + if (this._documentingAddonAt()) { + addon = this.project.addons.find( +- (a) => a.root === this._documentingAddonAt(), ++ (a) => a.root === this._documentingAddonAt() || a.root.endsWith(module.exports.name), + ); + if (!addon) { + throw new Error( diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 13f418c1..0df4cb0e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,7 +6,7 @@ settings: patchedDependencies: ember-cli-addon-docs@6.0.2: - hash: zycz5546wzymysogfyhw5acqzu + hash: ohdsvrkdh24l4ilr4kkpgeroqm path: patches/ember-cli-addon-docs@6.0.2.patch importers: @@ -158,7 +158,7 @@ importers: version: 5.4.0 ember-cli-addon-docs: specifier: ^6.0.2 - version: 6.0.2(patch_hash=zycz5546wzymysogfyhw5acqzu)(@babel/core@7.23.3)(@ember/test-helpers@3.2.0)(ember-data@4.12.4)(ember-fetch@8.1.2)(ember-source@5.4.0)(webpack@5.89.0) + version: 6.0.2(patch_hash=ohdsvrkdh24l4ilr4kkpgeroqm)(@babel/core@7.23.3)(@ember/test-helpers@3.2.0)(ember-data@4.12.4)(ember-fetch@8.1.2)(ember-source@5.4.0)(webpack@5.89.0) ember-cli-addon-docs-yuidoc: specifier: ^1.0.0 version: 1.0.0 @@ -212,7 +212,7 @@ importers: version: 8.1.2 ember-flatpickr: specifier: workspace:* - version: link:../ember-flatpickr + version: file:ember-flatpickr(@babel/core@7.23.3)(ember-source@5.4.0)(flatpickr@4.6.13)(webpack@5.89.0) ember-load-initializers: specifier: ^2.1.2 version: 2.1.2(@babel/core@7.23.3) @@ -306,6 +306,9 @@ importers: webpack: specifier: ^5.89.0 version: 5.89.0 + dependenciesMeta: + ember-flatpickr: + injected: true packages: @@ -7418,7 +7421,7 @@ packages: - supports-color dev: true - /ember-cli-addon-docs@6.0.2(patch_hash=zycz5546wzymysogfyhw5acqzu)(@babel/core@7.23.3)(@ember/test-helpers@3.2.0)(ember-data@4.12.4)(ember-fetch@8.1.2)(ember-source@5.4.0)(webpack@5.89.0): + /ember-cli-addon-docs@6.0.2(patch_hash=ohdsvrkdh24l4ilr4kkpgeroqm)(@babel/core@7.23.3)(@ember/test-helpers@3.2.0)(ember-data@4.12.4)(ember-fetch@8.1.2)(ember-source@5.4.0)(webpack@5.89.0): resolution: {integrity: sha512-pHcrMttJV5pH6QKvHUhoCLxraxJFVvyVRwXuU09yXcmrNI5jSaqnOCyif2wa/ibTQvejt/kwsAn1yHB4bZVs4w==} engines: {node: 16.* || >= 18} peerDependencies: @@ -17549,3 +17552,24 @@ packages: transitivePeerDependencies: - supports-color dev: true + + file:ember-flatpickr(@babel/core@7.23.3)(ember-source@5.4.0)(flatpickr@4.6.13)(webpack@5.89.0): + resolution: {directory: ember-flatpickr, type: directory} + id: file:ember-flatpickr + name: ember-flatpickr + engines: {node: 14.* || 16.* || >= 18} + peerDependencies: + ember-source: ^4.0.0 || ^5.0.0 + flatpickr: ^4.0.0 + dependencies: + '@ember/render-modifiers': 2.1.0(@babel/core@7.23.3)(ember-source@5.4.0) + '@ember/test-helpers': 3.2.0(ember-source@5.4.0)(webpack@5.89.0) + '@embroider/addon-shim': 1.8.7 + ember-source: 5.4.0(@babel/core@7.23.3)(@glimmer/component@1.1.2)(rsvp@4.8.5)(webpack@5.89.0) + flatpickr: 4.6.13 + transitivePeerDependencies: + - '@babel/core' + - '@glint/template' + - supports-color + - webpack + dev: true diff --git a/test-app/package.json b/test-app/package.json index c86c2cb0..c2c478e1 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -30,7 +30,7 @@ "lint:js": "eslint . --cache", "lint:js:fix": "eslint . --fix", "start": "ember serve", - "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"", + "test": "concurrently \"npm:lint\" \"npm:test:*(!ember-compatibility)\" --names \"lint,test:\"", "test:ember": "ember test", "test:ember-compatibility": "ember try:each", "prepack": "ember ts:precompile", @@ -112,6 +112,11 @@ "engines": { "node": ">= 18" }, + "dependenciesMeta": { + "ember-flatpickr": { + "injected": true + } + }, "publishConfig": { "registry": "https://registry.npmjs.org" },