diff --git a/.changeset/nervous-wolves-end.md b/.changeset/nervous-wolves-end.md new file mode 100644 index 000000000000..bfabce7ba89a --- /dev/null +++ b/.changeset/nervous-wolves-end.md @@ -0,0 +1,5 @@ +--- +'create-svelte': patch +--- + +Fix CSS on demo app hero image diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d165428c8782..f70416fde60e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: ${{ runner.os }}-${{ matrix.node-version }} - run: npm install -g pnpm - run: pnpm install --frozen-lockfile - - run: pnpm build --filter ./packages + - run: pnpm build --filter ./packages --filter !./packages/create-svelte/templates - run: pnpm lint - run: pnpm check Tests: @@ -68,7 +68,7 @@ jobs: - run: pnpm install --frozen-lockfile env: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: ${{ steps.browser_cache.outputs.cache-hit == 'true' }} - - run: pnpm build --filter ./packages + - run: pnpm build --filter ./packages --filter !./packages/create-svelte/templates - run: pnpm test Examples: runs-on: ${{ matrix.os }} @@ -100,4 +100,4 @@ jobs: ${{ runner.os }}-${{ matrix.node-version }} - run: npm install -g pnpm - run: pnpm install --frozen-lockfile - - run: pnpm -r build + - run: pnpm build && pnpm build --filter="svelte-kit-demo" --filter="hn.svelte.dev" diff --git a/.gitignore b/.gitignore index 57047b9762e6..01cb644ac036 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,6 @@ yarn.lock /examples/**/.svelte /examples/**/build /packages/create-svelte/template/CHANGELOG.md -.env \ No newline at end of file +.env +.vercel_build_output +.svelte diff --git a/packages/create-svelte/package.json b/packages/create-svelte/package.json index daa92d9ead78..7f9db0ebfb88 100644 --- a/packages/create-svelte/package.json +++ b/packages/create-svelte/package.json @@ -19,9 +19,9 @@ }, "scripts": { "build": "node scripts/build-templates", - "lint": "eslint --ignore-path .gitignore \"./*.js\" && npm run check-format", - "format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore", - "check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore", + "lint": "eslint --ignore-path .gitignore --ignore-path ../../.gitignore \"./*.js\" && npm run check-format", + "format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore --ignore-path ../../.gitignore", + "check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore --ignore-path ../../.gitignore", "prepublishOnly": "npm run build" }, "files": [ diff --git a/packages/create-svelte/templates/default/src/routes/index.svelte b/packages/create-svelte/templates/default/src/routes/index.svelte index bd708dddabf4..0d33d04e63e8 100644 --- a/packages/create-svelte/templates/default/src/routes/index.svelte +++ b/packages/create-svelte/templates/default/src/routes/index.svelte @@ -15,13 +15,7 @@
- Welcome + Welcome
diff --git a/packages/create-svelte/templates/default/svelte.config.cjs b/packages/create-svelte/templates/default/svelte.config.cjs index e1204bf65e24..978f22817ead 100644 --- a/packages/create-svelte/templates/default/svelte.config.cjs +++ b/packages/create-svelte/templates/default/svelte.config.cjs @@ -1,21 +1,16 @@ const sveltePreprocess = require('svelte-preprocess'); const pkg = require('./package.json'); -const adapter = process.env.ADAPTER || '@sveltejs/adapter-node'; +const adapter = process.env.ADAPTER; const options = JSON.parse(process.env.OPTIONS || '{}'); /** @type {import('@sveltejs/kit').Config} */ -module.exports = { +const config = { // Consult https://github.com/sveltejs/svelte-preprocess // for more information about preprocessors preprocess: sveltePreprocess(), kit: { - // By default, `npm run build` will create a standard Node app. - // You can create optimized builds for different platforms by - // specifying a different adapter - adapter: require(adapter)(options), - // hydrate the
element in src/app.html target: '#svelte', @@ -26,3 +21,9 @@ module.exports = { } } }; + +if (adapter) { + config.kit.adapter = require(adapter)(options); +} + +module.exports = config; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5c5ebd854fca..fa407e1ce1f1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -197,18 +197,6 @@ importers: typescript: 4.2.4 vite: 2.1.0 - packages/create-svelte/templates/skeleton: - specifiers: - '@sveltejs/adapter-node': workspace:* - '@sveltejs/kit': workspace:* - svelte: ^3.29.0 - vite: ^2.1.0 - devDependencies: - '@sveltejs/adapter-node': link:../../../adapter-node - '@sveltejs/kit': link:../../../kit - svelte: 3.35.0 - vite: 2.1.0 - packages/kit: specifiers: '@rollup/plugin-replace': ^2.4.1