Ben Holmes
564caf24c2
Fix: React hydration failure ( #3094 )
...
* fix: react hydration failure
* chore: changeset
2022-04-12 17:00:52 -04:00
matthewp
6d0b0597bd
[ci] format
2022-04-12 20:50:59 +00:00
Matthew Phillips
a5caf08e24
Allow setting multiple cookies in Netlify adapter ( #3092 )
...
* Allow setting multiple cookies in Netlify adapter
* Adds a changeset
* Set the response status code
* Add a comment on why this is needed
2022-04-12 16:50:10 -04:00
Juan Martín Seery
f665d1a250
fix(vercel): support dynamic paths ( #3081 )
...
* fix(vercel): support dynamic paths
* Changeset
2022-04-12 10:02:59 -04:00
github-actions[bot]
0966a432a8
[ci] release ( #3080 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-04-11 19:59:32 -07:00
Juan Martín Seery
b835e285de
feat: markdown config typechecking ( #2970 )
...
* Added schemas to markdown plugin
* Added new schemas to main package
* Changesets
* typeraw
* Explaination about the weird type hack
* Added markdown.mode to config
* Added comment
* Formatted
* Moved validation to `astro` and added RemarkPlugin ad RehypePlugin
* Removed the ability to have a custom markdown renderer internally
* Fixed plugin type
* Removed unused renderMarkdownWithFrontmatter
* Added missing dependency
* Dynamically import astro markdown
* Cache import
2022-04-11 16:01:12 -07:00
FredKSchott
11766acec9
[ci] format
2022-04-11 22:58:13 +00:00
Fred K. Schott
5b3464a803
fix ssr url search params bug ( #3066 )
2022-04-11 15:57:18 -07:00
Juan Martín Seery
3d96315545
chore: updated turborepo ( #3039 )
...
* chore: updated turborepo
* Revert changes to turbo.json
* Simplified test command
* tests should run serially
Co-authored-by: Fred K. Schott <fkschott@gmail.com>
2022-04-11 15:55:28 -07:00
hippotastic
9f248b0563
Make Netlify adapter actually append redirects ( #3079 )
2022-04-11 12:30:47 -07:00
Fred K. Schott
771127ea29
remove unused renderers ( #3063 )
2022-04-11 11:19:41 -07:00
github-actions[bot]
791a524411
[ci] release ( #3064 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-04-10 21:13:11 -07:00
FredKSchott
83d83a7b04
[ci] format
2022-04-11 03:30:44 +00:00
Fred K. Schott
83613120a9
fix up changelogs
2022-04-10 20:29:51 -07:00
github-actions[bot]
21c74e572c
[ci] release ( #3061 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-04-10 20:15:02 -07:00
Fred K. Schott
2bb6a06ebb
revert release
2022-04-10 20:11:34 -07:00
Fred K. Schott
35346c118d
Update astro changelog
2022-04-10 20:03:16 -07:00
FredKSchott
e2e28ca23e
[ci] format
2022-04-11 03:02:11 +00:00
github-actions[bot]
46f02d9cf4
[ci] release ( #3060 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-04-10 20:01:00 -07:00
Fred K. Schott
77c0be5b26
update lockfile ( #3059 )
2022-04-10 19:12:30 -07:00
Juan Martín Seery
1907255ca2
chore: webapi test now use chai ( #3048 )
2022-04-10 18:29:46 -07:00
Fred K. Schott
47f20a189f
update test names containing spaces
2022-04-10 18:26:52 -07:00
FredKSchott
0c8b2193b2
[ci] format
2022-04-11 01:24:06 +00:00
Steve Lee
7b0fbd731e
Fix SSR static build public file copying. fixes #3016 ( #3037 )
...
* Fix SSR static build public file copying
* chore: update lockfile
* remove dirname and use URL constructor
* Cleanup test and actually test what it says it tests
Co-authored-by: Nate Moore <nate@skypack.dev>
2022-04-10 18:23:17 -07:00
Fred K. Schott
c05a544acd
update tailwind integration readme
2022-04-10 18:12:34 -07:00
FredKSchott
39e0a7d757
[ci] format
2022-04-10 21:35:37 +00:00
Fred K. Schott
fbc32cf655
remove site requirement from netlify adapter ( #3041 )
...
* remove site requirement from netlify adapter
* update readme
2022-04-10 14:34:49 -07:00
Fred K. Schott
d63dcd505a
add missing self type ( #3042 )
2022-04-10 14:34:40 -07:00
Juan Martín Seery
982f64f69a
chore: updated esbuild ( #3028 )
...
* chore: updated esbuild
* Changeset
2022-04-10 14:33:10 -07:00
Erika
d1f292199c
Update JSDoc comments that get shown in editor ( #2999 )
2022-04-07 17:08:27 -04:00
matthewp
cde2c44184
[ci] format
2022-04-07 19:23:39 +00:00
github-actions[bot]
a5aea2ce56
[ci] release (beta) ( #3023 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-04-07 15:22:47 -04:00
matthewp
7ada6280f2
[ci] format
2022-04-07 19:18:48 +00:00
Matthew Phillips
4b0f27d9ff
Fixes adding set-cookie headers multiple times ( #3026 )
...
* Fixes adding set-cookie headers multiple times
* Adds a changeset
2022-04-07 15:18:08 -04:00
matthewp
c3b083f286
[ci] format
2022-04-07 19:17:47 +00:00
Matthew Phillips
7e9d82d75e
Warn when trying to access headers in SSG mode ( #3021 )
...
* Warn when trying to access headers in SSG mode
* Adds a changeset
* Warn when accessing headers at all + a test
2022-04-07 15:17:05 -04:00
tony-sull
42e0e0fa5c
[ci] format
2022-04-07 18:27:20 +00:00
Tony Sullivan
c773dcde31
Exclude any ?raw or ?url css imports when adding asset links ( #3020 )
...
* exclude any ?raw css imports when adding css asset links
* ?url imports should be ignored as well
* chore: adding changeset
2022-04-07 18:26:26 +00:00
matthewp
c757427fca
[ci] format
2022-04-07 17:23:16 +00:00
Matthew Phillips
8c04ff1f0b
Allow an adapter to export default ( #3022 )
...
* Allow an adapter to export default
* Adds a changeset
2022-04-07 13:21:56 -04:00
natemoo-re
5b51d81889
[ci] format
2022-04-06 21:41:37 +00:00
github-actions[bot]
1d0c1d8977
[ci] release (beta) ( #3007 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-04-06 16:40:46 -05:00
natemoo-re
aa8fb4af51
[ci] format
2022-04-06 21:38:53 +00:00
Nate Moore
25cc9218f8
fix( #2987 ): relative config handling with --config
flag ( #3001 )
...
* fix(#2987 ): relative config handling with `--config` flag
* test: fix tests
* fix: improve config test for failure case
* fix: test on windows?
* fix: test on windows?
2022-04-06 16:37:49 -05:00
matthewp
340cc1c8e4
[ci] format
2022-04-06 20:22:36 +00:00
Matthew Phillips
c6f8bce7c3
Fix Netlify adapter and dynamic routes ( #3011 )
...
* Fix Netlify adapter and dynamic routes
* Changeset
2022-04-06 16:21:46 -04:00
Juan Martín Seery
8bd49c9536
fix(integrations): astro:build:done
dir now matches SSR client output ( #3008 )
...
* `dir` now matches client output
* Updated integrations
* Changeset
2022-04-06 16:20:58 -04:00
Ryan Carniato
13b782f421
fix: Nested hydration with Solid ( #3003 )
...
* fix: solid nested hydration
* Create ten-rice-unite.md
Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
2022-04-06 14:42:01 -05:00
natemoo-re
debdf11b19
[ci] format
2022-04-06 17:19:49 +00:00
Peter Singh
d0777ad3af
Astro add docs ( #2958 )
...
* So This works 😎
* need to add to the cli next
* Renamed Files and Export
Applied creditation to where I found the
'inspiration' for this application.
* applied `astro docs` to cli
* Trying to add to CLI,
Not working 🤷♂️
* Converted into async method,
* 🎆 🎆 It works!!! 🥳 🎉 🥳
Embarrasing as it is I totally missed the part where logic was to be in.
* Moved `docs` cmd to `supportedCommands`
* refactor: cleanup docs command
* chore: add changeset
* chore: rename browser to open
Co-authored-by: Nate Moore <nate@skypack.dev>
2022-04-06 12:19:05 -05:00
Juan Martín Seery
b5ed099eaf
fix: @astrojs/vercel bug fixes ( #3000 )
...
* Fixed outDir
* Updated server out
* changeset
* Renamed out to tmp
2022-04-06 14:15:46 -03:00
matthewp
e8aaedcac8
[ci] format
2022-04-06 17:08:05 +00:00
github-actions[bot]
013150e2de
[ci] release (beta) ( #3005 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-04-06 13:06:36 -04:00
Matthew Phillips
68e1e2dd31
Fixes dynamic API routes in SSR ( #3006 )
...
* Fixes dynamic API routes in SSR
* Adds a changeset
2022-04-06 13:01:22 -04:00
tony-sull
3bf5d84016
[ci] format
2022-04-06 15:34:09 +00:00
Tony Sullivan
9724d844b3
fix( #2981 ): keeps astro preview
server alive ( #3004 )
...
* fix(#2981 ): keeps server alive
* chore: adding changeset
* keep alive until the 'close' or 'error' event fires
2022-04-06 15:33:07 +00:00
Nate Moore
ba90ef53d3
Update readme.md
2022-04-06 10:27:16 -05:00
matthewp
cf92954e5a
[ci] format
2022-04-05 19:29:23 +00:00
github-actions[bot]
48d01049b0
[ci] release (beta) ( #2997 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-04-05 15:28:29 -04:00
Ben Holmes
77aa3a5c50
Docs: netlify adapter site requirement ( #2996 )
...
* feat: human-readable error on bad site or base
* fix: human-readable error should have 1 config option
* docs: update README
* chore: changeset
* docs: mention localhost for testing via netlify CLI
2022-04-05 11:25:48 -04:00
FredKSchott
b3f55f235a
[ci] format
2022-04-05 01:08:00 +00:00
github-actions[bot]
4e021f70e1
[ci] release (beta) ( #2992 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-04-04 18:07:09 -07:00
FredKSchott
a85ea0772c
[ci] format
2022-04-05 01:02:20 +00:00
Fred K. Schott
8425347cd5
fix markdown mode default ( #2991 )
...
* fix markdown mode default
* Update config.ts
2022-04-04 18:01:31 -07:00
FredKSchott
c51ce91365
[ci] format
2022-04-04 22:21:00 +00:00
github-actions[bot]
ac34a5a03a
[ci] release (beta) ( #2989 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-04-04 15:19:57 -07:00
Erika
1bc73c86fd
Add missing entry in files field in package.json ( #2988 )
2022-04-04 12:07:57 -07:00
natemoo-re
6c0c0679d8
[ci] format
2022-04-04 16:36:30 +00:00
github-actions[bot]
a68885c0d6
[ci] release (beta) ( #2986 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-04-04 11:35:25 -05:00
Princesseuh
9e01f4475c
[ci] format
2022-04-04 16:27:03 +00:00
Erika
47e0539cce
Add JSX definitions to main repo ( #2985 )
2022-04-04 12:26:15 -04:00
FredKSchott
c2ed6fe360
[ci] format
2022-04-04 06:26:31 +00:00
github-actions[bot]
2552db0d09
[ci] release ( #2975 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-04-03 23:25:00 -07:00
Fred K. Schott
efc63bfd0f
fix outdir default type docs
2022-04-03 23:19:27 -07:00
Nate Moore
3f0bc5af57
fix: edge case with slotted children ( #2978 )
2022-04-03 23:18:07 -07:00
Tony Sullivan
dff89a0fa3
Merge branch 'main' of github.com:withastro/astro
2022-04-03 20:42:41 +02:00
Juan Martín Seery
824458790a
fix(cli): prevent CLI from hanging ( #2974 )
...
* fix(cli): prevent hanging CLI
* Changeset
2022-04-03 14:32:39 -03:00
Juan Martín Seery
ad3c391696
fix(markdown): escape when mode == 'md' ( #2971 )
...
* Fix rehype escape
* Changeset
2022-04-03 14:32:12 -03:00
Tony Sullivan
75919537be
Fixing the new config defaults (docs only) ( #2973 )
...
* updating the default listed in config jsdocs
* chore: adding changeset
* outDir had the wrong default listed as well
* chore: updating changeset description
2022-04-03 17:05:30 +00:00
JuanM04
bf2199e1df
New astro config
2022-04-02 18:59:03 -03:00
JuanM04
ccce433994
Formatted
2022-04-02 18:56:13 -03:00
JuanM04
a377ac1efc
Merge branch 'main' into feat/vercel-adapter
2022-04-02 18:53:00 -03:00
Fred K. Schott
1335797903
update prettier width ( #2968 )
2022-04-02 14:15:41 -06:00
FredKSchott
d63213f119
[ci] format
2022-04-02 19:50:17 +00:00
github-actions[bot]
7fe149ae43
[ci] release ( #2969 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-04-02 13:49:27 -06:00
Fred K. Schott
e425f896b6
Revert "[ci] release ( #2925 )"
...
This reverts commit 48c9b142cc
.
2022-04-02 13:46:25 -06:00
FredKSchott
d047baad11
[ci] format
2022-04-02 19:41:44 +00:00
github-actions[bot]
48c9b142cc
[ci] release ( #2925 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-04-02 13:40:46 -06:00
Fred K. Schott
3483cc2285
exit prerelease mode ( #2967 )
2022-04-02 13:37:28 -06:00
FredKSchott
bae719505d
[ci] format
2022-04-02 18:30:48 +00:00
Nate Moore
17c02925c5
Migrate to new config ( #2962 )
...
* wip: config migration
* fix: formatting
* refactor: projectRoot -> root
* refactor: pageUrlFormat -> format
* refactor: buildOptions.site -> site
* refactor: public -> publicDir
* refactor: dist -> outDir
* refactor: styleOptions -> style
* fix: some dist tests -> outDir
* refactor: remove legacyBuild (with TODOs)
* refactor: more legacyBuild cleanup
* refactor: server host and port
* fix: remove experimentalStaticBuild CLI flag
* refactor: src -> srcDir
* refactor: devOptions.trailing -> trailing
* refactor: remove sitemap + related flags
* refactor: experimentalSSR -> experimental.ssr
* fix: last devOptions
* refactor: drafts -> markdown.drafts
* fix: TS error on port as const
* refactor: remove pages
* refactor: more --project-root updates
* refactor: markdownOptions -> markdown
* fix: remaining type errors
* feat: update AstroUserConfig
* refactor: update CLI flag mapper + server mapper
* fix: loadFixture projectRoot
* fix: merge CLI flags before validating / transforming
* wip: attempt to fix bad createRouteManifest config
* refactor: combine config.base and config.site
* fix: skip route manifest test for now
* fix: site and base handling
* refactor: update failing config testes
* fix: build failure
* feat: update config types with migration help
* chore: update types
* fix(deno): update deno fixture
* chore: remove config migration logic
* chore: remove logLevel
* chore: clean-up config types
* chore: update config warning
* chore: add changeset
* Sitemap Integration (#2965 )
* feat: add sitemap filter config option
* feat: add canonicalURL sitemap config option
* docs: update sitemap README
* fix: update for new config
* fix: filter not being applied
* chore: changeset
Co-authored-by: bholmesdev <hey@bholmes.dev>
* fred pass
* fix: Astro.resolve typo
* fix: public => publicDir
Co-authored-by: bholmesdev <hey@bholmes.dev>
Co-authored-by: Fred K. Schott <fkschott@gmail.com>
2022-04-02 12:29:59 -06:00
natemoo-re
76f6643ddd
[ci] format
2022-04-02 17:35:42 +00:00
Nate Moore
d55658f061
Implement new default script
behavior, style is:global
( #2961 )
...
* feat: implement RFC0016
* chore: update to latest compiler
* chore: update compiler
* test: fix script tests
* test: update public tests
* feat: throw a warning when referencing scripts in `public/` without `is:inline`
2022-04-02 12:34:25 -05:00
matthewp
84f23d677a
[ci] format
2022-04-01 17:33:12 +00:00
Matthew Phillips
b4ad11b569
Add tests for using buildConfig ( #2960 )
2022-04-01 13:32:22 -04:00
Juan Martín Seery
645e1f2ac9
Fixed flag override ( #2956 )
2022-04-01 09:09:24 -05:00
Tony Sullivan
226822cbbf
Allows projects to opt out of the base Tailwind styles ( #2959 )
...
* adding an option to opt-out of the Tailwind base styles
* chore: adding changeset description
2022-04-01 13:45:43 +00:00
Nate Moore
80e6e759e2
Update compiler ( #2957 )
...
* chore: update compiler
* chore: add changeset
2022-03-31 22:33:07 -05:00
JuanM04
2c260760b4
Merge branch 'main' into feat/vercel-adapter
2022-03-31 20:43:57 -03:00
JuanM04
60c5823ae1
Added some comments
2022-03-31 15:37:33 -03:00
JuanM04
56cb78bd40
Reverted config hook changes
2022-03-31 15:31:56 -03:00
JuanM04
c2f4dd44e3
Removed extra code
2022-03-31 15:14:04 -03:00
JuanM04
437e08e5ca
Updated readme
2022-03-31 15:12:43 -03:00
natemoo-re
cccc6034ae
[ci] format
2022-03-31 18:12:16 +00:00
JuanM04
764467a21d
Merge branch 'main' into feat/vercel-adapter
2022-03-31 15:11:56 -03:00
Nate Moore
d81b6d9ebc
Add function-based slot support to Astro.slots.render()
( #2954 )
...
* feat(slots): add function-based slot support to Astro.slots.render()
* test(slots): add render tests
2022-03-31 13:11:26 -05:00
matthewp
50af480c7d
[ci] format
2022-03-31 18:04:57 +00:00
Matthew Phillips
cebdc85428
SSR - copy public folder when there is no client JS ( #2955 )
...
* SSR - copy public folder when there is no client JS
* Changest
* Use isBuildingToSSR
Co-authored-by: JuanM04 <me@juanm04.com>
2022-03-31 14:04:09 -04:00
natemoo-re
e044d99696
[ci] format
2022-03-31 17:59:39 +00:00
Nate Moore
93e431967f
chore: add code comment
2022-03-31 12:58:51 -05:00
Juan Martín Seery
d10c3dea21
fix: --experimental-ssr
fixes ( #2937 )
...
* Replaced `--experimental-ssr` with `isBuildingToSSR`
* changest
* Improved `isBuildingToSSR` a bit
* Added `isBuildingToSSR` to more places!!1!
* Added `@deprecated` tag
* Replaced missing experimentalSsr
* Added failing test
* Removed test
* Re-added experimental ssr flag
* Fixed typo
Co-authored-by: Matthew Phillips <matthew@skypack.dev>
* Fixed deno tests
Co-authored-by: Matthew Phillips <matthew@skypack.dev>
2022-03-31 13:58:03 -04:00
matthewp
355c966f80
[ci] format
2022-03-31 17:02:05 +00:00
Fred K. Schott
3a4dc9e0a7
React 18 monorepo upgrade ( #2948 )
...
* First pass at supporting React 18 in @astrojs/react
* Try marking React 18’s `react-dom/client` as external
* Try a different approach to importing different React versions
* Allow resolving JSON modules
* Revert "Allow resolving JSON modules"
This reverts commit 5279b7249c
.
* Try the separate client entrypoint approach from #2946
* Clean up diff
* Trying to see something
* Just keep swimming… 🐠
* update to support react 18
* update React to React 18 across the board
Co-authored-by: delucis <swithinbank@gmail.com>
Co-authored-by: Matthew Phillips <matthew@skypack.dev>
2022-03-31 13:01:05 -04:00
matthewp
bdb9ba1c34
[ci] format
2022-03-31 16:52:34 +00:00
Fred K. Schott
57f48b2701
Add support for React 18 in @astrojs/react ( #2947 )
...
* First pass at supporting React 18 in @astrojs/react
* Try marking React 18’s `react-dom/client` as external
* Try a different approach to importing different React versions
* Allow resolving JSON modules
* Revert "Allow resolving JSON modules"
This reverts commit 5279b7249c
.
* Try the separate client entrypoint approach from #2946
* Clean up diff
* Trying to see something
* Just keep swimming… 🐠
* update to support react 18
* add changeset
* add docs
Co-authored-by: delucis <swithinbank@gmail.com>
2022-03-31 12:51:29 -04:00
JuanM04
e890b528c4
Build to CommonJS
2022-03-30 23:08:39 -03:00
JuanM04
09e8b8e502
Updated hooks
2022-03-30 21:51:37 -03:00
JuanM04
20c3969a43
Merge branch 'main' into feat/vercel-adapter
2022-03-30 21:50:41 -03:00
matthewp
52d7fec248
[ci] format
2022-03-30 19:56:27 +00:00
Matthew Phillips
c989f106f9
Allow components to return a Response ( #2944 )
...
* Allow components to return a Response
* Changeset
2022-03-30 15:55:22 -04:00
matthewp
6a1a40eef8
[ci] format
2022-03-30 12:43:13 +00:00
Matthew Phillips
13b271bc7d
Deno adapter ( #2934 )
...
* Bundle everything, commit 1
* Get everything working
* Remove dependency on readable-stream
* Adds a changeset
* Fix ts errors
* Use the node logger in tests
* Callback the logger when done writing
* Fix test helper to await the callback
* Use serialize-javascript again
* Remove dead code
* Rename hook
* Oops
2022-03-30 08:42:19 -04:00
JuanM04
8c65f13327
Updated readme
2022-03-29 23:11:27 -03:00
JuanM04
fc2dc973f2
Reverted changes in core/build
2022-03-29 23:06:06 -03:00
JuanM04
0555099619
Removed changes no longer necessary
2022-03-29 23:04:53 -03:00
JuanM04
697ff4dfb4
Rework - now it's all SSR
2022-03-29 23:01:37 -03:00
JuanM04
1278d39b86
Added readonly config to more hooks
2022-03-29 19:02:56 -03:00
Fred K. Schott
fff83bb5c2
remove docs jsdoc tag from adapter ( #2927 )
2022-03-29 16:03:45 -05:00
matthewp
c24e5c9687
[ci] format
2022-03-29 20:59:59 +00:00
Matthew Phillips
f048cdff70
Fixes API route compat with Node 14 ( #2936 )
...
* Fixes API route compat with Node 14
* Changeset
2022-03-29 16:59:06 -04:00
JuanM04
7e5f6f1cbb
Merge branch 'main' into feat/vercel-adapter
2022-03-29 17:36:10 -03:00
Fred K. Schott
23b8ee2738
[ci] update lockfile ( #2930 )
...
Co-authored-by: FredKSchott <FredKSchott@users.noreply.github.com>
2022-03-29 08:59:46 -07:00
matthewp
9fa013b4fa
[ci] format
2022-03-29 12:19:10 +00:00
Matthew Phillips
ecbcc8c42c
Make it deployable to Netlify ( #2931 )
2022-03-29 08:18:11 -04:00
matthewp
f0275298bd
[ci] format
2022-03-29 11:36:02 +00:00
Matthew Phillips
ecc6a4833f
Implement the Astro.request RFC ( #2913 )
...
* Implement the Astro.request RFC
* Disable console warnings eslint
* Use our logger
* Adds a changeset
* Fix tests that depend on params, canonicalURL, URL
Co-authored-by: Fred K. Schott <fkschott@gmail.com>
2022-03-29 07:35:03 -04:00
FredKSchott
1e3550d5ac
[ci] format
2022-03-29 00:17:02 +00:00
Fred K. Schott
4299ab303b
New Markdown API ( #2862 )
...
* Implement new markdown plugin with deferred markdown rendering
* feat: switch from `getContent()` fn to `<Content />` API
* update types
* Update packages/astro/src/@types/astro.ts
Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
* update types
* Create forty-coins-attend.md
Co-authored-by: Nate Moore <nate@skypack.dev>
Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
2022-03-28 17:16:06 -07:00
FredKSchott
7d29feace1
[ci] format
2022-03-28 23:56:17 +00:00
Fred K. Schott
f70207082a
Restyle error messages ( #2902 )
...
* clean up error logging in astro
* update from ben feedback
* Update packages/astro/src/core/build/generate.ts
Co-authored-by: Ben Holmes <hey@bholmes.dev>
Co-authored-by: Ben Holmes <hey@bholmes.dev>
2022-03-28 16:55:36 -07:00
FredKSchott
ab9e3d5988
[ci] format
2022-03-28 23:52:58 +00:00
github-actions[bot]
425139f912
[ci] release ( #2923 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-03-28 16:52:04 -07:00
Fred K. Schott
9904c4c89d
[ci] update lockfile ( #2900 )
...
Co-authored-by: FredKSchott <FredKSchott@users.noreply.github.com>
2022-03-28 15:47:17 -07:00
JuanM04
d6f0d5cf3c
Merge branch 'main' into feat/vercel-adapter
2022-03-28 19:44:29 -03:00
Chris Swithinbank
22b1432e3e
Fix typing of integrations
array in user config ( #2907 )
...
* Fix type of `integrations` in config
As per [docs](https://docs.astro.build/en/reference/integrations-reference/#combining-plugins ), an integration can return an array of `AstroIntegration` objects to support bundling a collection of integrations as a preset. This change reflects that usages in the typing for the user config object.
* Add changeset
2022-03-28 17:07:07 -05:00
natemoo-re
9b7e419989
[ci] format
2022-03-28 22:06:23 +00:00
Rafid Muhymin Wafi
30d0fcedbb
Corrected package name in warning message ( #2911 )
...
* fixed typo in warning message
* added missing type
2022-03-28 17:05:40 -05:00
JuanM04
a878a5cb77
Updated some types + added webapi
2022-03-28 17:55:03 -03:00
matthewp
6667c41f00
[ci] format
2022-03-28 20:53:24 +00:00
github-actions[bot]
8b7220f5e4
[ci] release ( #2919 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-03-28 16:52:23 -04:00
matthewp
5c9312620d
[ci] format
2022-03-28 20:49:06 +00:00
Matthew Phillips
77354c89bd
Prevent CSS from being added to pages not using it ( #2918 )
...
* Prevent CSS from being added to pages not using it
* Adds a changeset
* Add clarification when the CSS is appended to the pageData
* Move addStyles up a level
2022-03-28 16:48:06 -04:00
JuanM04
f946687bea
Build API Routes
2022-03-28 15:13:14 -03:00
JuanM04
d4cff2333d
Basic Filesystem API
2022-03-28 10:05:55 -03:00
FredKSchott
a812586b58
[ci] format
2022-03-26 00:17:33 +00:00
github-actions[bot]
273919328a
[ci] release ( #2896 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-03-25 17:16:33 -07:00
FredKSchott
8b1b4315b8
[ci] format
2022-03-26 00:12:26 +00:00
Fred K. Schott
f268451268
small tailwind example config fix ( #2893 )
...
* fix tailwind config example
* Create shaggy-bulldogs-beam.md
2022-03-25 17:11:45 -07:00
Fred K. Schott
9d6e0b5dba
add experimental integrations flag ( #2894 )
2022-03-25 17:11:36 -07:00
natemoo-re
068e3b4dee
[ci] format
2022-03-25 23:04:57 +00:00
github-actions[bot]
779b5dd37c
[ci] release ( #2892 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-03-25 18:03:58 -05:00
Nate Moore
a0d67b1d25
Fix missing execa
dependency ( #2891 )
...
* fix: update dependencies
* chore: add changeset
2022-03-25 18:01:13 -05:00
Zade Viggers
71c12b9047
Correct package name in solid intergration readme ( #2889 )
...
* Correct package name in solid intergration readme
* Create polite-mirrors-fix.md
Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
2022-03-25 17:54:18 -05:00
natemoo-re
192d703563
[ci] format
2022-03-25 22:01:50 +00:00
github-actions[bot]
109693bb05
[ci] release ( #2884 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-03-25 17:00:49 -05:00
Nate Moore
29723ddcd8
Exit pre
mode ( #2888 )
...
* chore: update docs link
* chore: exit pre
2022-03-25 16:54:11 -05:00
Ben Holmes
6b004363f9
Docs: remaining integration READMEs ( #2885 )
...
* docs: partytown README
* docs: sitemap README
* docs: tailwind README
* docs: turbolinks README
* chore: changeset
* update: make partytown 10% less fun
Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
* docs: add summaries for each integration
Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
2022-03-25 17:45:34 -04:00
natemoo-re
145e418edd
[ci] format
2022-03-25 21:27:41 +00:00
Nate Moore
72ef7ae64a
feat(cli): scaffold out astro add
command ( #2849 )
...
* feat(cli): scaffold out `astro add` command
* added first babel transforms
* Format output
* Added changes confirmation
* Error flow
* Add dependencies
* feat(cli): astro add cleanup pass
* feat: add support for tailwind
* chore: update lockfile
* fix: types
* chore: rever @proload/core bump
* chore: add changeset
* chore: rollback dep update
* Added spinners
* chore: remove extra deps
* Removed extra argument
* Use `execa` instead of `exec`
* Changed how lines are trimmed within diffLines
* refactor: move add to core
* refactor: remove old add entrypoint
* refactor: simplify wording
* feat: improve diff
* feat: improve diff and logging, add interactive prompt when no args passed
* Formatted files
* Added --yes
* feat: improve logging for install command
* Fixed execa
* Added help message to add
* refactor: extract consts to own file
* feat: remove implicit projectRoot behavior
* feat: improve error handling, existing integrations
* fix(tailwind): ensure existing tailwind config is not overwritten
* refactor: prefer cwd to projectRoot flag
* chore: add refactor notes
* refactor: throw createPrettyError > implicit bail
* refactor: cleanup language
* feat(cli): prompt user before generating tailwind config
* fix(cli): update config generation to use cwd
* fix: resolve root from cwd
* chore: update changelog
Co-authored-by: JuanM04 <me@juanm04.com>
2022-03-25 16:26:55 -05:00
bholmesdev
07a64be4d3
[ci] format
2022-03-25 21:14:21 +00:00
Ben Holmes
046bf7281f
refactor: move Prism comp to default exp ( #2887 )
2022-03-25 17:13:28 -04:00
Ben Holmes
7c39389a3f
Docs: READMEs for component framework integrations ( #2880 )
...
* docs: add base integration readme temp for Vue
* docs: copy integration temp across renderers
* feat: add get started with components section
* feat: adapt comp integration docs for lit
* nit: THERES TWO WAYS SPECIFICALLY
* nit: there's more edits wait "there are" dangit
2022-03-25 12:15:38 -04:00
matthewp
4edccae534
[ci] format
2022-03-25 16:08:51 +00:00
Matthew Phillips
80034c6cbc
Netlify adapter ( #2879 )
...
* Netlify adapter
* Remove package.json export that doesnt exist
* Fix out path
* Make netlifyFunctions the default
* Make the dist configurable
* Add an export for the functions
* Append of the file exists
2022-03-25 12:08:02 -04:00
natemoo-re
1e5ea20694
[ci] format
2022-03-24 22:38:47 +00:00
github-actions[bot]
c78d7a46c9
[ci] release (next) ( #2860 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-03-24 17:37:49 -05:00
Ben Holmes
2db97f10dc
Refactor: move prism to @astrojs/prism/components
( #2878 )
...
* feat: add `<Prism/>` to @astrojs/prism/components
* feat: remove `<Prism/>` from astro/components
* refactor: point to index.mjs in import
* refactor: change exp to @astrojs/prism/component
* refactor: remove unecessary index.js
* chore: changeset
2022-03-24 17:48:07 -04:00
matthewp
f5b48bc0ae
[ci] format
2022-03-24 21:09:40 +00:00
Matthew Phillips
e4025d1f53
Build to a single file ( #2873 )
...
* Build to a single file
* Updates based on initial code review
* Adds a changeset
* Use the default export for cjs module
* Await generatePages
* Prevent timing from causing module to not import
* Fix shared CSS
* Properly handle windows ids
* Dont shadow
* Fix ts errors
* Remove console.log
2022-03-24 17:08:36 -04:00
natemoo-re
e2885df50b
[ci] format
2022-03-24 20:11:31 +00:00
Fred K. Schott
1026345715
[ci] update lockfile ( #2854 )
...
Co-authored-by: FredKSchott <FredKSchott@users.noreply.github.com>
2022-03-24 15:10:43 -05:00
Nate Moore
671727ba83
fix( #2846 ): handle destructured private env usage during SSR ( #2861 )
...
* fix(#2846 ): handle destructured private env usage during SSR
* test: add destructured env vars test
* fix: support destructured env vars
* fix: only inline referenced vars
2022-03-24 15:10:08 -05:00
natemoo-re
eb4ac82acf
[ci] format
2022-03-24 19:44:54 +00:00
Nate Moore
a49f0490c0
test: update error test for vite@2.9.x ( #2877 )
...
* test: update error test for vite@2.9.x
* chore: add link to old tests
2022-03-24 14:44:08 -05:00
FredKSchott
bababd8461
[ci] format
2022-03-24 19:32:18 +00:00
Fred K. Schott
5029382a8c
fix markdown page script injection ( #2871 )
2022-03-24 12:30:54 -07:00
Ben Holmes
1061d6477a
Feat: improve production build logging ( #2857 )
...
* feat: log setup, vite, and route gen steps
* refactor: add back "build" + timestamp for consistency
* feat: improve ms increase logs to match old debug output
* feat: add log for server assets
* chore: remove redundant debug logs
* feat: add logs for ssr steps
* fix: hide per-page log for ssr builds
* fix: hide "index.html" from debug log in SSR
* feat: add log for "collecting page data" step
* feat: add timeout logs for longer data imports
* chore: add changeset
* remove (includes setup + teardown)
* refactor: add newline to separate ssr from client build
* fix: move "gen static routes" heading to pages
* fix: only show client build ms when triggered
* fix: remove dup render loop
* chore: remove unused static-build imports
2022-03-24 15:23:37 -04:00
Fred K. Schott
5571227718
fix adblock issue ( #2875 )
2022-03-24 11:20:34 -07:00
Fred K. Schott
d763ec183e
fix shiki perf issue ( #2870 )
2022-03-24 09:49:54 -07:00
Ben Holmes
098f6f6b06
Fix: is self accepting
pt 2 module graph boogaloo ( #2872 )
...
* fix: isSelfAccepting Preact error
* refactor: add .js ext to preact entrypoints for consistency
* chore: changeset
* fix: remove ./client and ./server from preact pkg exp
2022-03-24 12:28:50 -04:00
matthewp
99414f76cf
[ci] format
2022-03-24 11:27:15 +00:00
Matthew Phillips
5e52814d97
Adapters v0 ( #2855 )
...
* Adapter v0
* Finalizing adapters
* Update the lockfile
* Add the default adapter after config setup is called
* Create the default adapter in config:done
* Fix lint error
* Remove unused callConfigSetup
* remove unused export
* Use a test adapter to test SSR
* Adds a changeset
* Updated based on feedback
* Updated the lockfile
* Only throw if set to a different adapter
* Clean up outdated comments
* Move the adapter to an config option
* Make adapter optional
* Update the docs/changeset to reflect config API change
* Clarify regular Node usage
2022-03-24 07:26:25 -04:00
Nate Moore
5c96145527
add build:ci command which skips tsc
( #2869 )
2022-03-23 19:46:16 -05:00
Nate Moore
374c3edcf2
chore: add build:ci command
2022-03-23 16:23:25 -05:00
Nate Moore
99518c8d52
Pin rollup
to same version as vite
( #2863 )
...
* chore: pin rollup to same version as Vite
* fix: improve implicit types
* fix: revert rollup change
2022-03-23 15:57:53 -05:00
RafidMuhymin
29f420bb0e
[ci] format
2022-03-23 15:48:26 +00:00
Rafid Muhymin Wafi
52e75475ae
Updated markdownOptions config type ( #2826 )
...
* Updated markdownOptions config type
* removed rehype-toc
2022-03-23 21:47:43 +06:00
Fred K. Schott
8ec3d0da19
audit file urls ( #2853 )
2022-03-22 16:49:27 -05:00
natemoo-re
1cab405460
[ci] format
2022-03-22 21:28:14 +00:00
Nate Moore
c781b12f87
fix: ensure private API is not enumerable ( #2859 )
2022-03-22 16:27:35 -05:00
Tony Sullivan
5869e015d4
marking Astro.resolve() as deprecated ( #2856 )
2022-03-22 14:15:36 -04:00
FredKSchott
1378a9ed7c
[ci] format
2022-03-22 03:28:33 +00:00
github-actions[bot]
d082689385
[ci] release (next) ( #2851 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-03-21 20:27:46 -07:00
Ben Holmes
96372e6beb
Fix: isSelfAccepting
? More like isBanishedToTheShadowRealm
( #2852 )
...
* fix: restore renderer caching strategy
* fix: restore old URL constructor for HMR
* docs: comment why we need the rendererCache
* refactor: remove needless "else"
* chore: changeset
2022-03-21 20:14:58 -07:00
Ben Holmes
5315c3f7bc
Feat: support tailwind config files ( #2831 )
...
* feat: support custom tailwind config files
* fix: make config options optional
* feat: use existing utilities to resolve config path
* deps: add @proload/core to tailwind integration
* deps: update pnpm lock
* chore: clarify config docs
* refactor: extract user config fetch to helper
* refactor: rename function and function options
* refactor: throw error on bad custom config path
* deps: move @proload/core to regular deps
* chore: add changeset
* fix: apply astro preset when user config exists
* fix: use resolveConfig to preserve defaults
2022-03-21 17:27:32 -04:00
Fred K. Schott
981e2a839b
add injected scripts to markdown pages ( #2848 )
...
* add injected scripts to markdown pages
* Create twenty-kiwis-tease.md
Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
2022-03-21 13:05:11 -07:00
Tony Sullivan
3b621f7a61
chore: integration keywords ( #2847 )
...
* updating integration package keywords
* adding a changeset
2022-03-21 19:31:15 +00:00
Juan Martín Seery
1fdb63b5d0
feat(create-astro): add peer dependencies to package.json ( #2843 )
...
* Install dependencies automatically
* Added spinners
* Updated lockfile
* changeset
* Sort dependencies
* Reverted autoinstall
* Updated changeset
2022-03-21 12:33:31 -05:00
Juan Martín Seery
41110ebe72
chore: remove @astrojs/parser
( #2845 )
...
* Removed parser from astro
* Removed parser files
* Updated changeset config
* Removed from license
2022-03-21 12:30:23 -05:00
Fred K. Schott
0c5378b8cf
[ci] update lockfile ( #2841 )
...
Co-authored-by: FredKSchott <FredKSchott@users.noreply.github.com>
2022-03-21 10:32:25 -05:00
FredKSchott
fd7ab4e11c
[ci] format
2022-03-21 04:03:05 +00:00
Fred K. Schott
078b6cde6c
[ci] release (next) ( #2838 )
...
This reverts commit 935e6fa0c8
.
2022-03-20 21:02:08 -07:00
Fred K. Schott
935e6fa0c8
Revert "[ci] release (next) ( #2838 )"
...
This reverts commit 5df8d68094
.
2022-03-20 21:01:42 -07:00
github-actions[bot]
5df8d68094
[ci] release (next) ( #2838 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Fred K. Schott <fkschott@gmail.com>
2022-03-19 10:34:59 -07:00
Nate Moore
77ebab8bb2
chore: fix missing postcss-load-config
dependency ( #2835 )
2022-03-18 19:02:42 -07:00
natemoo-re
d812fbda97
[ci] format
2022-03-18 23:23:25 +00:00
github-actions[bot]
b5a8418f82
[ci] release (next) ( #2812 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-03-18 18:20:21 -05:00
Nate Moore
7954541291
Update Compiler with new CSS Parser ( #2833 )
...
* chore: update compiler
* Update eighty-trees-thank.md
* test: update css test
2022-03-18 18:16:32 -05:00
Nate Moore
910cae3b95
fix(windows): fix build script on windows ( #2830 )
2022-03-18 17:44:59 -05:00
Fred K. Schott
6386c14d00
Astro Integration System ( #2820 )
...
* update examples
* add initial integrations
* update tests
* update astro
* update ci
* get final tests working
* update injectelement todo
* update ben code review
* respond to final code review feedback
2022-03-18 15:35:45 -07:00
bholmesdev
0f376a7c52
[ci] format
2022-03-18 21:30:38 +00:00
Ben Holmes
0a3d3e51a6
Feat: change to shiki default md renderer ( #2824 )
...
* feat: change Shiki to default
* refactor: update blog styles for shiki
* feat: update examples/docs styles for Shiki
* refactor: remove Prism-ish examples/docs styles
* refactor: simplify rules with `all: unset`
* refactor: remove Prism styles
* refactor: examples/with-md remove Prism-specific line-highlight
* chore: add changeset
* chore: update changeset versions
* refactor: update syntax highlight test for scoped styles
* fix: apply scoped style class to pre and span lines
* feat: test that scoped styles cascade to shiki code
* refactor: pass scopedClassName explicitly
2022-03-18 17:29:51 -04:00
Hlynur Sveinbjornsson
1cd7184ca6
Fix island deduplication ignoring props. ( #2825 )
...
* Fix island deduplication ignoring props.
Re-resolves an issue initially patched in https://github.com/withastro/astro/pull/846 but seemingly lost in the 0.21.0 mega-merge (d84bfe719a
).
This change makes the component render step account for all props, even if they don't affect the generated HTML, when deduplicating island mount.
* Fix React component test using different rendered props to test deduplication.
* fix: improve serialization support for non-JSON objects
Co-authored-by: Nate Moore <nate@skypack.dev>
2022-03-18 09:00:14 -04:00
Fred K. Schott
9327b56e82
[ci] update lockfile ( #2822 )
...
Co-authored-by: FredKSchott <FredKSchott@users.noreply.github.com>
2022-03-17 13:33:52 -05:00
Nate Moore
915ab92204
test: add tailwind escape test ( #2816 )
2022-03-17 11:09:11 -05:00
matthewp
4cfbd402a4
[ci] format
2022-03-17 12:32:03 +00:00
Matthew Phillips
7b9d042dde
Allow SSR dynamic routes to not implement getStaticPaths ( #2815 )
...
* Allow SSR dynamic routes to not implement getStaticPaths
* Adds a changeset
* Update based on code-review comments
2022-03-17 08:31:01 -04:00
Tony Sullivan
4914e1f70d
Adds tests for tailwind support in dev
and build
( #2809 )
...
* adding basic dev and build tests for TailwindCSS
* adding tests to validate tailwind classes are maintained in HTML output
* fixing indent spacing
* updating lock file
2022-03-16 17:35:49 +00:00
matthewp
279774c48e
[ci] format
2022-03-16 16:17:34 +00:00
Matthew Phillips
4c25a1c2ea
Implements redirects, headers for SSR ( #2798 )
...
* Implements redirects, headers for SSR
* Move away from an explicit Request
* Properly handle endpoint routes in the build
* chore(lint): ESLint fix
* Update based on review comments
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-03-16 12:16:21 -04:00
Fred K. Schott
498ef59b0e
[ci] update lockfile ( #2810 )
...
Co-authored-by: FredKSchott <FredKSchott@users.noreply.github.com>
2022-03-16 09:53:46 -05:00
Nate Moore
5cb7e0366b
fix: mark static build pkg as private
2022-03-15 19:50:25 -05:00
natemoo-re
34bfedc9d8
[ci] format
2022-03-16 00:41:53 +00:00
github-actions[bot]
2b89613539
[ci] release ( #2808 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-03-15 19:40:27 -05:00
Ben Holmes
79282163e2
fix: Svelte PostCSS config error ( #2807 )
...
* fix: Svelte PostCSS config error
* chore: changeset
2022-03-15 19:32:39 -04:00
Nate Moore
8654e841ff
chore: fix internal package
2022-03-15 17:29:39 -05:00
natemoo-re
267d20d207
[ci] format
2022-03-15 22:17:54 +00:00
github-actions[bot]
b36d16eb8f
[ci] release ( #2802 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-03-15 17:06:40 -05:00
Nate Moore
86419d9ed7
Ignore test fixture for changesets ( #2804 )
...
* test: move fixtures to `@test/` scope
* chore: ignore `@test/` scope
* chore: add changeset
* test: renamed missed package
* chore: delete test file
* fix: @test package references
* fix: @test package references
2022-03-15 16:17:23 -05:00
Fred K. Schott
6eb494796e
update HTML escape logic ( #2793 )
2022-03-15 15:33:55 -05:00
Nate Moore
2b76ee8d75
Export defineConfig helper ( #2803 )
...
* feat: add astro/config entrypoint
* chore: update examples to use `defineConfig` util
* chore: prettier fix
* chore: add changeset
2022-03-15 15:27:17 -05:00
Ben Holmes
2d95541b52
Fix missing style imports on initial load ( #2791 )
...
* fix: missing style imports on initial load
* chore: changeset
* fix: update comment on using URL map
* fix: use getModulesByFile to match on ID properly
* refactor: use imperative loop for performance
* fix: update scan from each matching mod
* fix: update scan from importedMod loop
* fix: avoid scanning all related mods
2022-03-15 15:02:29 -04:00
Fred K. Schott
11fb3745dd
[windows:ci] handle CLI output in a cross-compat way ( #2801 )
...
* handle readline in a cross-compat way
* Create modern-feet-lay.md
2022-03-15 10:30:25 -07:00
matthewp
fc50fbb47a
[ci] format
2022-03-15 16:05:38 +00:00
github-actions[bot]
973d398074
[ci] release ( #2786 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-03-15 11:40:51 -04:00
Matthew Phillips
58d8686e94
Fix for allowing space in folder name ( #2797 )
...
* Fix for allowing space in folder name
* Adds a changeset
* Prepend a forward slash, for windows
2022-03-15 11:26:46 -04:00
matthewp
1325fe90fc
[ci] format
2022-03-15 12:38:13 +00:00
Fred K. Schott
c36527f46d
fix flakey windows tests ( #2795 )
2022-03-15 08:37:29 -04:00
natemoo-re
2b52c72b5d
[ci] format
2022-03-14 23:20:37 +00:00
Nate Moore
6b34840d3d
Fix set:html
behavior with null
( #2790 )
...
* feat: improve set:html behavior for null/undefined
* chore: add changeset
* refactor: improve set:html and set:text documentation
* test: improve set:html tests
* refactor: better types for server API
2022-03-14 18:19:53 -05:00