Skip to content

Commit 49786db

Browse files
committed
rename
1 parent ab0ef14 commit 49786db

56 files changed

Lines changed: 23 additions & 16 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
packages:
2-
- "create-devcontainer/**"
2+
- "setup/**"
33
- "!**/dist/"

.devcontainer/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
COMPOSE_PROJECT_NAME=create-devcontainer
1+
COMPOSE_PROJECT_NAME=setup
22
WORKSPACES=/workspaces
33
XDG_CONFIG_HOME=/home/dev/.config
44
XDG_CACHE_HOME=/home/dev/.cache

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// spell-checker:ignore esbenp azuretools dbaeumer
22
{
3-
"name": "create-devcontainer",
3+
"name": "setup",
44
"dockerComposeFile": "docker-compose.yml",
55
"service": "devcontainer",
66
"remoteUser": "dev",
77
"overrideCommand": true,
8-
"workspaceFolder": "/workspaces/create-devcontainer",
8+
"workspaceFolder": "/workspaces/setup",
99
"features": {
1010
"ghcr.io/devcontainer-config/features/user-init:2": {},
1111
"ghcr.io/devcontainer-config/features/dot-config:2": {},

scripts/installPackage.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import path from "node:path";
44

55
import { $ } from "execa";
66

7-
import pkg from "@/create-devcontainer/package.json";
8-
import { projectRoot } from "@/scripts/project.js";
7+
import { packagePrefix, projectRoot } from "@/scripts/project.js";
98
import { build } from "@/scripts/tasks/build.js";
9+
import pkg from "@/setup/package.json";
1010

1111
const XDG_DATA_HOME = process.env.XDG_DATA_HOME;
1212
if (!XDG_DATA_HOME) {
@@ -16,7 +16,8 @@ if (!XDG_DATA_HOME) {
1616
await build();
1717

1818
// Copy the dist folder to a temporary location
19-
const tempPath = `/tmp/${pkg.name}`;
19+
const packageName = `${packagePrefix}${pkg.name}`;
20+
const tempPath = `/tmp/${packageName}`;
2021
await rm(tempPath, { recursive: true, force: true });
2122
await mkdir(tempPath, { recursive: true });
2223
await cp(path.resolve(projectRoot, pkg.name, "dist"), tempPath, { recursive: true });
@@ -27,7 +28,7 @@ process.env.NODE_ENV = "production";
2728
const installPath = path.resolve(XDG_DATA_HOME, pkg.name);
2829
await rm(installPath, { recursive: true, force: true });
2930
const $$ = $({ stdio: "inherit", verbose: "full", cwd: tempPath });
30-
await $$`pnpm deploy --filter=${pkg.name} --prod ${installPath}`;
31-
await $$`npm uninstall --global ${pkg.name}`;
31+
await $$`pnpm deploy --filter=${packageName} --prod ${installPath}`;
32+
await $$`npm uninstall --global ${packageName}`;
3233
await $$`npm install --global ${installPath}`;
3334
await $$`rm --recursive ${tempPath}`;

scripts/project.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ import path from "node:path";
33
export const projectRoot = path.resolve(import.meta.dirname, "..");
44

55
export const workspaces = path.resolve(projectRoot, "..");
6+
7+
export const packagePrefix = "@devcontainer-config/";

scripts/publish.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import path from "node:path";
22

33
import { projectRoot } from "@/scripts/project.js";
44
import { $$ } from "@/scripts/shell.js";
5+
import pkg from "@/setup/package.json";
56

67
await $$`npm set //registry.npmjs.org/:_authToken=\${NPM_TOKEN}`;
7-
await $$`npm publish ${path.resolve(projectRoot, "create-devcontainer/dist")}`;
8+
await $$`npm publish --access public ${path.resolve(projectRoot, `${pkg.name}/dist`)}`;

scripts/tasks/build.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import semver from "semver";
99
import type { PackageJson } from "type-fest";
1010

1111
import prettierOptions from "@/.config/prettier/.prettierrc.json";
12-
import pkg from "@/create-devcontainer/package.json";
1312
import { license } from "@/package.json";
14-
import { projectRoot } from "@/scripts/project.js";
13+
import { packagePrefix, projectRoot } from "@/scripts/project.js";
1514
import { $$ } from "@/scripts/shell.js";
15+
import pkg from "@/setup/package.json";
1616

1717
const dist = path.resolve(projectRoot, pkg.name, "dist");
1818

@@ -29,10 +29,11 @@ const writePackageJson = async () => {
2929
const tags = await git.listTags({ fs, dir: projectRoot });
3030
const url = (await git.listRemotes({ fs, dir: projectRoot })).at(0)?.url;
3131
const pkgJson: PackageJson = Object.assign({}, pkg as PackageJson, {
32+
name: `${packagePrefix}${pkg.name}`,
3233
version: semver.rsort(tags).at(0) ?? pkg.version,
33-
repository: url && { type: "git", url },
34+
...(url && { repository: { type: "git", url } }),
3435
license,
35-
});
36+
} satisfies PackageJson);
3637
const filepath = path.resolve(dist, "package.json");
3738
const packageJson = await prettier.format(JSON.stringify(pkgJson), { ...prettierOptions, filepath });
3839
await writeFile(filepath, packageJson);
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)