Skip to content
This repository has been archived by the owner on Nov 10, 2022. It is now read-only.

Commit

Permalink
Merge 5e2eebc into 8cfa0f1
Browse files Browse the repository at this point in the history
  • Loading branch information
Alorel committed Jul 10, 2019
2 parents 8cfa0f1 + 5e2eebc commit d7fff65
Show file tree
Hide file tree
Showing 6 changed files with 663 additions and 563 deletions.
19 changes: 0 additions & 19 deletions .alobuild-prep-release.sh

This file was deleted.

5 changes: 1 addition & 4 deletions .travis.yml
Expand Up @@ -6,7 +6,6 @@ node_js:

before_install:
- npm i -g yarn greenkeeper-lockfile
- &prepKey if [[ $GH_TOKEN ]]; then ./.alobuild-prep-release.sh; fi;
- greenkeeper-lockfile-update

install: yarn install --check-files --ignore-engines
Expand All @@ -33,9 +32,7 @@ jobs:
include:
- stage: Release
node_js: stable
before_install:
- npm i -g yarn
- *prepKey
before_install: npm i -g yarn
before_script:
- yarn run build
- ls dist -l
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -49,7 +49,7 @@
"rollup-plugin-typescript2": "^0.21.0",
"tmp": "~0.1.0",
"tslib": "^1.9.0",
"tslint": "~5.16.0",
"tslint": "~5.18.0",
"typescript": "^3.4.5",
"uglify-es": "~3.3.9",
"yamljs": "^0.3.0",
Expand Down
2 changes: 1 addition & 1 deletion src/commons/addPkgMgr.ts
Expand Up @@ -13,7 +13,7 @@ function getDef(): Options {
}

export function addPkgMgrToOptions<T extends Obj<Options>>(opts: T): T {
opts[NAME] = getDef();
(<any>opts)[NAME] = getDef();

return opts;
}
12 changes: 6 additions & 6 deletions src/lib/PromptableConfig.ts
Expand Up @@ -129,7 +129,7 @@ export class PromptableConfig<T extends { [k: string]: any }> {
return this.get<any>(prop);
} else if (!IS_CI && this.ghRepoFromMetadata) {
if (rl.keyInYNStrict(`Is your GitHub repo ${Colour.cyan(this.ghRepoFromMetadata)}? `)) {
this.data[prop] = this.ghRepoFromMetadata;
(<any>this.data)[prop] = this.ghRepoFromMetadata;

return this.ghRepoFromMetadata;
} else {
Expand All @@ -156,7 +156,7 @@ export class PromptableConfig<T extends { [k: string]: any }> {
return this.get<any>(prop);
} else if (!IS_CI && this.ghUserFromMetadata) {
if (rl.keyInYNStrict(`Is your GitHub username ${Colour.cyan(this.ghUserFromMetadata)}? `)) {
this.data[prop] = this.ghUserFromMetadata;
(<any>this.data)[prop] = this.ghUserFromMetadata;

return this.ghUserFromMetadata;
} else {
Expand Down Expand Up @@ -193,7 +193,7 @@ export class PromptableConfig<T extends { [k: string]: any }> {
if (this.has(prop)) {
return this.get(prop);
} else if ((pjson = readJson()) && isLicense(pjson.license)) {
this.data[prop] = pjson.license;
(<any>this.data)[prop] = pjson.license;

return pjson.license;
}
Expand Down Expand Up @@ -233,7 +233,7 @@ export class PromptableConfig<T extends { [k: string]: any }> {
const ghProjRemote = getGhRepoData(tok, user, repo);

if (ghProjRemote && ghProjRemote.description) {
this.data[prop] = ghProjRemote.description;
(<any>this.data)[prop] = ghProjRemote.description;

return this.data[prop];
}
Expand All @@ -254,11 +254,11 @@ export class PromptableConfig<T extends { [k: string]: any }> {
if (this.has(prop)) {
return this.get(prop);
} else if (this.ghRepoFromMetadata && ask(this.ghRepoFromMetadata)) {
this.data[prop] = this.ghRepoFromMetadata;
(<any>this.data)[prop] = this.ghRepoFromMetadata;

return this.ghRepoFromMetadata;
} else if (ask((dir = lastDirname()))) {
this.data[prop] = dir;
(<any>this.data)[prop] = dir;

return dir;
} else {
Expand Down

0 comments on commit d7fff65

Please sign in to comment.