mk: adapt scripts for /pkg rename

yoursunny · Feb 3, 2024 · 31d9d20 · 31d9d20
1 parent 3e97c0e
commit 31d9d20
Show file tree

Hide file tree

Showing 48 changed files with 63 additions and 63 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,15 +1,15 @@
-*.tsbuildinfo
 .env
 .netlify
-/*.out
+*.tsbuildinfo
 /.vscode/
+/*.out
 /coverage/
 /docs/typedoc/
 /npm-debug.log
-/packages/*/README.md.ts
-/packages/*/lib/
-/packages/*/test-fixture/tsconfig.json
-/packages/*/tsconfig.json
+/pkg/*/lib/
+/pkg/*/README.md.ts
+/pkg/*/test-fixture/tsconfig.json
+/pkg/*/tsconfig.json
 /pnpm-debug.log
 /pnpm-lock.yaml
 node_modules/
diff --git a/integ/ndncert-interop/client-pin.sh b/integ/ndncert-interop/client-pin.sh
@@ -8,7 +8,7 @@ msg() {
   echo -e "\e[0m"
 }
 
-KCCLI="bash $(pwd)/packages/keychain-cli/ndnts-keychain.sh"
+KCCLI="bash $(pwd)/pkg/keychain-cli/ndnts-keychain.sh"
 
 DIR=/tmp/$(openssl rand -hex 8)
 [[ -d $DIR ]] && rm -rf $DIR

diff --git a/mk/bootstrap.sh b/mk/bootstrap.sh
@@ -3,7 +3,7 @@ set -euo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")"/..
 ROOTDIR=$(pwd)
 
-corepack pnpm -r --filter='./packages/**' exec -- bash -c "node ${ROOTDIR}/mk/make-pkg-tsconfig.mjs"
+corepack pnpm -r --filter='./pkg/**' exec -- bash -c "node ${ROOTDIR}/mk/make-pkg-tsconfig.mjs"
 node mk/make-solution-tsconfig.mjs
 
 (

diff --git a/mk/build.sh b/mk/build.sh
@@ -58,7 +58,7 @@ if [[ $ACT == cover ]]; then
 fi
 
 if [[ $ACT == clean ]]; then
-  exec rm -rf packages/*/lib/ packages/*/tsconfig.tsbuildinfo
+  exec rm -rf pkg/*/lib/ pkg/*/tsconfig.tsbuildinfo
 fi
 
 TSCFLAG=

diff --git a/mk/check-dep.mjs b/mk/check-dep.mjs
@@ -31,7 +31,7 @@ if (!satisfies(doc.lockfileVersion, "^6.0.0")) {
 
 let nWarnings = 0;
 for (const [folder, { dependencies = {}, devDependencies = {} }] of Object.entries(doc.importers)) {
-  if (!folder.startsWith("packages/")) {
+  if (!folder.startsWith("pkg/")) {
     continue;
   }
   const unusedP = new Set(Object.keys(dependencies).filter((dep) => !ignoredUnused.has(dep)));

diff --git a/mk/literate.sh b/mk/literate.sh
@@ -20,10 +20,10 @@ literate_run() {
 if [[ ${1:-} == lint ]]; then
   trap "sed -i '/README.md.ts/ s/^#*\s*//' .gitignore" EXIT
   sed -i '/README.md.ts/ s/^/# /' .gitignore
-  for F in $(grep -l '```ts' packages/*/README.md); do
+  for F in $(grep -l '```ts' pkg/*/README.md); do
     codedown ts <$F >$F.ts
   done
-  xo-yoursunny packages/*/README.md.ts
+  xo-yoursunny pkg/*/README.md.ts
   exit
 fi
 
@@ -32,6 +32,6 @@ if [[ -n ${1:-} ]]; then
   exit
 fi
 
-for F in $(grep -l '```ts' packages/*/README.md); do
+for F in $(grep -l '```ts' pkg/*/README.md); do
   literate_run $(dirname $F)
 done
diff --git a/mk/make-pkg-tsconfig.mjs b/mk/make-pkg-tsconfig.mjs
@@ -29,7 +29,7 @@ const pkg = JSON.parse(await fs.readFile("package.json"));
 for (const [dep, specifier] of Object.entries(pkg.dependencies)) {
   if (specifier.startsWith("workspace:")) {
     tsconfig.references.push({
-      path: path.relative(process.cwd(), path.resolve(rootdir, "packages", path.basename(dep)))
+      path: path.relative(process.cwd(), path.resolve(rootdir, "pkg", path.basename(dep)))
         .split(path.sep).join(path.posix.sep),
     });
   }

diff --git a/mk/make-solution-tsconfig.mjs b/mk/make-solution-tsconfig.mjs
@@ -7,12 +7,12 @@ const tsconfig = {
   references: [],
 };
 
-const dir = await fs.readdir("packages", { withFileTypes: true });
+const dir = await fs.readdir("pkg", { withFileTypes: true });
 for (const direct of dir) {
   if (!direct.isDirectory()) {
     continue;
   }
-  tsconfig.references.push({ path: `../packages/${direct.name}` });
+  tsconfig.references.push({ path: `../pkg/${direct.name}` });
 }
 
 await fs.writeFile("mk/tsconfig-solution.json", JSON.stringify(tsconfig, undefined, 2));
diff --git a/mk/publish-nightly.sh b/mk/publish-nightly.sh
@@ -9,7 +9,7 @@ mkdir -p mk/nightly-output/
 
 git add .
 VERSION=$(git show -s --format='%ct %H' | gawk '{ printf "0.0.%s-nightly-%s", strftime("%Y%m%d", $1, 1), substr($2, 1, 7) }')
-corepack pnpm m --filter='./packages/**' --workspace-concurrency=1 exec \
+corepack pnpm m --filter='./pkg/**' --workspace-concurrency=1 exec \
   bash -c 'node '$ROOTDIR'/mk/edit-packagejson.mjs VCDN '$VERSION' &&
            mv $(corepack pnpm pack .) '$ROOTDIR'/mk/nightly-output/$(basename $(pwd)).tgz'
 git checkout -- .

diff --git a/mk/publish-release.sh b/mk/publish-release.sh
@@ -18,7 +18,7 @@ if [[ ${NDNTS_SKIP_BUILD:-0} -ne 1 ]]; then
   corepack pnpm test
 fi
 
-RECURSE='corepack pnpm m --filter='./packages/**' --workspace-concurrency=1 exec'
+RECURSE='corepack pnpm m --filter='./pkg/**' --workspace-concurrency=1 exec'
 $RECURSE bash -c 'node '$ROOTDIR'/mk/edit-packagejson.mjs V '$VERSION
 git commit -a -m 'v'$VERSION
 

diff --git a/mk/tsconfig-literate.json b/mk/tsconfig-literate.json
@@ -3,8 +3,8 @@
   "compilerOptions": {
     "baseUrl": "..",
     "paths": {
-      "@ndn/*": ["./packages/*/lib/mod_node.js"],
-      "ndn": ["./packages/ndn/lib/mod_node.js"]
+      "@ndn/*": ["./pkg/*/lib/mod_node.js"],
+      "ndn": ["./pkg/ndn/lib/mod_node.js"]
     }
   }
 }
diff --git a/mk/tsconfig-typedoc.json b/mk/tsconfig-typedoc.json
@@ -1,15 +1,15 @@
 {
   "extends": "./tsconfig-base.json",
   "compilerOptions": {
-    "rootDir": "../packages",
+    "rootDir": "../pkg",
     "baseUrl": "..",
     "paths": {
-      "@ndn/*": ["./packages/*"],
-      "ndn": ["./packages/ndn"]
+      "@ndn/*": ["./pkg/*"],
+      "ndn": ["./pkg/ndn"]
     }
   },
   "include": [
-    "../packages/*/src/**/*"
+    "../pkg/*/src/**/*"
   ],
   "typedocOptions": {
     "entryPointStrategy": "packages",

diff --git a/mk/typedoc.sh b/mk/typedoc.sh
@@ -7,7 +7,7 @@ if [[ -n ${GTAGID:-} ]]; then
   GTAG="--gaID $GTAGID"
 fi
 
-ENTRYPOINTS='packages/*'
+ENTRYPOINTS='pkg/*'
 if [[ $# -gt 0 ]]; then
   ENTRYPOINTS=''
 fi

diff --git a/pkg/autoconfig/package.json b/pkg/autoconfig/package.json
@@ -19,7 +19,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/autoconfig"
+    "directory": "pkg/autoconfig"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/cat/package.json b/pkg/cat/package.json
@@ -20,7 +20,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/cat"
+    "directory": "pkg/cat"
   },
   "dependencies": {
     "@ndn/cli-common": "workspace:*",

diff --git a/pkg/cli-common/package.json b/pkg/cli-common/package.json
@@ -17,7 +17,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/cli-common"
+    "directory": "pkg/cli-common"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/dpdkmgmt/package.json b/pkg/dpdkmgmt/package.json
@@ -17,7 +17,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/dpdkmgmt"
+    "directory": "pkg/dpdkmgmt"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/endpoint/package.json b/pkg/endpoint/package.json
@@ -19,7 +19,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/endpoint"
+    "directory": "pkg/endpoint"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/fileserver/package.json b/pkg/fileserver/package.json
@@ -19,7 +19,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/fileserver"
+    "directory": "pkg/fileserver"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/fw/package.json b/pkg/fw/package.json
@@ -19,7 +19,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/fw"
+    "directory": "pkg/fw"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/keychain-cli/package.json b/pkg/keychain-cli/package.json
@@ -20,7 +20,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/keychain-cli"
+    "directory": "pkg/keychain-cli"
   },
   "dependencies": {
     "@ndn/cli-common": "workspace:*",

diff --git a/pkg/keychain/package.json b/pkg/keychain/package.json
@@ -21,7 +21,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/keychain"
+    "directory": "pkg/keychain"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/l3face/package.json b/pkg/l3face/package.json
@@ -19,7 +19,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/l3face"
+    "directory": "pkg/l3face"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/lp/package.json b/pkg/lp/package.json
@@ -19,7 +19,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/lp"
+    "directory": "pkg/lp"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/nac/package.json b/pkg/nac/package.json
@@ -19,7 +19,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/nac"
+    "directory": "pkg/nac"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/naming-convention1/package.json b/pkg/naming-convention1/package.json
@@ -19,7 +19,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/naming-convention1"
+    "directory": "pkg/naming-convention1"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/naming-convention2/package.json b/pkg/naming-convention2/package.json
@@ -19,7 +19,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/naming-convention2"
+    "directory": "pkg/naming-convention2"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/ndn/package.json b/pkg/ndn/package.json
@@ -19,7 +19,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/ndn"
+    "directory": "pkg/ndn"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/ndncert/package.json b/pkg/ndncert/package.json
@@ -19,7 +19,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/ndncert"
+    "directory": "pkg/ndncert"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/ndnsec/package.json b/pkg/ndnsec/package.json
@@ -18,7 +18,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/ndnsec"
+    "directory": "pkg/ndnsec"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/nfdmgmt/package.json b/pkg/nfdmgmt/package.json
@@ -19,7 +19,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/nfdmgmt"
+    "directory": "pkg/nfdmgmt"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/node-transport/package.json b/pkg/node-transport/package.json
@@ -17,7 +17,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/node-transport"
+    "directory": "pkg/node-transport"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/packet/package.json b/pkg/packet/package.json
@@ -19,7 +19,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/packet"
+    "directory": "pkg/packet"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/quic-transport/package.json b/pkg/quic-transport/package.json
@@ -19,7 +19,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/quic-transport"
+    "directory": "pkg/quic-transport"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/rdr/package.json b/pkg/rdr/package.json
@@ -19,7 +19,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/rdr"
+    "directory": "pkg/rdr"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/repo-api/package.json b/pkg/repo-api/package.json
@@ -19,7 +19,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/repo-api"
+    "directory": "pkg/repo-api"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/repo-cli/package.json b/pkg/repo-cli/package.json
@@ -20,7 +20,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/repo-cli"
+    "directory": "pkg/repo-cli"
   },
   "dependencies": {
     "@ndn/cli-common": "workspace:*",

diff --git a/pkg/repo-external/package.json b/pkg/repo-external/package.json
@@ -19,7 +19,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/repo-external"
+    "directory": "pkg/repo-external"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",

diff --git a/pkg/repo/package.json b/pkg/repo/package.json
@@ -19,7 +19,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/yoursunny/NDNts.git",
-    "directory": "packages/repo"
+    "directory": "pkg/repo"
   },
   "publishConfig": {
     "main": "lib/mod_node.js",