diff --git a/.changeset/README.md b/.changeset/README.md new file mode 100644 index 00000000..e5b6d8d6 --- /dev/null +++ b/.changeset/README.md @@ -0,0 +1,8 @@ +# Changesets + +Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works +with multi-package repos, or single-package repos to help you version and publish your code. You can +find the full documentation for it [in our repository](https://github.com/changesets/changesets) + +We have a quick list of common questions to get you started engaging with this project in +[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md) diff --git a/.changeset/config.json b/.changeset/config.json new file mode 100644 index 00000000..39d6b2b5 --- /dev/null +++ b/.changeset/config.json @@ -0,0 +1,11 @@ +{ + "$schema": "https://unpkg.com/@changesets/config@3.0.3/schema.json", + "changelog": ["@svitejs/changesets-changelog-github-compact", { "repo": "sveltejs/cli" }], + "commit": false, + "fixed": [], + "linked": [], + "access": "public", + "baseBranch": "main", + "updateInternalDependencies": "patch", + "ignore": ["!(@sveltejs/*|sv)"] +} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..672f1311 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,44 @@ +name: Release + +on: + push: + branches: + - main + +permissions: {} +jobs: + release: + # prevents this action from running on forks + if: github.repository == 'sveltejs/cli' + permissions: + contents: write # to create release (changesets/action) + id-token: write # OpenID Connect token needed for provenance + pull-requests: write # to create pull request (changesets/action) + name: Release + runs-on: ubuntu-latest + steps: + - name: Checkout Repo + uses: actions/checkout@v4 + with: + # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits + fetch-depth: 0 + - uses: pnpm/action-setup@v4 + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 18.x + cache: pnpm + + - name: Install + run: pnpm install --frozen-lockfile + + - name: Build + run: pnpm build + + - name: Create Release Pull Request or Publish to npm + id: changesets + uses: changesets/action@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NPM_CONFIG_PROVENANCE: true + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/community-adder-template/README.md b/community-adder-template/README.md index 6785a6b5..03bd3a47 100644 --- a/community-adder-template/README.md +++ b/community-adder-template/README.md @@ -52,4 +52,4 @@ After that, feel free to open a pull request to [`sv`](https://github.com/svelte ## Things to be aware of -Community adders are **not permitted** to have any external dependencies outside of `@svelte-cli/core`. If the use of a dependency is absolutely necessary, then they can be bundled using a bundler of your choosing (e.g. Rollup, Rolldown, tsup, etc.). +Community adders are **not permitted** to have any external dependencies outside of `@sveltejs/cli-core`. If the use of a dependency is absolutely necessary, then they can be bundled using a bundler of your choosing (e.g. Rollup, Rolldown, tsup, etc.). diff --git a/community-adder-template/package.json b/community-adder-template/package.json index 860b942c..91f9b34c 100644 --- a/community-adder-template/package.json +++ b/community-adder-template/package.json @@ -1,5 +1,6 @@ { "name": "community-adder-template", + "private": true, "version": "0.0.0", "license": "MIT", "type": "module", @@ -15,7 +16,7 @@ "create-temp": "sv create temp --check-types typescript --template skeleton --no-adders --no-install" }, "dependencies": { - "@svelte-cli/core": "workspace:*" + "@sveltejs/cli-core": "workspace:*" }, "devDependencies": { "sv": "workspace:*" diff --git a/community-adder-template/src/config/adder.js b/community-adder-template/src/config/adder.js index e4d320c7..7439b7b8 100644 --- a/community-adder-template/src/config/adder.js +++ b/community-adder-template/src/config/adder.js @@ -1,7 +1,7 @@ import { options } from './options.js'; -import { defineAdder } from '@svelte-cli/core'; -import { imports } from '@svelte-cli/core/js'; -import { parseScript } from '@svelte-cli/core/parsers'; +import { defineAdder } from '@sveltejs/cli-core'; +import { imports } from '@sveltejs/cli-core/js'; +import { parseScript } from '@sveltejs/cli-core/parsers'; export const adder = defineAdder({ id: 'community-adder-template', diff --git a/community-adder-template/src/config/options.js b/community-adder-template/src/config/options.js index c79c1dc0..000c1bf0 100644 --- a/community-adder-template/src/config/options.js +++ b/community-adder-template/src/config/options.js @@ -1,4 +1,4 @@ -import { defineAdderOptions } from '@svelte-cli/core'; +import { defineAdderOptions } from '@sveltejs/cli-core'; export const options = defineAdderOptions({ demo: { diff --git a/community-adder-template/tests/tests.js b/community-adder-template/tests/tests.js index 1ac9239b..31451172 100644 --- a/community-adder-template/tests/tests.js +++ b/community-adder-template/tests/tests.js @@ -1,4 +1,4 @@ -import { defineAdderTests } from '@svelte-cli/core'; +import { defineAdderTests } from '@sveltejs/cli-core'; import { options } from '../src/config/options.js'; export const tests = defineAdderTests({ diff --git a/package.json b/package.json index c1109219..dc88c871 100644 --- a/package.json +++ b/package.json @@ -8,19 +8,17 @@ "check": "pnpm -r check", "lint": "pnpm -r lint && eslint --cache --cache-location node_modules/.eslintcache", "format": "pnpm -r format", - "changeset:version": "changeset version && pnpm -r generate:version && git add --all", - "changeset:release": "changeset publish", "dev": "rollup --config --watch", "build": "rollup -c", "test": "pnpm -r test" }, "devDependencies": { - "@changesets/cli": "^2.27.8", + "@changesets/cli": "^2.27.9", "@rollup/plugin-commonjs": "^26.0.1", "@rollup/plugin-dynamic-import-vars": "^2.1.2", "@rollup/plugin-json": "^6.1.0", "@rollup/plugin-node-resolve": "^15.2.3", - "@svelte-cli/create": "workspace:*", + "@sveltejs/create": "workspace:*", "@sveltejs/eslint-config": "^8.1.0", "@svitejs/changesets-changelog-github-compact": "^1.1.0", "@types/node": "^22.3.0", diff --git a/packages/adders/_config/official.ts b/packages/adders/_config/official.ts index d79e3715..beb08cf9 100644 --- a/packages/adders/_config/official.ts +++ b/packages/adders/_config/official.ts @@ -1,5 +1,5 @@ import type { AdderCategories, Category } from './categories.ts'; -import type { AdderWithoutExplicitArgs, Adder } from '@svelte-cli/core'; +import type { AdderWithoutExplicitArgs, Adder } from '@sveltejs/cli-core'; // adders import drizzle from '../drizzle/index.ts'; diff --git a/packages/adders/common.ts b/packages/adders/common.ts index d30781d4..bbc82c17 100644 --- a/packages/adders/common.ts +++ b/packages/adders/common.ts @@ -6,10 +6,10 @@ import { functions, type AstKinds, type AstTypes -} from '@svelte-cli/core/js'; -import * as html from '@svelte-cli/core/html'; -import { Walker, type Question, type FileEditor } from '@svelte-cli/core'; -import { parseScript } from '@svelte-cli/core/parsers'; +} from '@sveltejs/cli-core/js'; +import { Walker, type Question, type FileEditor } from '@sveltejs/cli-core'; +import * as html from '@sveltejs/cli-core/html'; +import { parseScript } from '@sveltejs/cli-core/parsers'; export function createPrinter(...conditions: boolean[]) { const printers = conditions.map((condition) => { diff --git a/packages/adders/drizzle/index.ts b/packages/adders/drizzle/index.ts index 31376fc3..8b651969 100644 --- a/packages/adders/drizzle/index.ts +++ b/packages/adders/drizzle/index.ts @@ -1,6 +1,6 @@ -import { common, exports, functions, imports, object, variables } from '@svelte-cli/core/js'; -import { defineAdder, defineAdderOptions, dedent, type FileEditor } from '@svelte-cli/core'; -import { parseJson, parseScript } from '@svelte-cli/core/parsers'; +import { common, exports, functions, imports, object, variables } from '@sveltejs/cli-core/js'; +import { defineAdder, defineAdderOptions, dedent, type FileEditor } from '@sveltejs/cli-core'; +import { parseJson, parseScript } from '@sveltejs/cli-core/parsers'; const PORTS = { mysql: '3306', diff --git a/packages/adders/drizzle/tests.ts b/packages/adders/drizzle/tests.ts index 3a755d35..3257b575 100644 --- a/packages/adders/drizzle/tests.ts +++ b/packages/adders/drizzle/tests.ts @@ -1,6 +1,6 @@ import { options } from './index.ts'; -import { defineAdderTests } from '@svelte-cli/core'; -import { parseSvelte, parseJson } from '@svelte-cli/core/parsers'; +import { defineAdderTests } from '@sveltejs/cli-core'; +import { parseSvelte, parseJson } from '@sveltejs/cli-core/parsers'; const defaultOptionValues = { sqlite: options.sqlite.default, diff --git a/packages/adders/eslint/index.ts b/packages/adders/eslint/index.ts index fb7fe8f9..00aede29 100644 --- a/packages/adders/eslint/index.ts +++ b/packages/adders/eslint/index.ts @@ -1,7 +1,7 @@ import fs from 'node:fs'; import path from 'node:path'; import { addEslintConfigPrettier } from '../common.ts'; -import { defineAdder, log } from '@svelte-cli/core'; +import { defineAdder, log } from '@sveltejs/cli-core'; import { array, common, @@ -11,8 +11,8 @@ import { object, type AstKinds, type AstTypes -} from '@svelte-cli/core/js'; -import { parseJson, parseScript } from '@svelte-cli/core/parsers'; +} from '@sveltejs/cli-core/js'; +import { parseJson, parseScript } from '@sveltejs/cli-core/parsers'; export default defineAdder({ id: 'eslint', diff --git a/packages/adders/eslint/tests.ts b/packages/adders/eslint/tests.ts index b37ea6ce..764975ed 100644 --- a/packages/adders/eslint/tests.ts +++ b/packages/adders/eslint/tests.ts @@ -1,4 +1,4 @@ -import { defineAdderTests } from '@svelte-cli/core'; +import { defineAdderTests } from '@sveltejs/cli-core'; export const tests = defineAdderTests({ files: [], diff --git a/packages/adders/lucia/index.ts b/packages/adders/lucia/index.ts index a98136df..5a6c4020 100644 --- a/packages/adders/lucia/index.ts +++ b/packages/adders/lucia/index.ts @@ -1,9 +1,9 @@ -import { colors, dedent, defineAdder, defineAdderOptions, log, Walker } from '@svelte-cli/core'; -import { common, exports, imports, variables, object, functions } from '@svelte-cli/core/js'; +import { colors, dedent, defineAdder, defineAdderOptions, log, Walker } from '@sveltejs/cli-core'; +import { common, exports, imports, variables, object, functions } from '@sveltejs/cli-core/js'; // eslint-disable-next-line no-duplicate-imports -import type { AstTypes } from '@svelte-cli/core/js'; +import type { AstTypes } from '@sveltejs/cli-core/js'; import { addHooksHandle, addGlobalAppInterface, hasTypeProp } from '../common.ts'; -import { parseScript } from '@svelte-cli/core/parsers'; +import { parseScript } from '@sveltejs/cli-core/parsers'; const LUCIA_ADAPTER = { mysql: 'DrizzleMySQLAdapter', diff --git a/packages/adders/lucia/tests.ts b/packages/adders/lucia/tests.ts index 326b88e3..cf23fa33 100644 --- a/packages/adders/lucia/tests.ts +++ b/packages/adders/lucia/tests.ts @@ -1,4 +1,4 @@ -import { defineAdderTests } from '@svelte-cli/core'; +import { defineAdderTests } from '@sveltejs/cli-core'; import { options } from './index.ts'; export const tests = defineAdderTests({ diff --git a/packages/adders/mdsvex/index.ts b/packages/adders/mdsvex/index.ts index 82633cf8..9157aefc 100644 --- a/packages/adders/mdsvex/index.ts +++ b/packages/adders/mdsvex/index.ts @@ -1,6 +1,6 @@ -import { defineAdder } from '@svelte-cli/core'; -import { array, exports, functions, imports, object } from '@svelte-cli/core/js'; -import { parseScript } from '@svelte-cli/core/parsers'; +import { defineAdder } from '@sveltejs/cli-core'; +import { array, exports, functions, imports, object } from '@sveltejs/cli-core/js'; +import { parseScript } from '@sveltejs/cli-core/parsers'; export default defineAdder({ id: 'mdsvex', diff --git a/packages/adders/mdsvex/tests.ts b/packages/adders/mdsvex/tests.ts index 86afde98..503d2a1b 100644 --- a/packages/adders/mdsvex/tests.ts +++ b/packages/adders/mdsvex/tests.ts @@ -1,7 +1,7 @@ -import { defineAdderTests, type OptionDefinition, type FileEditor } from '@svelte-cli/core'; -import { imports } from '@svelte-cli/core/js'; -import * as html from '@svelte-cli/core/html'; -import { parseSvelte } from '@svelte-cli/core/parsers'; +import { defineAdderTests, type OptionDefinition, type FileEditor } from '@sveltejs/cli-core'; +import { imports } from '@sveltejs/cli-core/js'; +import * as html from '@sveltejs/cli-core/html'; +import { parseSvelte } from '@sveltejs/cli-core/parsers'; export const tests = defineAdderTests({ files: [ diff --git a/packages/adders/package.json b/packages/adders/package.json index d65cdbf7..5cf8027e 100644 --- a/packages/adders/package.json +++ b/packages/adders/package.json @@ -1,7 +1,7 @@ { - "name": "@svelte-cli/adders", + "name": "@sveltejs/adders", "private": true, - "version": "1.6.0", + "version": "0.0.0", "type": "module", "scripts": { "lint": "prettier --check . --config ../../.prettierrc --ignore-path ../../.gitignore --ignore-path .gitignore --ignore-path ../../.prettierignore", @@ -15,6 +15,6 @@ } }, "dependencies": { - "@svelte-cli/core": "workspace:*" + "@sveltejs/cli-core": "workspace:*" } } diff --git a/packages/adders/playwright/index.ts b/packages/adders/playwright/index.ts index 8cd57d7b..69ea0c03 100644 --- a/packages/adders/playwright/index.ts +++ b/packages/adders/playwright/index.ts @@ -1,8 +1,8 @@ import fs from 'node:fs'; import { join } from 'node:path'; -import { dedent, defineAdder, log } from '@svelte-cli/core'; -import { common, exports, imports, object } from '@svelte-cli/core/js'; -import { parseJson, parseScript } from '@svelte-cli/core/parsers'; +import { dedent, defineAdder, log } from '@sveltejs/cli-core'; +import { common, exports, imports, object } from '@sveltejs/cli-core/js'; +import { parseJson, parseScript } from '@sveltejs/cli-core/parsers'; export default defineAdder({ id: 'playwright', diff --git a/packages/adders/playwright/tests.ts b/packages/adders/playwright/tests.ts index b37ea6ce..764975ed 100644 --- a/packages/adders/playwright/tests.ts +++ b/packages/adders/playwright/tests.ts @@ -1,4 +1,4 @@ -import { defineAdderTests } from '@svelte-cli/core'; +import { defineAdderTests } from '@sveltejs/cli-core'; export const tests = defineAdderTests({ files: [], diff --git a/packages/adders/prettier/index.ts b/packages/adders/prettier/index.ts index 34b28993..860c12bd 100644 --- a/packages/adders/prettier/index.ts +++ b/packages/adders/prettier/index.ts @@ -1,6 +1,6 @@ -import { dedent, defineAdder, log, colors } from '@svelte-cli/core'; +import { dedent, defineAdder, log, colors } from '@sveltejs/cli-core'; import { addEslintConfigPrettier } from '../common.ts'; -import { parseJson } from '@svelte-cli/core/parsers'; +import { parseJson } from '@sveltejs/cli-core/parsers'; export default defineAdder({ id: 'prettier', diff --git a/packages/adders/prettier/tests.ts b/packages/adders/prettier/tests.ts index b37ea6ce..764975ed 100644 --- a/packages/adders/prettier/tests.ts +++ b/packages/adders/prettier/tests.ts @@ -1,4 +1,4 @@ -import { defineAdderTests } from '@svelte-cli/core'; +import { defineAdderTests } from '@sveltejs/cli-core'; export const tests = defineAdderTests({ files: [], diff --git a/packages/adders/routify/index.ts b/packages/adders/routify/index.ts index 4e7e2763..58962f93 100644 --- a/packages/adders/routify/index.ts +++ b/packages/adders/routify/index.ts @@ -1,7 +1,7 @@ -import { defineAdder } from '@svelte-cli/core'; -import { array, exports, functions, imports, object, variables } from '@svelte-cli/core/js'; -import * as html from '@svelte-cli/core/html'; -import { parseScript, parseSvelte } from '@svelte-cli/core/parsers'; +import { defineAdder } from '@sveltejs/cli-core'; +import { array, exports, functions, imports, object, variables } from '@sveltejs/cli-core/js'; +import * as html from '@sveltejs/cli-core/html'; +import { parseScript, parseSvelte } from '@sveltejs/cli-core/parsers'; export default defineAdder({ id: 'routify', diff --git a/packages/adders/routify/tests.ts b/packages/adders/routify/tests.ts index 2a759c48..80cd4fe7 100644 --- a/packages/adders/routify/tests.ts +++ b/packages/adders/routify/tests.ts @@ -1,4 +1,4 @@ -import { defineAdderTests } from '@svelte-cli/core'; +import { defineAdderTests } from '@sveltejs/cli-core'; export const tests = defineAdderTests({ files: [], diff --git a/packages/adders/storybook/index.ts b/packages/adders/storybook/index.ts index 543a5723..54ec98c6 100644 --- a/packages/adders/storybook/index.ts +++ b/packages/adders/storybook/index.ts @@ -1,4 +1,4 @@ -import { defineAdder } from '@svelte-cli/core'; +import { defineAdder } from '@sveltejs/cli-core'; export default defineAdder({ id: 'storybook', diff --git a/packages/adders/storybook/tests.ts b/packages/adders/storybook/tests.ts index 32ee2038..5fb56a32 100644 --- a/packages/adders/storybook/tests.ts +++ b/packages/adders/storybook/tests.ts @@ -1,4 +1,4 @@ -import { defineAdderTests } from '@svelte-cli/core'; +import { defineAdderTests } from '@sveltejs/cli-core'; let port = 6006; diff --git a/packages/adders/tailwindcss/index.ts b/packages/adders/tailwindcss/index.ts index 8b16602e..b83b6f1a 100644 --- a/packages/adders/tailwindcss/index.ts +++ b/packages/adders/tailwindcss/index.ts @@ -1,7 +1,7 @@ -import { defineAdder, defineAdderOptions } from '@svelte-cli/core'; -import { addImports } from '@svelte-cli/core/css'; -import { array, common, exports, functions, imports, object } from '@svelte-cli/core/js'; -import { parseCss, parseScript, parseJson, parseSvelte } from '@svelte-cli/core/parsers'; +import { defineAdder, defineAdderOptions } from '@sveltejs/cli-core'; +import { addImports } from '@sveltejs/cli-core/css'; +import { array, common, exports, functions, imports, object } from '@sveltejs/cli-core/js'; +import { parseCss, parseScript, parseJson, parseSvelte } from '@sveltejs/cli-core/parsers'; import { addSlot } from '../common.ts'; export const options = defineAdderOptions({ diff --git a/packages/adders/tailwindcss/tests.ts b/packages/adders/tailwindcss/tests.ts index 8fb6438f..ea28b2af 100644 --- a/packages/adders/tailwindcss/tests.ts +++ b/packages/adders/tailwindcss/tests.ts @@ -1,4 +1,4 @@ -import { defineAdderTests } from '@svelte-cli/core'; +import { defineAdderTests } from '@sveltejs/cli-core'; import { options } from './index.ts'; const divId = 'myDiv'; diff --git a/packages/adders/vitest/index.ts b/packages/adders/vitest/index.ts index 7e6be684..2a991560 100644 --- a/packages/adders/vitest/index.ts +++ b/packages/adders/vitest/index.ts @@ -1,6 +1,6 @@ -import { dedent, defineAdder, log } from '@svelte-cli/core'; -import { common, exports, imports, object } from '@svelte-cli/core/js'; -import { parseJson, parseScript } from '@svelte-cli/core/parsers'; +import { dedent, defineAdder, log } from '@sveltejs/cli-core'; +import { common, exports, imports, object } from '@sveltejs/cli-core/js'; +import { parseJson, parseScript } from '@sveltejs/cli-core/parsers'; export default defineAdder({ id: 'vitest', diff --git a/packages/adders/vitest/tests.ts b/packages/adders/vitest/tests.ts index b37ea6ce..764975ed 100644 --- a/packages/adders/vitest/tests.ts +++ b/packages/adders/vitest/tests.ts @@ -1,4 +1,4 @@ -import { defineAdderTests } from '@svelte-cli/core'; +import { defineAdderTests } from '@sveltejs/cli-core'; export const tests = defineAdderTests({ files: [], diff --git a/packages/ast-tooling/README.md b/packages/ast-tooling/README.md index f68cd862..7f3a2c38 100644 --- a/packages/ast-tooling/README.md +++ b/packages/ast-tooling/README.md @@ -1,4 +1,4 @@ -# @svelte-cli/ast-tooling +# @sveltejs/ast-tooling This package provides tools and methods for parsing and serializing CSS, HTML and JS AST's. As the main [sv](https://svelte-add.com) project requires all of these tools they have been extracted into this separate project. diff --git a/packages/ast-tooling/package.json b/packages/ast-tooling/package.json index 2080a927..80cb4397 100644 --- a/packages/ast-tooling/package.json +++ b/packages/ast-tooling/package.json @@ -1,6 +1,7 @@ { - "name": "@svelte-cli/ast-tooling", - "version": "2.1.7", + "name": "@sveltejs/ast-tooling", + "private": true, + "version": "0.0.0", "license": "MIT", "type": "module", "scripts": { diff --git a/packages/clack-core/package.json b/packages/clack-core/package.json index 5cec4fdf..a7ab4332 100644 --- a/packages/clack-core/package.json +++ b/packages/clack-core/package.json @@ -1,5 +1,5 @@ { - "name": "@svelte-cli/clack-core", + "name": "@sveltejs/clack-core", "private": true, "version": "0.4.2", "type": "module", diff --git a/packages/clack-prompts/index.ts b/packages/clack-prompts/index.ts index 61ba2ef6..2454104d 100644 --- a/packages/clack-prompts/index.ts +++ b/packages/clack-prompts/index.ts @@ -10,12 +10,12 @@ import { SelectPrompt, type State, TextPrompt -} from '@svelte-cli/clack-core'; +} from '@sveltejs/clack-core'; import isUnicodeSupported from 'is-unicode-supported'; import color from 'picocolors'; import { cursor, erase } from 'sisteransi'; -export { isCancel } from '@svelte-cli/clack-core'; +export { isCancel } from '@sveltejs/clack-core'; const unicode = isUnicodeSupported(); const s = (c: string, fallback: string) => (unicode ? c : fallback); diff --git a/packages/clack-prompts/package.json b/packages/clack-prompts/package.json index 0426d35d..3864bb6c 100644 --- a/packages/clack-prompts/package.json +++ b/packages/clack-prompts/package.json @@ -1,5 +1,5 @@ { - "name": "@svelte-cli/clack-prompts", + "name": "@sveltejs/clack-prompts", "private": true, "version": "0.9.1", "type": "module", @@ -26,7 +26,7 @@ ], "license": "MIT", "devDependencies": { - "@svelte-cli/clack-core": "workspace:*", + "@sveltejs/clack-core": "workspace:*", "is-unicode-supported": "^1.3.0", "picocolors": "^1.1.0", "sisteransi": "^1.0.5" diff --git a/packages/cli/commands/add/index.ts b/packages/cli/commands/add/index.ts index 3a21e86d..515e0bca 100644 --- a/packages/cli/commands/add/index.ts +++ b/packages/cli/commands/add/index.ts @@ -4,7 +4,7 @@ import process from 'node:process'; import * as v from 'valibot'; import { exec } from 'tinyexec'; import { Command, Option } from 'commander'; -import * as p from '@svelte-cli/clack-prompts'; +import * as p from '@sveltejs/clack-prompts'; import * as pkg from 'empathic/package'; import { resolveCommand } from 'package-manager-detector'; import pc from 'picocolors'; @@ -15,8 +15,8 @@ import { getAdderDetails, communityAdderIds, getCommunityAdder -} from '@svelte-cli/adders'; -import type { AdderWithoutExplicitArgs, OptionValues } from '@svelte-cli/core'; +} from '@sveltejs/adders'; +import type { AdderWithoutExplicitArgs, OptionValues } from '@sveltejs/cli-core'; import * as common from '../../common.ts'; import { Directive, downloadPackage, getPackageJSON } from '../../utils/fetch-packages.ts'; import { createWorkspace } from './workspace.ts'; diff --git a/packages/cli/commands/add/processor.ts b/packages/cli/commands/add/processor.ts index ca07f4c6..8f635243 100644 --- a/packages/cli/commands/add/processor.ts +++ b/packages/cli/commands/add/processor.ts @@ -1,5 +1,5 @@ import { fileExists, readFile, writeFile } from './utils.ts'; -import type { Workspace, OptionDefinition, FileType } from '@svelte-cli/core'; +import type { Workspace, OptionDefinition, FileType } from '@sveltejs/cli-core'; /** * @param files diff --git a/packages/cli/commands/add/utils.ts b/packages/cli/commands/add/utils.ts index 8ff226aa..0651fadf 100644 --- a/packages/cli/commands/add/utils.ts +++ b/packages/cli/commands/add/utils.ts @@ -1,8 +1,8 @@ import fs from 'node:fs'; import path from 'node:path'; import pc from 'picocolors'; -import { parseJson } from '@svelte-cli/core/parsers'; -import type { Adder, Highlighter, Workspace } from '@svelte-cli/core'; +import { parseJson } from '@sveltejs/cli-core/parsers'; +import type { Adder, Highlighter, Workspace } from '@sveltejs/cli-core'; export type Package = { name: string; diff --git a/packages/cli/commands/add/workspace.ts b/packages/cli/commands/add/workspace.ts index 4d92707c..041a2f2e 100644 --- a/packages/cli/commands/add/workspace.ts +++ b/packages/cli/commands/add/workspace.ts @@ -1,12 +1,12 @@ import fs from 'node:fs'; import path from 'node:path'; import * as find from 'empathic/find'; -import { common, object, type AstTypes } from '@svelte-cli/core/js'; -import { parseScript } from '@svelte-cli/core/parsers'; +import { common, object, type AstTypes } from '@sveltejs/cli-core/js'; +import { parseScript } from '@sveltejs/cli-core/parsers'; import { TESTING } from '../../env.ts'; import { commonFilePaths, getPackageJson, readFile } from './utils.ts'; import { detectPackageManager } from '../../common.ts'; -import type { OptionDefinition, Workspace } from '@svelte-cli/core'; +import type { OptionDefinition, Workspace } from '@sveltejs/cli-core'; export function createEmptyWorkspace() { return { diff --git a/packages/cli/commands/create.ts b/packages/cli/commands/create.ts index ac804c03..ff99c253 100644 --- a/packages/cli/commands/create.ts +++ b/packages/cli/commands/create.ts @@ -3,14 +3,14 @@ import path from 'node:path'; import process from 'node:process'; import * as v from 'valibot'; import { Command, Option } from 'commander'; -import * as p from '@svelte-cli/clack-prompts'; +import * as p from '@sveltejs/clack-prompts'; import pc from 'picocolors'; import { create as createKit, templates, type LanguageType, type TemplateType -} from '@svelte-cli/create'; +} from '@sveltejs/create'; import * as common from '../common.js'; import { runAddCommand } from './add/index.ts'; diff --git a/packages/cli/common.ts b/packages/cli/common.ts index 734e4c2e..f141abda 100644 --- a/packages/cli/common.ts +++ b/packages/cli/common.ts @@ -2,11 +2,11 @@ import process from 'node:process'; import pc from 'picocolors'; import pkg from './package.json'; import { exec } from 'tinyexec'; -import * as p from '@svelte-cli/clack-prompts'; +import * as p from '@sveltejs/clack-prompts'; import { AGENTS, type AgentName, detectSync } from 'package-manager-detector'; import { COMMANDS, constructCommand, resolveCommand } from 'package-manager-detector/commands'; import type { Argument, HelpConfiguration, Option } from 'commander'; -import type { AdderWithoutExplicitArgs, Precondition } from '@svelte-cli/core'; +import type { AdderWithoutExplicitArgs, Precondition } from '@sveltejs/cli-core'; export const helpConfig: HelpConfiguration = { argumentDescription: formatDescription, diff --git a/packages/cli/index.ts b/packages/cli/index.ts index b5c7b91e..50f83ec1 100644 --- a/packages/cli/index.ts +++ b/packages/cli/index.ts @@ -1,3 +1,3 @@ -import { create } from '@svelte-cli/create'; +import { create } from '@sveltejs/create'; export { create }; diff --git a/packages/cli/package.json b/packages/cli/package.json index 98c8202e..add5dbb4 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -26,13 +26,11 @@ "default": "./dist/index.js" } }, - "dependencies": { - "@svelte-cli/core": "workspace:*" - }, "devDependencies": { - "@svelte-cli/adders": "workspace:*", - "@svelte-cli/clack-prompts": "workspace:*", - "@svelte-cli/create": "workspace:*", + "@sveltejs/adders": "workspace:*", + "@sveltejs/clack-prompts": "workspace:*", + "@sveltejs/cli-core": "workspace:*", + "@sveltejs/create": "workspace:*", "@types/tar-fs": "^2.0.4", "commander": "^12.1.0", "empathic": "^1.0.0", @@ -46,7 +44,7 @@ "lint": "prettier --check . --config ../../.prettierrc --ignore-path ../../.gitignore --ignore-path .gitignore --ignore-path ../../.prettierignore", "format": "pnpm lint --write", "check": "tsc", - "postpublish": "pnpm -F @svelte-cli/create update-template-repo" + "postpublish": "pnpm -F @sveltejs/create update-template-repo" }, "files": [ "dist" diff --git a/packages/cli/utils/fetch-packages.ts b/packages/cli/utils/fetch-packages.ts index f2a48c1c..9bb3e8ff 100644 --- a/packages/cli/utils/fetch-packages.ts +++ b/packages/cli/utils/fetch-packages.ts @@ -4,7 +4,7 @@ import { pipeline } from 'node:stream/promises'; import { createGunzip } from 'node:zlib'; import { extract } from 'tar-fs'; import { fileURLToPath } from 'node:url'; -import type { AdderWithoutExplicitArgs } from '@svelte-cli/core'; +import type { AdderWithoutExplicitArgs } from '@sveltejs/cli-core'; // path to the `node_modules` directory of `sv` const NODE_MODULES = path.join(fileURLToPath(import.meta.url), '..', '..', 'node_modules'); @@ -14,17 +14,17 @@ export const Directive = { file: 'file:', npm: 'npm:' }; function verifyPackage(pkg: Record, specifier: string) { const deps = { ...pkg.dependencies, ...pkg.peerDependencies }; // valid adders should always have a dependency on `core` - if (!deps['@svelte-cli/core']) { + if (!deps['@sveltejs/cli-core']) { throw new Error( - `Invalid adder package specified: '${specifier}' is missing a dependency on '@svelte-cli/core' in its 'package.json'` + `Invalid adder package specified: '${specifier}' is missing a dependency on '@sveltejs/cli-core' in its 'package.json'` ); } // adders should never have any external dependencies outside of `core`. // if the adder does have an external dependency, then we'll throw a helpful error guiding them to the solution for (const dep of Object.keys(deps)) { - if (dep === '@svelte-cli/core') continue; + if (dep === '@sveltejs/cli-core') continue; throw new Error( - `Invalid adder package detected: '${specifier}'\nCommunity adders should not have any external 'dependencies' besides '@svelte-cli/core'. Consider bundling your dependencies if they are necessary` + `Invalid adder package detected: '${specifier}'\nCommunity adders should not have any external 'dependencies' besides '@sveltejs/cli-core'. Consider bundling your dependencies if they are necessary` ); } } diff --git a/packages/core/README.md b/packages/core/README.md index a57a9d5d..27719e9f 100644 --- a/packages/core/README.md +++ b/packages/core/README.md @@ -1,4 +1,4 @@ -# @svelte-cli/core +# @sveltejs/cli-core This is the core of [sv](https://svelte-add.com). This package handles the following things (and a lot more) diff --git a/packages/core/index.ts b/packages/core/index.ts index 729e4af1..d81fabf2 100644 --- a/packages/core/index.ts +++ b/packages/core/index.ts @@ -1,5 +1,5 @@ export { defineAdderTests, defineAdder, defineAdderOptions } from './adder/config.ts'; -export { log } from '@svelte-cli/clack-prompts'; +export { log } from '@sveltejs/clack-prompts'; export { default as colors } from 'picocolors'; export { default as dedent } from 'dedent'; @@ -8,4 +8,4 @@ export type * from './adder/options.ts'; export type * from './adder/config.ts'; export type * from './adder/workspace.ts'; -export { Walker } from '@svelte-cli/ast-tooling'; +export { Walker } from '@sveltejs/ast-tooling'; diff --git a/packages/core/package.json b/packages/core/package.json index f134520a..923df0ad 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,7 @@ { - "name": "@svelte-cli/core", - "version": "2.10.4", + "name": "@sveltejs/cli-core", + "private": true, + "version": "0.0.0", "license": "MIT", "type": "module", "scripts": { @@ -36,14 +37,14 @@ "dist" ], "devDependencies": { - "@svelte-cli/clack-prompts": "workspace:*", + "@sveltejs/clack-prompts": "workspace:*", "decircular": "^1.0.0", "dedent": "^1.5.3", "magic-string": "^0.30.11", "picocolors": "^1.1.0" }, "dependencies": { - "@svelte-cli/ast-tooling": "workspace:*" + "@sveltejs/ast-tooling": "workspace:*" }, "bugs": "https://github.com/sveltejs/cli/issues", "repository": { diff --git a/packages/core/tests/css/common/add-at-rule/run.ts b/packages/core/tests/css/common/add-at-rule/run.ts index f3f361e5..fd53c285 100644 --- a/packages/core/tests/css/common/add-at-rule/run.ts +++ b/packages/core/tests/css/common/add-at-rule/run.ts @@ -1,5 +1,5 @@ -import { addAtRule } from '@svelte-cli/core/css'; -import type { CssFileEditor } from '@svelte-cli/core'; +import { addAtRule } from '@sveltejs/cli-core/css'; +import type { CssFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: CssFileEditor): void { addAtRule(ast, 'tailwind', "'lib/path/file.ext'", false); diff --git a/packages/core/tests/css/common/add-comment/run.ts b/packages/core/tests/css/common/add-comment/run.ts index 32367a55..b8481ab4 100644 --- a/packages/core/tests/css/common/add-comment/run.ts +++ b/packages/core/tests/css/common/add-comment/run.ts @@ -1,5 +1,5 @@ -import { addComment } from '@svelte-cli/core/css'; -import type { CssFileEditor } from '@svelte-cli/core'; +import { addComment } from '@sveltejs/cli-core/css'; +import type { CssFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: CssFileEditor): void { addComment(ast, 'foo comment'); diff --git a/packages/core/tests/css/common/add-imports/run.ts b/packages/core/tests/css/common/add-imports/run.ts index 93b77dd3..12b0033a 100644 --- a/packages/core/tests/css/common/add-imports/run.ts +++ b/packages/core/tests/css/common/add-imports/run.ts @@ -1,5 +1,5 @@ -import { addImports } from '@svelte-cli/core/css'; -import type { CssFileEditor } from '@svelte-cli/core'; +import { addImports } from '@sveltejs/cli-core/css'; +import type { CssFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: CssFileEditor): void { addImports(ast, ["'lib/path/file.css'"]); diff --git a/packages/core/tests/css/common/add-rule/run.ts b/packages/core/tests/css/common/add-rule/run.ts index 2dd3f33f..7639c5c4 100644 --- a/packages/core/tests/css/common/add-rule/run.ts +++ b/packages/core/tests/css/common/add-rule/run.ts @@ -1,5 +1,5 @@ -import { addDeclaration, addRule } from '@svelte-cli/core/css'; -import type { CssFileEditor } from '@svelte-cli/core'; +import { addDeclaration, addRule } from '@sveltejs/cli-core/css'; +import type { CssFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: CssFileEditor): void { const barSelectorRule = addRule(ast, '.bar'); diff --git a/packages/core/tests/css/index.ts b/packages/core/tests/css/index.ts index e6c5cc61..738e1cb8 100644 --- a/packages/core/tests/css/index.ts +++ b/packages/core/tests/css/index.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from 'vitest'; -import { parseCss, serializeCss } from '@svelte-cli/ast-tooling'; +import { parseCss, serializeCss } from '@sveltejs/ast-tooling'; import fs from 'node:fs'; import { join, resolve } from 'node:path'; import { fileURLToPath } from 'node:url'; diff --git a/packages/core/tests/html/common/create-div/run.ts b/packages/core/tests/html/common/create-div/run.ts index a109b071..36a582bd 100644 --- a/packages/core/tests/html/common/create-div/run.ts +++ b/packages/core/tests/html/common/create-div/run.ts @@ -1,5 +1,5 @@ -import { div, appendElement, insertElement } from '@svelte-cli/core/html'; -import type { HtmlFileEditor } from '@svelte-cli/core'; +import { div, appendElement, insertElement } from '@sveltejs/cli-core/html'; +import type { HtmlFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: HtmlFileEditor): void { const emptyDiv = div(); diff --git a/packages/core/tests/html/common/create-element/run.ts b/packages/core/tests/html/common/create-element/run.ts index 2693c62b..12658d28 100644 --- a/packages/core/tests/html/common/create-element/run.ts +++ b/packages/core/tests/html/common/create-element/run.ts @@ -1,5 +1,5 @@ -import { element, appendElement, insertElement } from '@svelte-cli/core/html'; -import type { HtmlFileEditor } from '@svelte-cli/core'; +import { element, appendElement, insertElement } from '@sveltejs/cli-core/html'; +import type { HtmlFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: HtmlFileEditor): void { const emptySpan = element('span'); diff --git a/packages/core/tests/html/common/from-raw/run.ts b/packages/core/tests/html/common/from-raw/run.ts index 0fefedbd..d1cfa163 100644 --- a/packages/core/tests/html/common/from-raw/run.ts +++ b/packages/core/tests/html/common/from-raw/run.ts @@ -1,5 +1,5 @@ -import { addFromRawHtml } from '@svelte-cli/core/html'; -import type { HtmlFileEditor } from '@svelte-cli/core'; +import { addFromRawHtml } from '@sveltejs/cli-core/html'; +import type { HtmlFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: HtmlFileEditor): void { addFromRawHtml(ast.childNodes, '
foo
'); diff --git a/packages/core/tests/html/index.ts b/packages/core/tests/html/index.ts index 124c252c..6719acd4 100644 --- a/packages/core/tests/html/index.ts +++ b/packages/core/tests/html/index.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from 'vitest'; -import { parseHtml, serializeHtml } from '@svelte-cli/ast-tooling'; +import { parseHtml, serializeHtml } from '@sveltejs/ast-tooling'; import fs from 'node:fs'; import { join, resolve } from 'node:path'; import { fileURLToPath } from 'node:url'; diff --git a/packages/core/tests/js/arrays/empty-array/run.ts b/packages/core/tests/js/arrays/empty-array/run.ts index 2332aeac..d3b4a0b1 100644 --- a/packages/core/tests/js/arrays/empty-array/run.ts +++ b/packages/core/tests/js/arrays/empty-array/run.ts @@ -1,5 +1,5 @@ -import { array, variables } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { array, variables } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { const emptyArray = array.createEmpty(); diff --git a/packages/core/tests/js/arrays/object-array/run.ts b/packages/core/tests/js/arrays/object-array/run.ts index 572dd0bf..622cc377 100644 --- a/packages/core/tests/js/arrays/object-array/run.ts +++ b/packages/core/tests/js/arrays/object-array/run.ts @@ -1,5 +1,5 @@ -import { array, object, common, variables } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { array, object, common, variables } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { const array1 = array.createEmpty(); diff --git a/packages/core/tests/js/arrays/string-array/run.ts b/packages/core/tests/js/arrays/string-array/run.ts index 30291272..9d779482 100644 --- a/packages/core/tests/js/arrays/string-array/run.ts +++ b/packages/core/tests/js/arrays/string-array/run.ts @@ -1,5 +1,5 @@ -import { array, variables } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { array, variables } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { const array1 = array.createEmpty(); diff --git a/packages/core/tests/js/exports/default-export-with-variable/run.ts b/packages/core/tests/js/exports/default-export-with-variable/run.ts index 436f6a75..89137ad3 100644 --- a/packages/core/tests/js/exports/default-export-with-variable/run.ts +++ b/packages/core/tests/js/exports/default-export-with-variable/run.ts @@ -1,5 +1,5 @@ -import { object, common, variables, exports } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { object, common, variables, exports } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { const object1 = object.create({ diff --git a/packages/core/tests/js/exports/default-export/run.ts b/packages/core/tests/js/exports/default-export/run.ts index 1fcf38f9..7e350fb2 100644 --- a/packages/core/tests/js/exports/default-export/run.ts +++ b/packages/core/tests/js/exports/default-export/run.ts @@ -1,5 +1,5 @@ -import { object, common, exports } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { object, common, exports } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { const object1 = object.create({ diff --git a/packages/core/tests/js/exports/named-export-with-existing/run.ts b/packages/core/tests/js/exports/named-export-with-existing/run.ts index 5ac267f5..6f8b8c1c 100644 --- a/packages/core/tests/js/exports/named-export-with-existing/run.ts +++ b/packages/core/tests/js/exports/named-export-with-existing/run.ts @@ -1,5 +1,5 @@ -import { common, variables, object, exports, type AstTypes } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { common, variables, object, exports, type AstTypes } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { const variableFallback = variables.declaration(ast, 'const', 'variable', object.createEmpty()); diff --git a/packages/core/tests/js/exports/named-export/run.ts b/packages/core/tests/js/exports/named-export/run.ts index c8cb2ca8..ead2b2d5 100644 --- a/packages/core/tests/js/exports/named-export/run.ts +++ b/packages/core/tests/js/exports/named-export/run.ts @@ -1,5 +1,5 @@ -import { common, variables, object, exports } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { common, variables, object, exports } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { const object1 = object.create({ diff --git a/packages/core/tests/js/functions/arrow-function/run.ts b/packages/core/tests/js/functions/arrow-function/run.ts index 58196767..56250235 100644 --- a/packages/core/tests/js/functions/arrow-function/run.ts +++ b/packages/core/tests/js/functions/arrow-function/run.ts @@ -1,5 +1,5 @@ -import { functions, common } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { functions, common } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { const insideExpression = common.expressionFromString("console.log('foo')"); diff --git a/packages/core/tests/js/functions/function-call-by-identifier/run.ts b/packages/core/tests/js/functions/function-call-by-identifier/run.ts index 7681d503..28ef6ceb 100644 --- a/packages/core/tests/js/functions/function-call-by-identifier/run.ts +++ b/packages/core/tests/js/functions/function-call-by-identifier/run.ts @@ -1,5 +1,5 @@ -import { functions, common } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { functions, common } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { const functionCall = functions.callByIdentifier('foo', ['a']); diff --git a/packages/core/tests/js/functions/function-call/run.ts b/packages/core/tests/js/functions/function-call/run.ts index 59445e32..acce02d3 100644 --- a/packages/core/tests/js/functions/function-call/run.ts +++ b/packages/core/tests/js/functions/function-call/run.ts @@ -1,5 +1,5 @@ -import { functions, common } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { functions, common } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { const functionCall = functions.call('foo', ['bar']); diff --git a/packages/core/tests/js/imports/avoid-duplicating-imports/run.ts b/packages/core/tests/js/imports/avoid-duplicating-imports/run.ts index 2a67796d..496abb10 100644 --- a/packages/core/tests/js/imports/avoid-duplicating-imports/run.ts +++ b/packages/core/tests/js/imports/avoid-duplicating-imports/run.ts @@ -1,5 +1,5 @@ -import { imports } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { imports } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { imports.addEmpty(ast, 'package/file.js'); diff --git a/packages/core/tests/js/imports/default-import/run.ts b/packages/core/tests/js/imports/default-import/run.ts index a953daf3..003f65bd 100644 --- a/packages/core/tests/js/imports/default-import/run.ts +++ b/packages/core/tests/js/imports/default-import/run.ts @@ -1,5 +1,5 @@ -import { imports } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { imports } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { imports.addDefault(ast, 'package', 'MyPackage'); diff --git a/packages/core/tests/js/imports/empty-import/run.ts b/packages/core/tests/js/imports/empty-import/run.ts index 4f3ea330..4d89d304 100644 --- a/packages/core/tests/js/imports/empty-import/run.ts +++ b/packages/core/tests/js/imports/empty-import/run.ts @@ -1,5 +1,5 @@ -import { imports } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { imports } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { imports.addEmpty(ast, './relativ/file.css'); diff --git a/packages/core/tests/js/imports/named-import-merging/run.ts b/packages/core/tests/js/imports/named-import-merging/run.ts index 15fb560c..29aeac9b 100644 --- a/packages/core/tests/js/imports/named-import-merging/run.ts +++ b/packages/core/tests/js/imports/named-import-merging/run.ts @@ -1,5 +1,5 @@ -import { imports } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { imports } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { imports.addNamed(ast, 'package', { namedTwo: 'namedTwo' }, false); diff --git a/packages/core/tests/js/imports/named-import/run.ts b/packages/core/tests/js/imports/named-import/run.ts index ad439355..163c9c42 100644 --- a/packages/core/tests/js/imports/named-import/run.ts +++ b/packages/core/tests/js/imports/named-import/run.ts @@ -1,5 +1,5 @@ -import { imports } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { imports } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { imports.addNamed(ast, 'package', { namedOne: 'namedOne' }, false); diff --git a/packages/core/tests/js/index.ts b/packages/core/tests/js/index.ts index 93a3f92a..a1ab2ed5 100644 --- a/packages/core/tests/js/index.ts +++ b/packages/core/tests/js/index.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from 'vitest'; -import { parseScript, serializeScript } from '@svelte-cli/ast-tooling'; +import { parseScript, serializeScript } from '@sveltejs/ast-tooling'; import fs from 'node:fs'; import { join, resolve } from 'node:path'; import { fileURLToPath } from 'node:url'; diff --git a/packages/core/tests/js/object/create/run.ts b/packages/core/tests/js/object/create/run.ts index 403a336b..8bd864b4 100644 --- a/packages/core/tests/js/object/create/run.ts +++ b/packages/core/tests/js/object/create/run.ts @@ -1,5 +1,5 @@ -import { variables, object, common } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { variables, object, common } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { const emptyObject = object.createEmpty(); diff --git a/packages/core/tests/js/object/override-property/run.ts b/packages/core/tests/js/object/override-property/run.ts index 254d0b1f..8ab3425c 100644 --- a/packages/core/tests/js/object/override-property/run.ts +++ b/packages/core/tests/js/object/override-property/run.ts @@ -1,5 +1,5 @@ -import { variables, object, common, type AstTypes } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { variables, object, common, type AstTypes } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { const variable = variables.declaration(ast, 'const', 'test', object.createEmpty()); diff --git a/packages/core/tests/js/object/property/run.ts b/packages/core/tests/js/object/property/run.ts index 3256f064..c288c301 100644 --- a/packages/core/tests/js/object/property/run.ts +++ b/packages/core/tests/js/object/property/run.ts @@ -1,5 +1,5 @@ -import { variables, object, common, type AstTypes } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { variables, object, common, type AstTypes } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { const variable = variables.declaration(ast, 'const', 'test', object.createEmpty()); diff --git a/packages/core/tests/js/object/remove-property/run.ts b/packages/core/tests/js/object/remove-property/run.ts index ea1d1b26..0971c07a 100644 --- a/packages/core/tests/js/object/remove-property/run.ts +++ b/packages/core/tests/js/object/remove-property/run.ts @@ -1,5 +1,5 @@ -import { variables, object, type AstTypes } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { variables, object, type AstTypes } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { const variable = variables.declaration(ast, 'const', 'test', object.createEmpty()); diff --git a/packages/core/tests/js/variables/declaration/run.ts b/packages/core/tests/js/variables/declaration/run.ts index bc0afeaa..ba1880e7 100644 --- a/packages/core/tests/js/variables/declaration/run.ts +++ b/packages/core/tests/js/variables/declaration/run.ts @@ -1,5 +1,5 @@ -import { variables, common, object } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { variables, common, object } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { const testNumberVariable = variables.declaration( diff --git a/packages/core/tests/js/variables/identifier/run.ts b/packages/core/tests/js/variables/identifier/run.ts index 9fdb0dbd..a5870f4d 100644 --- a/packages/core/tests/js/variables/identifier/run.ts +++ b/packages/core/tests/js/variables/identifier/run.ts @@ -1,5 +1,5 @@ -import { variables } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { variables } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { const barVariable = variables.declaration(ast, 'const', 'bar', variables.identifier('foo')); diff --git a/packages/core/tests/js/variables/type-annotate-declarator/run.ts b/packages/core/tests/js/variables/type-annotate-declarator/run.ts index ad43af8b..4a0de3af 100644 --- a/packages/core/tests/js/variables/type-annotate-declarator/run.ts +++ b/packages/core/tests/js/variables/type-annotate-declarator/run.ts @@ -1,5 +1,5 @@ -import { variables } from '@svelte-cli/core/js'; -import type { ScriptFileEditor } from '@svelte-cli/core'; +import { variables } from '@sveltejs/cli-core/js'; +import type { ScriptFileEditor } from '@sveltejs/cli-core'; export function run({ ast }: ScriptFileEditor): void { const decl = ast.body[0] as any; diff --git a/packages/core/tooling/css/index.ts b/packages/core/tooling/css/index.ts index 031aee72..017b7af3 100644 --- a/packages/core/tooling/css/index.ts +++ b/packages/core/tooling/css/index.ts @@ -5,7 +5,7 @@ import { Comment, type CssAst, type CssChildNode -} from '@svelte-cli/ast-tooling'; +} from '@sveltejs/ast-tooling'; export function addRule(ast: CssAst, selector: string): Rule { const rules = ast.nodes.filter((x): x is Rule => x.type == 'rule'); diff --git a/packages/core/tooling/html/index.ts b/packages/core/tooling/html/index.ts index 2ec55829..c8e5222b 100644 --- a/packages/core/tooling/html/index.ts +++ b/packages/core/tooling/html/index.ts @@ -4,7 +4,7 @@ import { HtmlElement, HtmlElementType, parseHtml -} from '@svelte-cli/ast-tooling'; +} from '@sveltejs/ast-tooling'; export type { HtmlDocument }; diff --git a/packages/core/tooling/js/array.ts b/packages/core/tooling/js/array.ts index 790a513a..7b43cd91 100644 --- a/packages/core/tooling/js/array.ts +++ b/packages/core/tooling/js/array.ts @@ -1,5 +1,5 @@ import { areNodesEqual } from './common.ts'; -import type { AstKinds, AstTypes } from '@svelte-cli/ast-tooling'; +import type { AstKinds, AstTypes } from '@sveltejs/ast-tooling'; export function createEmpty(): AstTypes.ArrayExpression { const arrayExpression: AstTypes.ArrayExpression = { diff --git a/packages/core/tooling/js/common.ts b/packages/core/tooling/js/common.ts index 42e5903b..259d4c86 100644 --- a/packages/core/tooling/js/common.ts +++ b/packages/core/tooling/js/common.ts @@ -5,7 +5,7 @@ import { parseScript, serializeScript, stripAst -} from '@svelte-cli/ast-tooling'; +} from '@sveltejs/ast-tooling'; import decircular from 'decircular'; import dedent from 'dedent'; diff --git a/packages/core/tooling/js/exports.ts b/packages/core/tooling/js/exports.ts index bdce25ba..92543660 100644 --- a/packages/core/tooling/js/exports.ts +++ b/packages/core/tooling/js/exports.ts @@ -1,4 +1,4 @@ -import type { AstKinds, AstTypes } from '@svelte-cli/ast-tooling'; +import type { AstKinds, AstTypes } from '@sveltejs/ast-tooling'; export type ExportDefaultReturn = { astNode: AstTypes.ExportDefaultDeclaration; diff --git a/packages/core/tooling/js/function.ts b/packages/core/tooling/js/function.ts index 06956d9e..84445a7c 100644 --- a/packages/core/tooling/js/function.ts +++ b/packages/core/tooling/js/function.ts @@ -1,4 +1,4 @@ -import type { AstKinds, AstTypes } from '@svelte-cli/ast-tooling'; +import type { AstKinds, AstTypes } from '@sveltejs/ast-tooling'; export function call(name: string, args: string[]): AstTypes.CallExpression { const callExpression: AstTypes.CallExpression = { diff --git a/packages/core/tooling/js/imports.ts b/packages/core/tooling/js/imports.ts index b6cd85a6..7abd01ad 100644 --- a/packages/core/tooling/js/imports.ts +++ b/packages/core/tooling/js/imports.ts @@ -1,4 +1,4 @@ -import { Walker, type AstTypes } from '@svelte-cli/ast-tooling'; +import { Walker, type AstTypes } from '@sveltejs/ast-tooling'; import { areNodesEqual } from './common.ts'; export function addEmpty(ast: AstTypes.Program, importFrom: string): void { diff --git a/packages/core/tooling/js/index.ts b/packages/core/tooling/js/index.ts index 87548b20..b6f8e0c9 100644 --- a/packages/core/tooling/js/index.ts +++ b/packages/core/tooling/js/index.ts @@ -5,4 +5,4 @@ export * as functions from './function.ts'; export * as imports from './imports.ts'; export * as variables from './variables.ts'; export * as exports from './exports.ts'; -export type { AstTypes, AstKinds } from '@svelte-cli/ast-tooling'; +export type { AstTypes, AstKinds } from '@sveltejs/ast-tooling'; diff --git a/packages/core/tooling/js/object.ts b/packages/core/tooling/js/object.ts index 487ac504..e0a5fb63 100644 --- a/packages/core/tooling/js/object.ts +++ b/packages/core/tooling/js/object.ts @@ -1,4 +1,4 @@ -import type { AstKinds, AstTypes } from '@svelte-cli/ast-tooling'; +import type { AstKinds, AstTypes } from '@sveltejs/ast-tooling'; export function property( ast: AstTypes.ObjectExpression, diff --git a/packages/core/tooling/js/variables.ts b/packages/core/tooling/js/variables.ts index b6d7f24c..968ea9a4 100644 --- a/packages/core/tooling/js/variables.ts +++ b/packages/core/tooling/js/variables.ts @@ -1,4 +1,4 @@ -import type { AstKinds, AstTypes } from '@svelte-cli/ast-tooling'; +import type { AstKinds, AstTypes } from '@sveltejs/ast-tooling'; export function declaration( ast: AstTypes.Program | AstKinds.DeclarationKind, diff --git a/packages/core/tooling/parsers.ts b/packages/core/tooling/parsers.ts index c7c265b7..a9afc5e3 100644 --- a/packages/core/tooling/parsers.ts +++ b/packages/core/tooling/parsers.ts @@ -1,4 +1,4 @@ -import * as tools from '@svelte-cli/ast-tooling'; +import * as tools from '@sveltejs/ast-tooling'; import MagicString from 'magic-string'; type ParseBase = { diff --git a/packages/create/README.md b/packages/create/README.md index 2a6f6a43..08a8fb9b 100644 --- a/packages/create/README.md +++ b/packages/create/README.md @@ -1,3 +1,3 @@ -# @svelte-cli/create +# @sveltejs/create An internal package for scaffolding SvelteKit projects. diff --git a/packages/create/package.json b/packages/create/package.json index 52d03744..f615f461 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,7 +1,7 @@ { - "name": "@svelte-cli/create", + "name": "@sveltejs/create", "private": true, - "version": "0.0.1", + "version": "0.0.0", "description": "An API for creating SvelteKit projects", "type": "module", "keywords": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7f91d79c..26924ec7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: devDependencies: '@changesets/cli': - specifier: ^2.27.8 - version: 2.27.8 + specifier: ^2.27.9 + version: 2.27.9 '@rollup/plugin-commonjs': specifier: ^26.0.1 version: 26.0.1(rollup@4.21.2) @@ -23,7 +23,7 @@ importers: '@rollup/plugin-node-resolve': specifier: ^15.2.3 version: 15.2.3(rollup@4.21.2) - '@svelte-cli/create': + '@sveltejs/create': specifier: workspace:* version: link:packages/create '@sveltejs/eslint-config': @@ -80,7 +80,7 @@ importers: community-adder-template: dependencies: - '@svelte-cli/core': + '@sveltejs/cli-core': specifier: workspace:* version: link:../packages/core devDependencies: @@ -90,7 +90,7 @@ importers: packages/adders: dependencies: - '@svelte-cli/core': + '@sveltejs/cli-core': specifier: workspace:* version: link:../core @@ -141,7 +141,7 @@ importers: packages/clack-prompts: devDependencies: - '@svelte-cli/clack-core': + '@sveltejs/clack-core': specifier: workspace:* version: link:../clack-core is-unicode-supported: @@ -155,18 +155,17 @@ importers: version: 1.0.5 packages/cli: - dependencies: - '@svelte-cli/core': - specifier: workspace:* - version: link:../core devDependencies: - '@svelte-cli/adders': + '@sveltejs/adders': specifier: workspace:* version: link:../adders - '@svelte-cli/clack-prompts': + '@sveltejs/clack-prompts': specifier: workspace:* version: link:../clack-prompts - '@svelte-cli/create': + '@sveltejs/cli-core': + specifier: workspace:* + version: link:../core + '@sveltejs/create': specifier: workspace:* version: link:../create '@types/tar-fs': @@ -196,11 +195,11 @@ importers: packages/core: dependencies: - '@svelte-cli/ast-tooling': + '@sveltejs/ast-tooling': specifier: workspace:* version: link:../ast-tooling devDependencies: - '@svelte-cli/clack-prompts': + '@sveltejs/clack-prompts': specifier: workspace:* version: link:../clack-prompts decircular: @@ -267,8 +266,8 @@ packages: '@changesets/changelog-git@0.2.0': resolution: {integrity: sha512-bHOx97iFI4OClIT35Lok3sJAwM31VbUM++gnMBV16fdbtBhgYu4dxsphBF/0AZZsyAHMrnM0yFcj5gZM1py6uQ==} - '@changesets/cli@2.27.8': - resolution: {integrity: sha512-gZNyh+LdSsI82wBSHLQ3QN5J30P4uHKJ4fXgoGwQxfXwYFTJzDdvIJasZn8rYQtmKhyQuiBj4SSnLuKlxKWq4w==} + '@changesets/cli@2.27.9': + resolution: {integrity: sha512-q42a/ZbDnxPpCb5Wkm6tMVIxgeI9C/bexntzTeCFBrQEdpisQqk8kCHllYZMDjYtEc1ZzumbMJAG8H0Z4rdvjg==} hasBin: true '@changesets/config@3.0.3': @@ -740,9 +739,6 @@ packages: '@types/resolve@1.20.2': resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==} - '@types/semver@7.5.8': - resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} - '@types/tar-fs@2.0.4': resolution: {integrity: sha512-ipPec0CjTmVDWE+QKr9cTmIIoTl7dFG/yARCM5MqK8i6CNLIG1P8x4kwDsOQY1ChZOZjH0wO9nvfgBvWl4R3kA==} @@ -2224,7 +2220,7 @@ snapshots: dependencies: '@changesets/types': 6.0.0 - '@changesets/cli@2.27.8': + '@changesets/cli@2.27.9': dependencies: '@changesets/apply-release-plan': 7.0.5 '@changesets/assemble-release-plan': 6.0.4 @@ -2241,14 +2237,12 @@ snapshots: '@changesets/types': 6.0.0 '@changesets/write': 0.3.2 '@manypkg/get-packages': 1.1.3 - '@types/semver': 7.5.8 ansi-colors: 4.1.3 ci-info: 3.9.0 enquirer: 2.4.1 external-editor: 3.1.0 fs-extra: 7.0.1 mri: 1.2.0 - outdent: 0.5.0 p-limit: 2.3.0 package-manager-detector: 0.2.2 picocolors: 1.1.0 @@ -2669,8 +2663,6 @@ snapshots: '@types/resolve@1.20.2': {} - '@types/semver@7.5.8': {} - '@types/tar-fs@2.0.4': dependencies: '@types/node': 22.5.4 diff --git a/rollup.config.js b/rollup.config.js index 5612ba62..f66a0e6c 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -8,10 +8,10 @@ import dynamicImportVars from '@rollup/plugin-dynamic-import-vars'; import { preserveShebangs } from 'rollup-plugin-preserve-shebangs'; import dts from 'unplugin-isolated-decl/rollup'; import esbuild from 'rollup-plugin-esbuild'; -import { buildTemplates } from '@svelte-cli/create/build'; +import { buildTemplates } from '@sveltejs/create/build'; import MagicString from 'magic-string'; -/** @import { Package } from "./packages/core/files/utils.js" */ +/** @import { Package } from "./packages/cli/commands/add/utils" */ /** @import { Plugin, RollupOptions } from "rollup" */ /** @typedef {Package & { peerDependencies: Record }} PackageJson */ @@ -46,8 +46,8 @@ function getConfig(project) { const pkg = JSON.parse(fs.readFileSync(path.join(projectRoot, 'package.json'), 'utf8')); const externalDeps = getExternalDeps(pkg); - // always externalizes `@svelte-cli/core` and any deps that are `dependencies` or `peerDependencies` - const external = [/@svelte-cli\/core\w*/g, ...externalDeps]; + // always externalizes `@sveltejs/cli-core` and any deps that are `dependencies` or `peerDependencies` + const external = [...externalDeps]; /** @type {Plugin | undefined} */ let buildCliTemplatesPlugin; diff --git a/scripts/get-deps-to-publish.js b/scripts/get-deps-to-publish.js index 9b80be56..66d61851 100644 --- a/scripts/get-deps-to-publish.js +++ b/scripts/get-deps-to-publish.js @@ -1,6 +1,6 @@ /** * This tool is used by the pr ci to determine the packages that need to be published to the pkg-pr-new registry. - * In order to avoid situations where only @svelte-cli/core would be published, because it's the only modified package, + * In order to avoid situations where only @sveltejs/cli-core would be published, because it's the only modified package, * this tool will also determine the dependent packages and also publish those. * PR: https://github.com/svelte-add/svelte-add/pull/408 */