Skip to content

Commit

Permalink
chore(turbo): consistent internal package names (vercel#4550)
Browse files Browse the repository at this point in the history
  • Loading branch information
tknickman authored Apr 12, 2023
1 parent af77bfc commit 9535210
Show file tree
Hide file tree
Showing 54 changed files with 134 additions and 132 deletions.
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "next build ",
"lint": "next lint",
"rss": "node scripts/generate-rss.js",
"schema": "turbo-gen ./public/schema.json"
"schema": "turbo-types-generate ./public/schema.json"
},
"author": "Jared Palmer",
"license": "MPL-2.0",
Expand All @@ -36,6 +36,7 @@
},
"devDependencies": {
"@babel/core": "7.20.12",
"@turbo/types": "workspace:*",
"@types/node": "^16.11.12",
"@types/react": "18.0.21",
"autoprefixer": "10.4.14",
Expand All @@ -47,7 +48,6 @@
"postcss": "8.4.21",
"rss": "^1.2.2",
"tailwindcss": "3.1.8",
"turbo-types": "workspace:*",
"typescript": "4.8.4"
},
"prettier": {
Expand Down
2 changes: 1 addition & 1 deletion packages/create-turbo/__tests__/git.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
tryGitInit,
} from "../src/utils/git";
import childProcess from "child_process";
import { setupTestFixtures } from "turbo-test-utils";
import { setupTestFixtures } from "@turbo/test-utils";

describe("git", () => {
// just to make sure this doesn't get lost
Expand Down
2 changes: 1 addition & 1 deletion packages/create-turbo/__tests__/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import path from "path";
import chalk from "chalk";
import childProcess from "child_process";
import { setupTestFixtures, spyConsole } from "turbo-test-utils";
import { setupTestFixtures, spyConsole } from "@turbo/test-utils";
import { create } from "../src/commands/create";
import type { CreateCommandArgument } from "../src/commands/create/types";
import { turboGradient } from "../src/logger";
Expand Down
2 changes: 1 addition & 1 deletion packages/create-turbo/__tests__/isFolderEmpty.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fs from "fs-extra";
import path from "path";
import { isFolderEmpty } from "../src/utils/isFolderEmpty";
import { setupTestFixtures } from "turbo-test-utils";
import { setupTestFixtures } from "@turbo/test-utils";

describe("isFolderEmpty", () => {
const { useFixture } = setupTestFixtures({
Expand Down
2 changes: 1 addition & 1 deletion packages/create-turbo/__tests__/isWritable.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import path from "path";
import { isWriteable } from "../src/utils/isWriteable";
import { setupTestFixtures } from "turbo-test-utils";
import { setupTestFixtures } from "@turbo/test-utils";
import fs from "fs-extra";

describe("isWriteable", () => {
Expand Down
6 changes: 3 additions & 3 deletions packages/create-turbo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@
"jest": "^27.4.3",
"strip-ansi": "^6.0.1",
"ts-jest": "^27.1.1",
"tsconfig": "workspace:*",
"@turbo/tsconfig": "workspace:*",
"tsup": "^5.10.3",
"turbo-utils": "workspace:*",
"turbo-test-utils": "workspace:*",
"@turbo/utils": "workspace:*",
"@turbo/test-utils": "workspace:*",
"typescript": "^4.5.5"
},
"files": [
Expand Down
2 changes: 1 addition & 1 deletion packages/create-turbo/src/commands/create/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
getPackageManagerMeta,
ConvertError,
} from "@turbo/workspaces";
import { getAvailablePackageManagers } from "turbo-utils";
import { getAvailablePackageManagers } from "@turbo/utils";
import type { CreateCommandArgument, CreateCommandOptions } from "./types";
import * as prompts from "./prompts";
import { createProject } from "./createProject";
Expand Down
2 changes: 1 addition & 1 deletion packages/create-turbo/src/commands/create/prompts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import fs from "fs-extra";
import chalk from "chalk";
import type { PackageManager } from "@turbo/workspaces";
import type { CreateCommandArgument, CreateCommandOptions } from "./types";
import { getAvailablePackageManagers } from "turbo-utils";
import { getAvailablePackageManagers } from "@turbo/utils";
import { isFolderEmpty } from "../../utils/isFolderEmpty";
import inquirer from "inquirer";

Expand Down
2 changes: 1 addition & 1 deletion packages/create-turbo/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "tsconfig/library.json",
"extends": "@turbo/tsconfig/library.json",
"exclude": ["templates"],
"compilerOptions": {
"rootDir": "."
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/eslint-plugin-turbo/__tests__/cwd.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import path from "path";
import JSON5 from "json5";
import { execSync } from "child_process";
import { Schema } from "turbo-types";
import { setupTestFixtures } from "turbo-test-utils";
import { Schema } from "@turbo/types";
import { setupTestFixtures } from "@turbo/test-utils";

describe("eslint settings check", () => {
const { useFixture } = setupTestFixtures({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getTurboConfigs } from "turbo-utils";
import { getTurboConfigs } from "@turbo/utils";

function findDependsOnEnvVars({
dependencies,
Expand Down
8 changes: 4 additions & 4 deletions packages/eslint-plugin-turbo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
"jest": "^27.4.3",
"json5": "^2.2.1",
"ts-jest": "^27.1.1",
"tsconfig": "workspace:*",
"@turbo/tsconfig": "workspace:*",
"tsup": "^6.2.0",
"turbo-test-utils": "workspace:*",
"turbo-types": "workspace:*",
"turbo-utils": "workspace:*",
"@turbo/test-utils": "workspace:*",
"@turbo/types": "workspace:*",
"@turbo/utils": "workspace:*",
"typescript": "^4.7.4"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-turbo/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "tsconfig/library.json",
"extends": "@turbo/tsconfig/library.json",
"compilerOptions": {
"rootDir": "."
}
Expand Down
2 changes: 1 addition & 1 deletion packages/tsconfig/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "tsconfig",
"name": "@turbo/tsconfig",
"version": "0.0.0",
"private": true
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { transformer } from "../src/transforms/add-package-manager";
import { setupTestFixtures } from "turbo-test-utils";
import { setupTestFixtures } from "@turbo/test-utils";
import fs from "fs-extra";
import * as getPackageManager from "../src/utils/getPackageManager";
import * as getPackageManagerVersion from "../src/utils/getPackageManagerVersion";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { transformer } from "../src/transforms/create-turbo-config";
import { setupTestFixtures } from "turbo-test-utils";
import { setupTestFixtures } from "@turbo/test-utils";
import fs from "fs-extra";

describe("create-turbo-config", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { setupTestFixtures } from "turbo-test-utils";
import { setupTestFixtures } from "@turbo/test-utils";
import getTurboUpgradeCommand from "../src/commands/migrate/steps/getTurboUpgradeCommand";
import * as utils from "../src/commands/migrate/utils";
import * as getPackageManager from "../src/utils/getPackageManager";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
migrateConfig,
transformer,
} from "../src/transforms/migrate-env-var-dependencies";
import { setupTestFixtures } from "turbo-test-utils";
import type { Schema } from "turbo-types";
import { setupTestFixtures } from "@turbo/test-utils";
import type { Schema } from "@turbo/types";

const getTestTurboConfig = (override: Schema = { pipeline: {} }): Schema => {
const config = {
Expand Down
2 changes: 1 addition & 1 deletion packages/turbo-codemod/__tests__/migrate.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { MigrateCommandArgument } from "../src/commands";
import migrate from "../src/commands/migrate";
import { setupTestFixtures, spyExit } from "turbo-test-utils";
import { setupTestFixtures, spyExit } from "@turbo/test-utils";
import childProcess from "child_process";
import * as checkGitStatus from "../src/utils/checkGitStatus";
import * as getCurrentVersion from "../src/commands/migrate/steps/getCurrentVersion";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { transformer } from "../src/transforms/set-default-outputs";
import { setupTestFixtures } from "turbo-test-utils";
import { setupTestFixtures } from "@turbo/test-utils";

describe("set-default-outputs", () => {
const { useFixture } = setupTestFixtures({
Expand Down
2 changes: 1 addition & 1 deletion packages/turbo-codemod/__tests__/transform.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import transform from "../src/commands/transform";
import { MigrateCommandArgument } from "../src/commands";
import { setupTestFixtures, spyExit } from "turbo-test-utils";
import { setupTestFixtures, spyExit } from "@turbo/test-utils";
import * as checkGitStatus from "../src/utils/checkGitStatus";
import * as getPackageManager from "../src/utils/getPackageManager";
import * as getPackageManagerVersion from "../src/utils/getPackageManagerVersion";
Expand Down
8 changes: 4 additions & 4 deletions packages/turbo-codemod/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@
"plop": "^3.1.1",
"semver": "^7.3.5",
"ts-jest": "^27.1.1",
"tsconfig": "workspace:*",
"@turbo/tsconfig": "workspace:*",
"tsup": "^5.10.3",
"turbo-test-utils": "workspace:*",
"turbo-types": "workspace:*",
"turbo-utils": "workspace:*",
"@turbo/test-utils": "workspace:*",
"@turbo/types": "workspace:*",
"@turbo/utils": "workspace:*",
"typescript": "^4.5.5"
},
"files": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fs from "fs-extra";
import path from "path";
import { getTurboConfigs } from "turbo-utils";
import type { Schema, Pipeline } from "turbo-types";
import { getTurboConfigs } from "@turbo/utils";
import type { Schema, Pipeline } from "@turbo/types";

import getTransformerHelpers from "../utils/getTransformerHelpers";
import { TransformerResults } from "../runner";
Expand Down
4 changes: 2 additions & 2 deletions packages/turbo-codemod/src/transforms/set-default-outputs.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import path from "path";
import fs from "fs-extra";
import { getTurboConfigs } from "turbo-utils";
import type { Schema as TurboJsonSchema } from "turbo-types";
import { getTurboConfigs } from "@turbo/utils";
import type { Schema as TurboJsonSchema } from "@turbo/types";

import type { TransformerArgs } from "../types";
import getTransformerHelpers from "../utils/getTransformerHelpers";
Expand Down
2 changes: 1 addition & 1 deletion packages/turbo-codemod/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "tsconfig/library.json",
"extends": "@turbo/tsconfig/library.json",
"compilerOptions": {
"rootDir": "."
}
Expand Down
2 changes: 1 addition & 1 deletion packages/turbo-ignore/__tests__/args.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import parseArgs, { help } from "../src/args";
import pkg from "../package.json";
import { spyConsole, spyExit } from "turbo-test-utils";
import { spyConsole, spyExit } from "@turbo/test-utils";

describe("parseArgs()", () => {
const mockConsole = spyConsole();
Expand Down
2 changes: 1 addition & 1 deletion packages/turbo-ignore/__tests__/checkCommit.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import child_process from "child_process";
import { checkCommit } from "../src/checkCommit";
import { mockEnv } from "turbo-test-utils";
import { mockEnv } from "@turbo/test-utils";

describe("checkCommit()", () => {
describe("on Vercel", () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/turbo-ignore/__tests__/getComparison.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getComparison } from "../src/getComparison";
import { spyConsole, mockEnv } from "turbo-test-utils";
import { spyConsole, mockEnv } from "@turbo/test-utils";

describe("getComparison()", () => {
mockEnv();
Expand Down
2 changes: 1 addition & 1 deletion packages/turbo-ignore/__tests__/getTask.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getTask } from "../src/getTask";
import { spyConsole, validateLogs } from "turbo-test-utils";
import { spyConsole, validateLogs } from "@turbo/test-utils";

describe("getWorkspace()", () => {
const mockConsole = spyConsole();
Expand Down
2 changes: 1 addition & 1 deletion packages/turbo-ignore/__tests__/getWorkspace.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getWorkspace } from "../src/getWorkspace";
import { spyConsole, validateLogs } from "turbo-test-utils";
import { spyConsole, validateLogs } from "@turbo/test-utils";

describe("getWorkspace()", () => {
const mockConsole = spyConsole();
Expand Down
2 changes: 1 addition & 1 deletion packages/turbo-ignore/__tests__/ignore.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
SpyExit,
mockEnv,
validateLogs,
} from "turbo-test-utils";
} from "@turbo/test-utils";

function expectBuild(mockExit: SpyExit) {
expect(mockExit.exit).toHaveBeenCalledWith(1);
Expand Down
6 changes: 3 additions & 3 deletions packages/turbo-ignore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
"eslint": "^8.20.0",
"jest": "^27.4.3",
"ts-jest": "^27.1.1",
"tsconfig": "workspace:*",
"@turbo/tsconfig": "workspace:*",
"tsup": "^5.12.1",
"turbo-test-utils": "workspace:^0.0.0",
"turbo-utils": "workspace:*",
"@turbo/test-utils": "workspace:^0.0.0",
"@turbo/utils": "workspace:*",
"typescript": "^4.7.4"
}
}
2 changes: 1 addition & 1 deletion packages/turbo-ignore/src/ignore.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { exec } from "child_process";
import path from "path";
import { getTurboRoot } from "turbo-utils";
import { getTurboRoot } from "@turbo/utils";
import { getComparison } from "./getComparison";
import { getTask } from "./getTask";
import { getWorkspace } from "./getWorkspace";
Expand Down
2 changes: 1 addition & 1 deletion packages/turbo-ignore/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "tsconfig/library.json",
"extends": "@turbo/tsconfig/library.json",
"compilerOptions": {
"rootDir": "."
}
Expand Down
2 changes: 1 addition & 1 deletion packages/turbo-test-utils/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# `turbo-test-utils`
# `@turbo/test-utils`

Internal package of generic testing utilities shared between [turborepo/packages/](https://github.com/vercel/turbo/tree/main/packages)
4 changes: 2 additions & 2 deletions packages/turbo-test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "turbo-test-utils",
"name": "@turbo/test-utils",
"version": "0.0.0",
"private": true,
"description": "",
Expand Down Expand Up @@ -28,7 +28,7 @@
"@types/uuid": "^9.0.0",
"jest": "^27.4.3",
"ts-jest": "^27.1.1",
"tsconfig": "workspace:*",
"@turbo/tsconfig": "workspace:*",
"typescript": "^4.7.4"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/turbo-test-utils/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "tsconfig/library.json",
"extends": "@turbo/tsconfig/library.json",
"compilerOptions": {
"rootDir": "."
}
Expand Down
Loading

0 comments on commit 9535210

Please sign in to comment.