Fix copy files task path (#39)

* Fix copy files task path * Update changelogs * Fix prep-release command * Update pr-checks.yml
wpsocio · Jan 23, 2024 · be77063 · be77063
1 parent 4cbc859
commit be77063
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 29 deletions.
diff --git a/.changeset/cool-pets-trade.md b/.changeset/cool-pets-trade.md
@@ -0,0 +1,5 @@
+---
+"wptelegram-login": patch
+---
+
+Fixed the error when there is no user data to update.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -46,6 +46,10 @@ jobs:
           SVN_USERNAME: ${{ secrets.SVN_USERNAME || 'test' }}
           SVN_PASSWORD: ${{ secrets.SVN_PASSWORD || 'test' }}
 
+      - name: Copy README.md to dist
+        run: |
+          cp ${{ fromJson(needs.details.outputs.result).relativeDir }}/README.md dist/${{ fromJson(needs.details.outputs.result).relativeDir }}/README.md
+
       - name: Deploy to repo
         uses: manzoorwanijk/action-deploy-to-repo@v3
         with:

diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -7,6 +7,7 @@ on:
 jobs:
   php-lint-test:
     name: "PHP: Lint, Test"
+    if: github.repository == 'wpsocio/wp-plugins-dev'
     timeout-minutes: 15
     runs-on: ubuntu-latest
     strategy:
@@ -43,6 +44,7 @@ jobs:
 
   js-lint-build:
     name: "JS: Lint, Build and Test"
+    if: github.repository == 'wpsocio/wp-plugins-dev'
     timeout-minutes: 15
     runs-on: ubuntu-latest
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
         id: changesets
         with:
           publish: pnpm release
-          version: pnpm prep-version
+          version: pnpm prep-release
           title: Prepare for next release
           commit: Prepare for next release
         env:

diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
 		"lint:js": "wireit",
 		"lint:js:fix": "biome format ./ --write",
 		"lint:php": "wireit",
-		"prep-version": "changeset status --output=changeset-status.json && changeset version && wpdev bundle  --from-release=changeset-status.json",
+		"prep-release": "changeset status --output=changeset-status.json && changeset version && wpdev bundle --from-changeset --changeset-json=changeset-status.json",
 		"release": "changeset publish",
 		"setup:php": "wireit",
 		"test:php": "wireit",

diff --git a/plugins/wptelegram-comments/CHANGELOG.md b/plugins/wptelegram-comments/CHANGELOG.md
@@ -1,10 +1,6 @@
 # Changelog
 
-All notable changes to this project are documented in this file.
-
-## Unreleased
-
-## [1.1.9 - 2023-12-7](https://github.com/wpsocio/wptelegram-comments/releases/tag/v1.1.9)
+## 1.1.9
 
 - Maintenance release
 

diff --git a/plugins/wptelegram-login/CHANGELOG.md b/plugins/wptelegram-login/CHANGELOG.md
@@ -1,14 +1,6 @@
 # Changelog
 
-All notable changes to this project are documented in this file.
-
-## Unreleased
-
-### Bug fixes
-
-- Fixed the error when there is no user data to update.
-
-## [1.10.7 - 2023-10-9](https://github.com/wpsocio/wptelegram-login/releases/tag/v1.10.7)
+## 1.10.7
 
 ### Bug fixes
 

diff --git a/plugins/wptelegram-widget/CHANGELOG.md b/plugins/wptelegram-widget/CHANGELOG.md
@@ -1,10 +1,6 @@
 # Changelog
 
-All notable changes to this project are documented in this file.
-
-## Unreleased
-
-## [2.1.11 - 2023-12-7](https://github.com/wpsocio/wptelegram-widget/releases/tag/v2.1.11)
+## 2.1.11
 
 - Maintenance release
 

diff --git a/tools/wpdev/src/commands/bundle.ts b/tools/wpdev/src/commands/bundle.ts
@@ -212,15 +212,16 @@ export default class Bundle extends WithProjects<typeof Bundle> {
 						}
 
 						const {
-							relativeSource,
+							stripFromPath,
 							files,
 							ignore = getDistIgnorePattern(project.dir),
 						} = bundle.tasks.copyFilesBefore;
 
 						return await copyFiles(
-							path.join(project.dir, relativeSource),
+							project.dir,
 							{ files, ignore },
 							outDir,
+							stripFromPath,
 						);
 					},
 				},
@@ -369,15 +370,16 @@ export default class Bundle extends WithProjects<typeof Bundle> {
 						}
 
 						const {
-							relativeSource,
+							stripFromPath,
 							files,
 							ignore = getDistIgnorePattern(project.dir),
 						} = bundle.tasks.copyFilesAfter;
 
 						return await copyFiles(
-							path.join(project.dir, relativeSource),
+							project.dir,
 							{ files, ignore },
 							outDir,
+							stripFromPath,
 						);
 					},
 				},

diff --git a/tools/wpdev/src/utils/misc.ts b/tools/wpdev/src/utils/misc.ts
@@ -19,12 +19,13 @@ export async function copyFiles(
 	cwd: string,
 	targetFiles: TaskTarget,
 	destDir: string,
+	stripFromPath: string,
 ) {
 	const entries = globFiles(targetFiles, { cwd });
 
 	for (const file of entries) {
 		const filePath = path.join(cwd, file);
-		const destPath = path.join(destDir, file);
+		const destPath = path.join(destDir, file.replace(stripFromPath, ''));
 
 		if (!fs.existsSync(path.dirname(destPath))) {
 			fs.mkdirSync(path.dirname(destPath), { recursive: true });

diff --git a/tools/wpdev/src/utils/schema.ts b/tools/wpdev/src/utils/schema.ts
@@ -11,14 +11,16 @@ const targetFilesSchema = z.object({
 });
 
 const copyFilesData = z.object({
-	relativeSource: z
+	stripFromPath: z
 		.string()
 		.optional()
 		.default('src')
-		.describe('The directory relative to which the source files are.'),
+		.describe(
+			'The string/path to strip from the source file paths before copying them.',
+		),
 	files: targetFilesSchema.shape.files
 		.optional()
-		.default(['**/*', '../CHANGELOG.md', '../README.md']),
+		.default(['src/**/*', 'CHANGELOG.md']),
 	ignore: targetFilesSchema.shape.ignore,
 });