diff --git a/.changeset/dull-shoes-arrive.md b/.changeset/dull-shoes-arrive.md new file mode 100644 index 00000000..aa1fbceb --- /dev/null +++ b/.changeset/dull-shoes-arrive.md @@ -0,0 +1,5 @@ +--- +"@sveltejs/site-kit": patch +--- + +Fix publishDir diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 15b79058..e2414362 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,12 +32,15 @@ jobs: - run: pnpm install --frozen-lockfile + - name: Package + run: pnpm package + - name: Create Release Pull Request or Publish to npm id: changesets uses: changesets/action@v1 with: # This expects you to have a script called release which does a build for your packages and calls changeset publish - publish: pnpm release + publish: pnpm ci:release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/package.json b/package.json index 31dbff8a..19a84f1b 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,9 @@ { "scripts": { + "package": "pnpm -r package", "changeset": "changeset", - "release": "changeset publish", - "version": "changeset version" + "ci:release": "changeset publish", + "ci:version": "changeset version" }, "devDependencies": { "@changesets/cli": "^2.26.0" diff --git a/packages/site-kit/package.json b/packages/site-kit/package.json index 6ede20d2..e6da0d08 100644 --- a/packages/site-kit/package.json +++ b/packages/site-kit/package.json @@ -7,8 +7,7 @@ "scripts": { "dev": "vite dev", "watch": "svelte-kit sync && svelte-package --watch", - "build": "svelte-kit sync && svelte-package", - "release": "npm run build && cd package && npm publish" + "package": "svelte-kit sync && svelte-package" }, "repository": { "type": "git", @@ -21,13 +20,14 @@ }, "homepage": "https://github.com/sveltejs/site-kit#readme", "devDependencies": { - "@sveltejs/kit": "^1.3.6", + "@sveltejs/kit": "^1.3.10", "@sveltejs/package": "^1.0.2", "svelte": "^3.55.1", "typescript": "^4.9.5", "vite": "^4.0.4" }, "publishConfig": { - "access": "public" + "access": "public", + "directory": "package" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ee0ccb42..d1b4e718 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,13 +10,13 @@ importers: packages/site-kit: specifiers: - '@sveltejs/kit': ^1.3.6 + '@sveltejs/kit': ^1.3.10 '@sveltejs/package': ^1.0.2 svelte: ^3.55.1 typescript: ^4.9.5 vite: ^4.0.4 devDependencies: - '@sveltejs/kit': 1.3.6_svelte@3.55.1+vite@4.0.4 + '@sveltejs/kit': 1.3.10_svelte@3.55.1+vite@4.0.4 '@sveltejs/package': 1.0.2_4x7phaipmicbaooxtnresslofa svelte: 3.55.1 typescript: 4.9.5 @@ -483,8 +483,8 @@ packages: resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==} dev: true - /@sveltejs/kit/1.3.6_svelte@3.55.1+vite@4.0.4: - resolution: {integrity: sha512-SOGTKYiZ0ajIhQ9pUKr9F+h5Srm8Gdn3aza3dZxXWdHjpqv1iyhvt4oS0l5n1a+sXQzKlLpe/CikDBqSVSUS2Q==} + /@sveltejs/kit/1.3.10_svelte@3.55.1+vite@4.0.4: + resolution: {integrity: sha512-I3DgWCwTYbTz4ZPCJIRkSDrKkMu0bsdk6ghqsOBVNqesf1wBdTdfkXhag3ESWgIEjUV3VUIWPQF7fnt7328mhQ==} engines: {node: ^16.14 || >=18} hasBin: true requiresBuild: true