Skip to content

Commit ff21117

Browse files
authoredDec 23, 2024
chore(cli-integ): remove in-source compilation of 'bin' directory (#32642)
The CLI integ test package relies on the `bin` directory being compiled in-source. In new projen-managed setups, this is not common anymore. Move the actual CLI sources into the `lib/cli` directory and launch them from there. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 5aec766 commit ff21117

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed
 
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env node
2-
require('./query-github.js');
2+
require('../lib/cli/query-github.js');
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env node
2-
require('./run-suite.js');
2+
require('../lib/cli/run-suite.js');
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env node
2-
require('./stage-distribution.js');
2+
require('../lib/cli/stage-distribution.js');
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env node
2-
require('./test-root.js');
2+
require('../lib/cli/test-root.js');

‎packages/@aws-cdk-testing/cli-integ/bin/query-github.ts ‎packages/@aws-cdk-testing/cli-integ/lib/cli/query-github.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as yargs from 'yargs';
2-
import { fetchPreviousVersion } from '../lib/github';
2+
import { fetchPreviousVersion } from '../github';
33

44
async function main() {
55
const args = await yargs

‎packages/@aws-cdk-testing/cli-integ/bin/run-suite.ts ‎packages/@aws-cdk-testing/cli-integ/lib/cli/run-suite.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
import * as path from 'path';
33
import * as jest from 'jest';
44
import * as yargs from 'yargs';
5-
import { ReleasePackageSourceSetup } from '../lib/package-sources/release-source';
6-
import { RepoPackageSourceSetup, autoFindRoot } from '../lib/package-sources/repo-source';
7-
import { IPackageSourceSetup } from '../lib/package-sources/source';
8-
import { serializeForSubprocess } from '../lib/package-sources/subprocess';
5+
import { ReleasePackageSourceSetup } from '../package-sources/release-source';
6+
import { RepoPackageSourceSetup, autoFindRoot } from '../package-sources/repo-source';
7+
import { IPackageSourceSetup } from '../package-sources/source';
8+
import { serializeForSubprocess } from '../package-sources/subprocess';
99

1010
async function main() {
1111
const args = await yargs
@@ -126,7 +126,7 @@ async function main() {
126126
...args.verbose ? ['--verbose'] : [],
127127
...passWithNoTests ? ['--passWithNoTests'] : [],
128128
...args['test-file'] ? [args['test-file']] : [],
129-
], path.resolve(__dirname, '..', 'resources', 'integ.jest.config.js'));
129+
], path.resolve(__dirname, '..', '..', 'resources', 'integ.jest.config.js'));
130130

131131
} finally {
132132
await packageSource.cleanup();

‎packages/@aws-cdk-testing/cli-integ/bin/stage-distribution.ts ‎packages/@aws-cdk-testing/cli-integ/lib/cli/stage-distribution.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import * as path from 'path';
33
import * as fs from 'fs-extra';
44
import * as glob from 'glob';
55
import * as yargs from 'yargs';
6-
import { shell } from '../lib';
7-
import { TestRepository } from '../lib/staging/codeartifact';
8-
import { uploadJavaPackages, mavenLogin } from '../lib/staging/maven';
9-
import { uploadNpmPackages, npmLogin } from '../lib/staging/npm';
10-
import { uploadDotnetPackages, nugetLogin } from '../lib/staging/nuget';
11-
import { uploadPythonPackages, pypiLogin } from '../lib/staging/pypi';
12-
import { UsageDir } from '../lib/staging/usage-dir';
6+
import { shell } from '..';
7+
import { TestRepository } from '../staging/codeartifact';
8+
import { uploadJavaPackages, mavenLogin } from '../staging/maven';
9+
import { uploadNpmPackages, npmLogin } from '../staging/npm';
10+
import { uploadDotnetPackages, nugetLogin } from '../staging/nuget';
11+
import { uploadPythonPackages, pypiLogin } from '../staging/pypi';
12+
import { UsageDir } from '../staging/usage-dir';
1313

1414
async function main() {
1515
await yargs
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import * as path from 'path';
22
// eslint-disable-next-line no-console
3-
console.log(path.resolve(__dirname, '..'));
3+
console.log(path.resolve(__dirname, '..', '..'));

0 commit comments

Comments
 (0)