Skip to content

Commit

Permalink
Remove all-packages package, finish cleanup from old stashes
Browse files Browse the repository at this point in the history
  • Loading branch information
spautz committed Nov 26, 2024
1 parent bfecd27 commit a47344b
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 70 deletions.
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
engine-strict=true
link-workspace-packages=true
package-manager-strict=true
provenance=true
save-dev=true
save-exact=true
4 changes: 2 additions & 2 deletions demos/hello-world-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"#spautz/node-library-template": "@spautz/node-library-template"
},
"scripts": {
"____ STANDARD APP COMMANDS _________________________________________": "",
"____ STANDARD PACKAGE TASKS ________________________________________": "",
"all": "turbo run pipeline-all",
"all:ci": "turbo run pipeline-ci",
"build": "pnpm run build:clean && pnpm run build:main",
Expand All @@ -31,8 +31,8 @@
"test:clean": "rimraf ./coverage",
"test": "pnpm run test:clean && vitest run --coverage",
"test:ci": "pnpm run test:clean && vitest run --coverage --bail 1",
"test:watch": "pnpm run test:clean && vitest watch --coverage",
"test:ui": "pnpm run test:clean && vitest --ui",
"test:watch": "pnpm run test:clean && vitest watch --coverage",
"typecheck": "tsc -p ./tsconfig.json --noEmit",
"____ BUILD TASKS ___________________________________________________": "",
"build:clean": "rimraf ./dist",
Expand Down
4 changes: 2 additions & 2 deletions demos/hello-world-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"#spautz/react-library-template": "@spautz/react-library-template"
},
"scripts": {
"____ STANDARD APP COMMANDS _________________________________________": "",
"____ STANDARD PACKAGE TASKS ________________________________________": "",
"all": "turbo run pipeline-all",
"all:ci": "turbo run pipeline-ci",
"build": "pnpm run build:clean && pnpm run build:main",
Expand All @@ -33,8 +33,8 @@
"test:clean": "rimraf ./coverage",
"test": "pnpm run test:clean && vitest run --coverage",
"test:ci": "pnpm run test:clean && vitest run --coverage --bail 1",
"test:watch": "pnpm run test:clean && vitest watch --coverage",
"test:ui": "pnpm run test:clean && vitest --ui",
"test:watch": "pnpm run test:clean && vitest watch --coverage",
"typecheck": "tsc -p ./tsconfig.json --noEmit",
"____ BUILD & DEPLOY TASKS __________________________________________": "",
"build:clean": "rimraf ./dist",
Expand Down
2 changes: 1 addition & 1 deletion docs-website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"source": "./src/pages/index.tsx",
"scripts": {
"____ STANDARD APP COMMANDS _________________________________________": "",
"____ STANDARD PACKAGE TASKS ________________________________________": "",
"all": "turbo run pipeline-all",
"all:ci": "turbo run pipeline-ci",
"build": "docusaurus build",
Expand Down
46 changes: 23 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
"scripts": {
"____ HOOKS _________________________________________________________": "",
"preinstall": "npx only-allow pnpm",
"prepare": "husky && turbo run dependencies --filter=!@spautz/all-packages",
"prepare": "husky && turbo run dependencies",
"husky:precommit": "lint-staged",
"husky:prepush": "pnpm run format:verify && turbo run w:lint lint typecheck",
"____ REPO COMMANDS _________________________________________________": "",
"____ WORKSPACE OPERATIONS __________________________________________": "",
"changelog": "changeset",
"changelog:status": "changeset status --verbose",
"changelog:status:ci": "changeset status --since=origin/main --verbose",
Expand All @@ -36,33 +36,33 @@
"publish:yalc": "pnpm run -r publish:yalc",
"release:docs": "pnpm run --filter=./docs-website deploy",
"release:prep": "pnpm run changelog:status && changeset version",
"____ PACKAGE-ONLY COMMANDS _________________________________________": "",
"packages:all": "turbo run pipeline-all --filter=!//",
"packages:all:ci": "turbo run pipeline-ci --filter=!//",
"packages:build": "turbo run build --filter=!//",
"packages:lint": "turbo run lint --filter=!//",
"packages:lint:fix": "turbo run lint:fix --filter=!//",
"packages:test": "turbo run test --filter=!//",
"packages:test:watch": "turbo run test:watch --filter=!//",
"packages:typecheck": "turbo run typecheck --filter=!//",
"____ WORKSPACE-ONLY COMMANDS _______________________________________": "",
"____ WORKSPACE-PACKAGE TASKS _______________________________________": "",
"all": "pnpm run format && turbo run w:lint:fix w:test lint:fix build",
"all:ci": "pnpm run format:verify && turbo run w:lint w:test:ci",
"all:all": "pnpm run all pipeline-all",
"lint": "turbo run w:lint lint",
"lint:fix": "turbo run w:lint:fix lint:fix",
"w:lint": "eslint . --max-warnings 0",
"w:lint:fix": "eslint . --max-warnings 0 --fix",
"test": "turbo run w:test",
"test:ci": "turbo run w:test:ci",
"test:ui": "turbo run w:test:ui",
"test:watch": "turbo run w:test:watch",
"w:test:clean": "rimraf ./coverage",
"w:test": "pnpm run w:test:clean && vitest run --coverage",
"w:test:ci": "pnpm run w:test:clean && vitest run --coverage --bail 1",
"w:test:watch": "pnpm run w:test:clean && vitest watch --coverage",
"w:test:ui": "pnpm run w:test:clean && vitest --ui",
"w:typecheck": "tsc -p ./tsconfig.json --noEmit",
"____ PACKAGE + WORKSPACE COMMANDS __________________________________": "",
"all": "pnpm run format && turbo run w:lint:fix w:test lint:fix build",
"all:ci": "pnpm run format:verify && turbo run w:lint w:test:ci",
"all:all": "pnpm run all pipeline-all",
"lint": "turbo run w:lint",
"lint:fix": "turbo run w:lint:fix",
"test": "turbo run w:test",
"test:watch": "turbo run w:test:watch",
"test:ui": "turbo run w:test:ui"
"w:test:watch": "pnpm run w:test:clean && vitest watch --coverage",
"typecheck": "turbo run typecheck",
"____ STANDARD PACKAGE TASKS ________________________________________": "",
"packages:all": "turbo run pipeline-all",
"packages:all:ci": "turbo run pipeline-ci",
"packages:build": "turbo run build",
"packages:lint": "turbo run lint",
"packages:lint:fix": "turbo run lint:fix",
"packages:test": "turbo run test",
"packages:test:ci": "turbo run test:ci",
"packages:typecheck": "turbo run typecheck"
},
"devDependencies": {
"@arethetypeswrong/cli": "0.17.0",
Expand Down
13 changes: 0 additions & 13 deletions packages/all-packages/package.json

This file was deleted.

4 changes: 2 additions & 2 deletions packages/node-library-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"____ HOOKS _________________________________________________________": "",
"prepack": "pnpm run clean && pnpm run build",
"postpack": "pnpm run build:verifypack",
"____ STANDARD PACKAGE COMMANDS _____________________________________": "",
"____ STANDARD PACKAGE TASKS ________________________________________": "",
"all": "turbo run pipeline-all",
"all:ci": "turbo run pipeline-ci",
"build": "pnpm run build:clean && pnpm run build:cjs && pnpm run build:esm && pnpm run build:verify && pnpm run build:legacytypes",
Expand All @@ -64,8 +64,8 @@
"test:clean": "rimraf ./coverage",
"test": "pnpm run test:clean && vitest run --coverage",
"test:ci": "pnpm run test:clean && vitest run --coverage --bail 1",
"test:watch": "pnpm run test:clean && vitest watch --coverage",
"test:ui": "pnpm run test:clean && vitest --ui",
"test:watch": "pnpm run test:clean && vitest watch --coverage",
"typecheck": "tsc -p ./tsconfig.json --noEmit",
"____ BUILD TASKS ___________________________________________________": "",
"build:clean": "rimraf --glob ./dist ./legacy-types ./*.tgz",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-library-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"____ HOOKS _________________________________________________________": "",
"prepack": "pnpm run clean && pnpm run build",
"postpack": "pnpm run build:verifypack",
"____ STANDARD PACKAGE COMMANDS _____________________________________": "",
"____ STANDARD PACKAGE TASKS ________________________________________": "",
"all": "turbo run pipeline-all",
"all:ci": "turbo run pipeline-ci",
"build": "pnpm run build:clean && pnpm run build:cjs && pnpm run build:esm && pnpm run build:verify && pnpm run build:legacytypes",
Expand All @@ -64,8 +64,8 @@
"test:clean": "rimraf ./coverage",
"test": "pnpm run test:clean && vitest run --coverage",
"test:ci": "pnpm run test:clean && vitest run --coverage --bail 1",
"test:watch": "pnpm run test:clean && vitest watch --coverage",
"test:ui": "pnpm run test:clean && vitest --ui",
"test:watch": "pnpm run test:clean && vitest watch --coverage",
"typecheck": "tsc -p ./tsconfig.json --noEmit",
"____ BUILD STEPS ___________________________________________________": "",
"build:clean": "rimraf --glob ./dist ./legacy-types ./*.tgz",
Expand Down
18 changes: 0 additions & 18 deletions pnpm-lock.yaml

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

9 changes: 2 additions & 7 deletions turbo.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"$schema": "https://turbo.build/schema.json",
// OPTIONAL: "ui": "tui",

"tasks": {
// Batch scripts: run a set of checks for the package
"pipeline-all": {
Expand All @@ -8,31 +10,25 @@
"pipeline-ci": {
"dependsOn": ["typecheck", "lint", "test:ci", "build"]
},

// Workspace tasks
// When the packages have their own overlapping tasks, those task are run first, as dependencies,
// so that future changes at the package level will invalidate at the workspace level
"//#w:lint": {},
"//#w:lint:fix": {},
"//#w:test": {
"dependsOn": ["@spautz/all-packages#test"],
"outputs": ["coverage/**"]
},
"//#w:test:ci": {
"dependsOn": ["@spautz/all-packages#test:ci"],
"outputs": ["coverage/**"]
},
"//#w:test:watch": {
"dependsOn": ["@spautz/all-packages#dependencies"],
"cache": false,
"persistent": true
},
"//#w:test:ui": {
"dependsOn": ["@spautz/all-packages#dependencies"],
"cache": false,
"persistent": true
},

// Core package tasks:
// Dependencies require a concrete build
"dependencies": {
Expand All @@ -42,7 +38,6 @@
"topo": {
"dependsOn": ["^topo"]
},

// Individual/standalone package tasks
"build": {
"dependsOn": ["^build"],
Expand Down

0 comments on commit a47344b

Please sign in to comment.