@mrgrain/cdk-esbuild 3.5.0 → 3.7.2

package/.projenrc.ts

@@ -2,10 +2,11 @@ import {
   awscdk,
   javascript,
   JsonFile,
-  release,
   vscode,
 } from 'projen';
+import { ReleaseTrigger } from 'projen/lib/release';
 import { SourceFile } from 'ts-morph';
+import { tagOnNpm } from './projenrc/release';
 import { TypeScriptSourceFile } from './projenrc/TypeScriptSourceFile';
 
 const project = new awscdk.AwsCdkConstructLibrary({
@@ -19,7 +20,7 @@ const project = new awscdk.AwsCdkConstructLibrary({
 
   // Project info
   name: '@mrgrain/cdk-esbuild',
-  repositoryUrl: 'git@github.com:mrgrain/cdk-esbuild.git',
+  repositoryUrl: 'https://github.com/mrgrain/cdk-esbuild',
   description:
     'CDK constructs for esbuild, an extremely fast JavaScript bundler',
   homepage: 'https://github.com/mrgrain/cdk-esbuild',
@@ -55,17 +56,15 @@ const project = new awscdk.AwsCdkConstructLibrary({
       coveragePathIgnorePatterns: ['/node_modules/', '/examples/'],
     },
   },
-  eslintOptions: {
-    lintProjenRc: false,
-    dirs: ['src', 'projenrc', '.projenrc.ts'],
-  },
 
   // Release
   packageManager: javascript.NodePackageManager.NPM,
   npmDistTag: 'latest',
   defaultReleaseBranch: 'main',
   majorVersion: 3,
-  releaseTrigger: release.ReleaseTrigger.manual(),
+  releaseTrigger: {
+    isContinuous: false,
+  } as ReleaseTrigger,
   catalog: {
     twitter: '@mrgrain',
   },
@@ -93,7 +92,6 @@ const project = new awscdk.AwsCdkConstructLibrary({
     'cdk.out',
     '.cdk.staging',
     'examples/template',
-    '!/.github/workflows/manual-release.yml',
     '!/examples/**',
   ],
   npmignore: [
@@ -108,9 +106,66 @@ const project = new awscdk.AwsCdkConstructLibrary({
     '/examples',
     'PUBLISHING.md',
     '.vscode',
+    'projenrc',
   ],
 });
 
+// test against latest versions
+const REPO_TEMP_DIRECTORY = '.repo';
+project.buildWorkflow?.addPostBuildJob('test-latest-versions', {
+  runsOn: ['ubuntu-latest'],
+  permissions: {},
+  tools: {
+    node: { version: '18.x' },
+  },
+  steps: [
+    {
+      name: 'Prepare Repository',
+      run: `mv ${project.artifactsDirectory} ${'.repo'}`,
+    },
+    {
+      name: 'Bump CDK versions',
+      run: `cd ${REPO_TEMP_DIRECTORY} && npx npm-check-updates -u "/^(@aws-cdk|aws-cdk)/"`,
+    },
+    {
+      name: 'Install Dependencies',
+      run: `cd ${REPO_TEMP_DIRECTORY} && ${project.package.installAndUpdateLockfileCommand}`,
+    },
+    {
+      name: 'Run tests',
+      run: `cd ${REPO_TEMP_DIRECTORY} && ${project.runTaskCommand(project.testTask)}`,
+    },
+  ],
+});
+
+// release only via manual trigger
+project.release?.publisher?.publishToGit({
+  changelogFile: 'dist/dist/changelog.md',
+  versionFile: 'dist/dist/version.txt',
+  releaseTagFile: 'dist/dist/releasetag.txt',
+  projectChangelogFile: 'CHANGELOG.md',
+  gitBranch: 'main',
+});
+project.tryFindObjectFile('.github/workflows/release.yml')?.addToArray(
+  'jobs.release.steps',
+  {
+    name: 'Publish tag',
+    run: 'npx projen publish:git',
+  },
+);
+
+// add additional tags on npm
+project.tryFindObjectFile('.github/workflows/release.yml')?.addToArray(
+  'jobs.release_npm.steps',
+  tagOnNpm(project.package.packageName, ['cdk-v2', 'unstable', 'next']),
+);
+
+// eslint
+project.eslint?.addRules({
+  '@typescript-eslint/member-ordering': 'off',
+});
+project.eslint?.addIgnorePattern('examples/');
+
 
 // VSCode config
 new JsonFile(project, '.vscode/extensions.json', {
@@ -153,22 +208,6 @@ new vscode.VsCode(project).launchConfiguration.addConfiguration({
 project.tryFindObjectFile('package.json')?.addOverride('optionalDependencies', {
   esbuild: '^0.14.0',
 });
-project.tryFindObjectFile('package.json')?.addOverride('overrides', {
-  '@types/prettier': '2.6.0',
-});
-
-project.eslint?.addRules({
-  '@typescript-eslint/member-ordering': 'off',
-});
-project.eslint?.addOverride({
-  files: ['projenrc/*.ts'],
-  rules: {
-    '@typescript-eslint/no-require-imports': 'off',
-    'import/no-extraneous-dependencies': 'off',
-  },
-});
-project.eslint?.addIgnorePattern('examples/');
-project.eslint?.addIgnorePattern('!projenrc/*.ts');
 
 new TypeScriptSourceFile(project, 'src/esbuild-types.ts', {
   source: 'node_modules/esbuild/lib/main.d.ts',