Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/large-pr-checker.yml

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

2 changes: 1 addition & 1 deletion .projen/deps.json

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

23 changes: 12 additions & 11 deletions .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ const repoProject = new yarn.Monorepo({
typescriptVersion: TYPESCRIPT_VERSION,
devDeps: [
'cdklabs-projen-project-types',
'glob',
'fast-glob',
'semver',
'@aws-sdk/client-s3',
'@aws-sdk/credential-providers',
Expand Down Expand Up @@ -668,7 +668,7 @@ const cdkAssetsLib = configureProject(
cxApi,
cloudAssemblyApi.customizeReference({ versionType: 'exact' }),
'archiver',
'glob',
'fast-glob',
'mime@^2',
sdkDepForLib('@aws-sdk/client-ecr'),
sdkDepForLib('@aws-sdk/client-s3'),
Expand All @@ -678,11 +678,12 @@ const cdkAssetsLib = configureProject(
sdkDepForLib('@aws-sdk/lib-storage'),
smithyDepForLib('@smithy/config-resolver'),
smithyDepForLib('@smithy/node-config-provider'),
'minimatch@10.0.1',
'picomatch',
],
devDeps: [
'@types/archiver',
'@types/mime@^2',
'@types/picomatch',
'fs-extra',
'graceful-fs',
'jszip',
Expand Down Expand Up @@ -884,12 +885,11 @@ const toolkitLib = configureProject(
'chokidar@^4',
'fast-deep-equal',
'fs-extra@^9',
'glob',
'minimatch@10.0.1',
'picomatch',
'p-limit@^3',
'picomatch@^4',
'semver',
'split2',
'fast-glob',
'uuid',
'wrap-ansi@^7', // Last non-ESM version
'yaml@^1',
Expand All @@ -902,7 +902,7 @@ const toolkitLib = configureProject(
'@microsoft/api-extractor',
'@smithy/util-stream',
'@types/fs-extra',
'@types/picomatch@^4',
'@types/picomatch',
'@types/split2',
'aws-cdk-lib',
'aws-sdk-client-mock',
Expand Down Expand Up @@ -1150,6 +1150,7 @@ const cli = configureProject(
'@types/archiver',
'@types/fs-extra@^9',
'@types/mockery',
'@types/picomatch',
'@types/promptly',
'@types/semver',
'@types/sinon',
Expand Down Expand Up @@ -1211,8 +1212,8 @@ const cli = configureProject(
'decamelize@^5', // Non-ESM
'enquirer',
'fs-extra@^9',
'glob',
'minimatch@10.0.1',
'fast-glob',
'picomatch',
'p-limit@^3',
'p-queue@^6',
'promptly',
Expand Down Expand Up @@ -1561,7 +1562,7 @@ const cliInteg = configureProject(
'axios@^1',
'chalk@^4',
'fs-extra@^9',
'glob@^9',
'fast-glob',
'make-runnable@^1',
'mockttp@^3',
'npm@^11',
Expand Down Expand Up @@ -1728,7 +1729,7 @@ new IssueLabeler(repo);
new PrLabeler(repo);

new LargePrChecker(repo, {
excludeFiles: ['*.md', '*.test.ts', '*.yml', '*.lock'],
excludeFiles: ['*.md', '*.test.ts', '*.yml', '*.lock', 'THIRD_PARTY_LICENSES'],
});

// Set allowed scopes based on monorepo packages
Expand Down
2 changes: 1 addition & 1 deletion package.json

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

5 changes: 2 additions & 3 deletions packages/@aws-cdk-testing/cli-integ/.projen/deps.json

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

2 changes: 1 addition & 1 deletion packages/@aws-cdk-testing/cli-integ/.projen/tasks.json

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

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable no-console */
import * as path from 'path';
import { globSync } from 'fast-glob';
import * as fs from 'fs-extra';
import * as glob from 'glob';
import * as yargs from 'yargs';
import { shell } from '..';
import { TestRepository } from '../staging/codeartifact';
Expand Down Expand Up @@ -205,22 +205,22 @@ async function publish(repo: TestRepository, usageDir: UsageDir, args: {

await doRepo.npm(async () => {
header('NPM');
await uploadNpmPackages(glob.sync(path.join(directory, 'js', '*.tgz')), login, usageDir);
await uploadNpmPackages(globSync(path.join(directory, 'js', '*.tgz')), login, usageDir);
});

await doRepo.python(async () => {
header('Python');
await uploadPythonPackages(glob.sync(path.join(directory, 'python', '*')), login);
await uploadPythonPackages(globSync(path.join(directory, 'python', '*')), login);
});

await doRepo.java(async () => {
header('Java');
await uploadJavaPackages(glob.sync(path.join(directory, 'java', '**', '*.pom')), login, usageDir);
await uploadJavaPackages(globSync(path.join(directory, 'java', '**', '*.pom')), login, usageDir);
});

await doRepo.dotnet(async () => {
header('.NET');
await uploadDotnetPackages(glob.sync(path.join(directory, 'dotnet', '**', '*.nupkg')), usageDir);
await uploadDotnetPackages(globSync(path.join(directory, 'dotnet', '**', '*.nupkg')), usageDir);
});

if (args.regression) {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk-testing/cli-integ/package.json

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

9 changes: 6 additions & 3 deletions packages/@aws-cdk/cdk-assets-lib/.projen/deps.json

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

2 changes: 1 addition & 1 deletion packages/@aws-cdk/cdk-assets-lib/.projen/tasks.json

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

15 changes: 8 additions & 7 deletions packages/@aws-cdk/cdk-assets-lib/lib/private/archive.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { createWriteStream, promises as fs } from 'fs';
import * as path from 'path';
import * as glob from 'glob';
import type { Options } from 'fast-glob';
import { globSync } from 'fast-glob';

// namespace object imports won't work in the bundle for function exports
// eslint-disable-next-line @typescript-eslint/no-require-imports
Expand All @@ -23,15 +24,15 @@ export async function zipDirectory(
function writeZipFile(directory: string, outputFile: string): Promise<void> {
return new Promise(async (ok, fail) => {
// The below options are needed to support following symlinks when building zip files:
// - nodir: This will prevent symlinks themselves from being copied into the zip.
// - follow: This will follow symlinks and copy the files within.
const globOptions = {
// - onlyFiles: This will prevent symlinks themselves from being copied into the zip.
// - followSymbolicLinks: This will follow symlinks and copy the files within.
const globOptions: Options = {
dot: true,
nodir: true,
follow: true,
onlyFiles: true,
followSymbolicLinks: true,
cwd: directory,
};
const files = glob.sync('**', globOptions); // The output here is already sorted
const files = globSync('**', globOptions); // The output here is already sorted

const output = createWriteStream(outputFile);

Expand Down
5 changes: 3 additions & 2 deletions packages/@aws-cdk/cdk-assets-lib/package.json

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

Loading
Loading