Merge branch 'main' into remove_symlink

Author: mergify[bot]

.eslintrc.json

@@ -12,7 +12,7 @@
   "parserOptions": {
     "ecmaVersion": 2018,
     "sourceType": "module",
-    "project": "./tsconfig.jest.json"
+    "project": "./tsconfig.eslint.json"
   },
   "extends": [
     "plugin:import/typescript"
@@ -27,7 +27,7 @@
     "import/resolver": {
       "node": {},
       "typescript": {
-        "project": "./tsconfig.jest.json"
+        "project": "./tsconfig.eslint.json"
       }
     }
   },

.github/workflows/build.yml

@@ -1,4 +1,5 @@
 # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
+
 name: Build
 on:
   pull_request: {}

.github/workflows/projenupgrade.yml

@@ -1,4 +1,5 @@
 # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
+
 name: ProjenUpgrade
 on:
   schedule:

.github/workflows/rebuild-bot.yml

@@ -1,4 +1,5 @@
 # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
+
 name: rebuild-bot
 on:
   issue_comment:

.github/workflows/release.yml

@@ -1,9 +1,10 @@
 # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
+
 name: Release
 on:
   push:
     branches:
-      - master
+      - main
   workflow_dispatch: {}
 jobs:
   build:
@@ -46,13 +47,16 @@ jobs:
     name: Release to NPM
     needs: build
     runs-on: ubuntu-latest
+    container:
+      image: jsii/superchain
     steps:
       - name: Download build artifacts
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v2
         with:
           name: dist
+          path: dist
       - name: Release
-        run: npx -p jsii-release jsii-release-npm
+        run: npx -p jsii-release@latest jsii-release-npm
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           NPM_DIST_TAG: latest

.gitignore

@@ -44,6 +44,7 @@ yarn-error.log*
 !/package.json
 !/src
 !/test
+!/tsconfig.eslint.json
 !/tsconfig.jest.json
 !/tsconfig.json
 !version.json

.npmignore

@@ -11,6 +11,7 @@
 /src
 /test
 /test-reports/
+/tsconfig.eslint.json
 /tsconfig.jest.json
 /tsconfig.json
 dist

.projen/deps.json

@@ -63,7 +63,7 @@
     },
     {
       "name": "projen",
-      "version": "^0.14.10",
+      "version": "^0.16.3",
       "type": "build"
     },
     {

.projen/tasks.json

@@ -99,13 +99,13 @@
     "release": {
       "name": "release",
       "category": "20.release",
-      "description": "Bumps version & push to master",
+      "description": "Bumps version & push to main",
       "steps": [
         {
           "spawn": "bump"
         },
         {
-          "exec": "git push --follow-tags origin master"
+          "exec": "git push --follow-tags origin main"
         }
       ],
       "condition": "! git log --oneline -1 | grep -q \"chore(release):\""

.projenrc.js

@@ -1,12 +1,13 @@
-const { TypeScriptProject, Semver, Jest, Eslint } = require('projen');
+const { TypeScriptProject } = require('projen');
 
 const project = new TypeScriptProject({
   name: 'jsii-srcmak',
   description: 'generate source code in multiple languages from typescript',
-  repository: 'https://github.com/eladb/jsii-srcmak.git',
+  repository: 'https://github.com/aws/jsii-srcmak.git',
   authorName: 'Elad Ben-Israel',
   authorEmail: 'benisrae@amazon.com',
   stability: 'experimental',
+  defaultReleaseBranch: 'main',
 
   bin: {
     'jsii-srcmak': 'bin/jsii-srcmak',