.github/workflows/build.yml

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

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-# Generated by projen. To modify, edit "projen.js" and run "projen"
+# Generated by projen. To modify, edit .projenrc.js and run "npx projen".
 name: Release
 on:
   push:

.gitignore

@@ -1,4 +1,4 @@
-# Generated by projen. To modify, edit "projen.js" and run "projen"
+# Generated by projen. To modify, edit .projenrc.js and run "npx projen".
 # synthesized by projen
 /.npmignore
 # Logs
@@ -52,7 +52,7 @@ tsconfig.json
 *.js
 !# synthesized by projen, but committed to git
 !/package.json
-!projen.js
+!/.projenrc.js
 !# always commit version file
 !version.json
 !# synthesized by projen, but committed to git

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.1.9](https://github.com/eladb/projen/compare/v0.1.8...v0.1.9) (2020-05-12)
+
+
+### Features
+
+* add "release" script (bump + push) ([91e8673](https://github.com/eladb/projen/commit/91e8673628e1ce4fe2df30c77b01a47c0cd5905b))
+* rename projen.js to .projenrc.js ([63a4538](https://github.com/eladb/projen/commit/63a45384552e9e26fcece2adc51112295cfa0281))
+* support bootstrapping from an empty repo ([b38a6dc](https://github.com/eladb/projen/commit/b38a6dce56b9dec8a142bd012afbafc7c8aff1f8))
+
 ### [0.1.8](https://github.com/eladb/projen/compare/v0.1.7...v0.1.8) (2020-05-12)
 
 

bin/projen

@@ -1,8 +1,2 @@
-#!/bin/bash
-set -euo pipefail
-app="./projen.js"
-if [ ! -f $app ]; then
-  echo "$app not found"
-  exit 1
-fi
-exec node $app
+#!/usr/bin/env node
+require('./projen.js');

bin/projen.ts

@@ -0,0 +1,24 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { PROJEN_RC } from '../lib/common';
+
+const projenfile = path.resolve(PROJEN_RC);
+
+if (!fs.existsSync(projenfile)) {
+  console.error(`unable to find ${projenfile}`);
+  process.exit(1);
+}
+
+// now in order to run, projen needs to be able to "require('projen')". this will
+// work if we already installed our modules, but will fail miserably when we
+// bootstrap a checked out (or empty) repo.
+const projen = path.dirname(require.resolve('../package.json'));
+const symlink = path.join('node_modules', 'projen');
+if (!fs.existsSync(symlink)) {
+  fs.mkdirSync('node_modules', { recursive: true });
+  fs.symlinkSync(projen, symlink);
+}
+
+// now we are ready to rock
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+require(projenfile);

lib/common.ts

@@ -1 +1,2 @@
-export const GENERATION_DISCLAIMER = 'Generated by projen. To modify, edit "projen.js" and run "projen"';
+export const PROJEN_RC = '.projenrc.js';
+export const GENERATION_DISCLAIMER = `Generated by projen. To modify, edit ${PROJEN_RC} and run "npx projen".`;

lib/node-project.ts

@@ -3,7 +3,7 @@ import { JsonFile } from './json';
 import { Semver } from './semver';
 import { IgnoreFile } from './ignore-file';
 import { License } from './license';
-import { GENERATION_DISCLAIMER } from './common';
+import { GENERATION_DISCLAIMER, PROJEN_RC } from './common';
 import { Lazy } from 'constructs';
 import { Version } from './version';
 
@@ -113,13 +113,13 @@ export class NodeProject extends Project {
     this.manifest.license = license;
     new License(this, license);
 
-    this.addScripts({ projen: 'node projen.js && yarn install' });
+    this.addScripts({ projen: `node ${PROJEN_RC} && yarn install` });
 
     this.npmignore.comment('exclude project definition from npm module');
-    this.npmignore.exclude('projen.js');
+    this.npmignore.exclude(`/${PROJEN_RC}`);
 
     this.npmignore.comment('make sure to commit projen definition');
-    this.gitignore.include('projen.js');
+    this.gitignore.include(`/${PROJEN_RC}`);
 
     this.addBins(options.bin ?? { });
 

lib/version.ts

@@ -11,6 +11,7 @@ export class Version extends Construct {
     super(project, 'bump-script');
 
     project.addScripts({ bump: 'standard-version' });
+    project.addScripts({ release: 'yarn bump && git push --follow-tags origin master' });
     project.addDevDependencies({
       'standard-version': Semver.caret('8.0.0'),
     });

package.json

@@ -1,5 +1,5 @@
 {
-  "//": "Generated by projen. To modify, edit \"projen.js\" and run \"projen\"",
+  "//": "Generated by projen. To modify, edit .projenrc.js and run \"npx projen\".",
   "name": "projen",
   "description": "A new generation of project generators",
   "main": "lib/index.js",
@@ -11,9 +11,10 @@
     "projen": "bin/projen"
   },
   "scripts": {
-    "projen": "node projen.js && yarn install",
+    "projen": "node .projenrc.js && yarn install",
     "test": "yarn eslint",
     "bump": "standard-version",
+    "release": "yarn bump && git push --follow-tags origin master",
     "compile": "jsii",
     "watch": "jsii -w",
     "compat": "npx jsii-diff npm:$(node -p \"require('./package.json').name\")",
@@ -53,7 +54,7 @@
     "yaml"
   ],
   "license": "Apache-2.0",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "types": "lib/index.d.ts",
   "stability": "experimental",
   "jsii": {

version.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.8"
+  "version": "0.1.9"
 }