Commit fbbf656
committed
Merge origin/main into fix/837-rest-url-imports-route-through-ability
Resolves the includes/rest.php conflict introduced by main's
feat/840 plan-first import refactor, which unified URL import
handling inside the static-site-importer/import ability (no
separate import-url ability). Reconciles the branch onto main's
unified ability model:
- Includes/rest.php: keep main's source_runtime/create_import
shape; remove the dead URL branch that called the deleted
Static_Site_Importer_URL_Import_Runtime::website_artifact_from_url();
route URL-only sources through static_site_importer_rest_route_url_import
which dispatches them to the unified 'static-site-importer/import' ability
with source.type=url; playground mode short-circuits to a
requires_ability_capable_target envelope.
- tests/smoke-rest-url-import-{helpers,via-ability,continuation,private-ip}.php
rewritten to drive the unified ability; assertions updated to match the
new envelope shape.
- tests/smoke-importer-block.php: URL-only REST assertions updated to
match the unified ability and new envelope.
Refs #837, #842.34 files changed
Lines changed: 1269 additions & 330 deletions
File tree
- includes
- tests
- tools
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
169 | 169 | | |
170 | 170 | | |
171 | 171 | | |
172 | | - | |
| 172 | + | |
173 | 173 | | |
174 | 174 | | |
175 | 175 | | |
| |||
252 | 252 | | |
253 | 253 | | |
254 | 254 | | |
| 255 | + | |
| 256 | + | |
255 | 257 | | |
256 | 258 | | |
257 | 259 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
80 | 80 | | |
81 | 81 | | |
82 | 82 | | |
83 | | - | |
| 83 | + | |
84 | 84 | | |
85 | 85 | | |
86 | 86 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
| |||
33 | 34 | | |
34 | 35 | | |
35 | 36 | | |
| 37 | + | |
36 | 38 | | |
37 | 39 | | |
38 | 40 | | |
| |||
0 commit comments