diff options
| author | 2023-08-17 14:22:26 +0200 | |
|---|---|---|
| committer | 2023-08-17 14:22:26 +0200 | |
| commit | 2484dc4080e5cd84b9a53648a1de426d7c907be2 (patch) | |
| tree | 18612f263d9ca0325f0c0e3f123817bdc84abc55 | |
| parent | 4967c69221c14759ed566a2f047d12bc81ee360c (diff) | |
| download | astro-2484dc4080e5cd84b9a53648a1de426d7c907be2.tar.gz astro-2484dc4080e5cd84b9a53648a1de426d7c907be2.tar.zst astro-2484dc4080e5cd84b9a53648a1de426d7c907be2.zip | |
config: remove ~/assets alias (#8113)
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
Co-authored-by: Mia Kanashi <chad@redpilled.dev>
Diffstat (limited to '')
13 files changed, 68 insertions, 24 deletions
| diff --git a/.changeset/clever-bats-breathe.md b/.changeset/clever-bats-breathe.md new file mode 100644 index 000000000..2c1a6dc39 --- /dev/null +++ b/.changeset/clever-bats-breathe.md @@ -0,0 +1,13 @@ +--- +'astro': major +--- + +This import alias is no longer included by default with astro:assets. If you were using this alias with experimental assets, you must convert them to relative file paths, or create your own [import aliases](https://docs.astro.build/en/guides/aliases/). + +```diff +--- +// src/pages/posts/post-1.astro +- import rocket from '~/assets/rocket.png' ++ import rocket from '../../assets/rocket.png'; +--- +``` diff --git a/packages/astro/src/assets/types.ts b/packages/astro/src/assets/types.ts index 9c5990cb7..ae74fc692 100644 --- a/packages/astro/src/assets/types.ts +++ b/packages/astro/src/assets/types.ts @@ -90,7 +90,7 @@ export type LocalImageProps<T> = ImageSharedProps<T> & {  	 *  	 * **Example**:  	 * ```js -	 * import myImage from "~/assets/my_image.png"; +	 * import myImage from "../assets/my_image.png";  	 * ```  	 * And then refer to the image, like so:  	 * ```astro diff --git a/packages/astro/src/assets/vite-plugin-assets.ts b/packages/astro/src/assets/vite-plugin-assets.ts index 2ab87b7c1..24de955ba 100644 --- a/packages/astro/src/assets/vite-plugin-assets.ts +++ b/packages/astro/src/assets/vite-plugin-assets.ts @@ -1,5 +1,4 @@  import MagicString from 'magic-string'; -import { fileURLToPath } from 'node:url';  import type * as vite from 'vite';  import { normalizePath } from 'vite';  import type { AstroPluginOptions, ImageTransform } from '../@types/astro'; @@ -31,18 +30,6 @@ export default function assets({  		// Expose the components and different utilities from `astro:assets` and handle serving images from `/_image` in dev  		{  			name: 'astro:assets', -			config() { -				return { -					resolve: { -						alias: [ -							{ -								find: /^~\/assets\/(.+)$/, -								replacement: fileURLToPath(new URL('./assets/$1', settings.config.srcDir)), -							}, -						], -					}, -				}; -			},  			async resolveId(id) {  				if (id === VIRTUAL_SERVICE_ID) {  					return await this.resolve(settings.config.image.service.entrypoint); diff --git a/packages/astro/test/fixtures/content-collection-references/src/content/banners/welcome.json b/packages/astro/test/fixtures/content-collection-references/src/content/banners/welcome.json index c62d06aab..8ab06ff1f 100644 --- a/packages/astro/test/fixtures/content-collection-references/src/content/banners/welcome.json +++ b/packages/astro/test/fixtures/content-collection-references/src/content/banners/welcome.json @@ -1,4 +1,4 @@  {    "alt": "Futuristic landscape with chrome buildings and blue skies", -  "src": "~/assets/the-future.jpg" +  "src": "../../assets/the-future.jpg"  } diff --git a/packages/astro/test/fixtures/core-image-base/src/content/blog/one.md b/packages/astro/test/fixtures/core-image-base/src/content/blog/one.md index 59a5b77ba..d449290ef 100644 --- a/packages/astro/test/fixtures/core-image-base/src/content/blog/one.md +++ b/packages/astro/test/fixtures/core-image-base/src/content/blog/one.md @@ -1,6 +1,6 @@  ---  title: One -image: ~/assets/penguin2.jpg +image: ../../assets/penguin2.jpg  cover:    image: ../../assets/penguin1.jpg  --- diff --git a/packages/astro/test/fixtures/core-image-base/tsconfig.json b/packages/astro/test/fixtures/core-image-base/tsconfig.json new file mode 100644 index 000000000..b5bf6a715 --- /dev/null +++ b/packages/astro/test/fixtures/core-image-base/tsconfig.json @@ -0,0 +1,9 @@ +{ +  "extends": "astro/tsconfigs/base", +  "compilerOptions": { +    "baseUrl": ".", +    "paths": { +      "~/assets/*": ["src/assets/*"] +    }, +  } +} diff --git a/packages/astro/test/fixtures/core-image-ssg/tsconfig.json b/packages/astro/test/fixtures/core-image-ssg/tsconfig.json new file mode 100644 index 000000000..b5bf6a715 --- /dev/null +++ b/packages/astro/test/fixtures/core-image-ssg/tsconfig.json @@ -0,0 +1,9 @@ +{ +  "extends": "astro/tsconfigs/base", +  "compilerOptions": { +    "baseUrl": ".", +    "paths": { +      "~/assets/*": ["src/assets/*"] +    }, +  } +} diff --git a/packages/astro/test/fixtures/core-image/src/content/blog/one.md b/packages/astro/test/fixtures/core-image/src/content/blog/one.md index ef0993f63..8c6522534 100644 --- a/packages/astro/test/fixtures/core-image/src/content/blog/one.md +++ b/packages/astro/test/fixtures/core-image/src/content/blog/one.md @@ -1,11 +1,11 @@  ---  title: One -image: ~/assets/penguin2.jpg +image: ../../assets/penguin2.jpg  cover:    image: ../../assets/penguin1.jpg  arrayOfImages: -  - ~/assets/penguin2.jpg -  - ~/assets/penguin1.jpg +  - ../../assets/penguin2.jpg +  - ../../assets/penguin1.jpg  refinedImage: ../../assets/penguin1.jpg  --- diff --git a/packages/astro/test/fixtures/core-image/tsconfig.json b/packages/astro/test/fixtures/core-image/tsconfig.json new file mode 100644 index 000000000..b5bf6a715 --- /dev/null +++ b/packages/astro/test/fixtures/core-image/tsconfig.json @@ -0,0 +1,9 @@ +{ +  "extends": "astro/tsconfigs/base", +  "compilerOptions": { +    "baseUrl": ".", +    "paths": { +      "~/assets/*": ["src/assets/*"] +    }, +  } +} diff --git a/packages/astro/tsconfigs/base.json b/packages/astro/tsconfigs/base.json index d921ef4be..578693195 100644 --- a/packages/astro/tsconfigs/base.json +++ b/packages/astro/tsconfigs/base.json @@ -23,11 +23,6 @@      "esModuleInterop": true,      // Skip typechecking libraries and .d.ts files      "skipLibCheck": true, -    // Add alias for assets folder for easy reference to assets -    "baseUrl": ".", -    "paths": { -      "~/assets/*": ["src/assets/*"] -    },      // Allow JavaScript files to be imported      "allowJs": true    } diff --git a/packages/integrations/markdoc/test/fixtures/image-assets/tsconfig.json b/packages/integrations/markdoc/test/fixtures/image-assets/tsconfig.json new file mode 100644 index 000000000..b5bf6a715 --- /dev/null +++ b/packages/integrations/markdoc/test/fixtures/image-assets/tsconfig.json @@ -0,0 +1,9 @@ +{ +  "extends": "astro/tsconfigs/base", +  "compilerOptions": { +    "baseUrl": ".", +    "paths": { +      "~/assets/*": ["src/assets/*"] +    }, +  } +} diff --git a/packages/integrations/mdx/test/fixtures/mdx-images/tsconfig.json b/packages/integrations/mdx/test/fixtures/mdx-images/tsconfig.json new file mode 100644 index 000000000..b5bf6a715 --- /dev/null +++ b/packages/integrations/mdx/test/fixtures/mdx-images/tsconfig.json @@ -0,0 +1,9 @@ +{ +  "extends": "astro/tsconfigs/base", +  "compilerOptions": { +    "baseUrl": ".", +    "paths": { +      "~/assets/*": ["src/assets/*"] +    }, +  } +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 625c241b3..711f92cbe 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18252,21 +18252,25 @@ packages:    file:packages/astro/test/fixtures/css-assets/packages/font-awesome:      resolution: {directory: packages/astro/test/fixtures/css-assets/packages/font-awesome, type: directory}      name: '@test/astro-font-awesome-package' +    version: 0.0.1      dev: false    file:packages/astro/test/fixtures/multiple-renderers/renderers/one:      resolution: {directory: packages/astro/test/fixtures/multiple-renderers/renderers/one, type: directory}      name: '@test/astro-renderer-one' +    version: 1.0.0      dev: false    file:packages/astro/test/fixtures/multiple-renderers/renderers/two:      resolution: {directory: packages/astro/test/fixtures/multiple-renderers/renderers/two, type: directory}      name: '@test/astro-renderer-two' +    version: 1.0.0      dev: false    file:packages/astro/test/fixtures/solid-component/deps/solid-jsx-component:      resolution: {directory: packages/astro/test/fixtures/solid-component/deps/solid-jsx-component, type: directory}      name: '@test/solid-jsx-component' +    version: 0.0.0      dependencies:        solid-js: 1.7.6      dev: false | 
