From 1eafdf7fd877bb9c2aaae5562bb6ef312efc3fb5 Mon Sep 17 00:00:00 2001 From: Jerko Steiner Date: Sat, 14 Sep 2019 11:27:07 +0700 Subject: [PATCH] Move template into packages/scripts --- packages/scripts/package.json | 5 +++-- packages/scripts/src/scripts/add.ts | 7 ++++++- {template => packages/scripts/template}/jest.config.js | 0 {template => packages/scripts/template}/jest.setup.js | 0 {template => packages/scripts/template}/package.json | 1 + {template => packages/scripts/template}/src/index.ts | 0 packages/scripts/template/tsconfig.esm.json | 8 ++++++++ {template => packages/scripts/template}/tsconfig.json | 0 {template => packages/scripts/template}/tslint.json | 0 packages/scripts/tsconfig.json | 6 ++++++ 10 files changed, 24 insertions(+), 3 deletions(-) rename {template => packages/scripts/template}/jest.config.js (100%) rename {template => packages/scripts/template}/jest.setup.js (100%) rename {template => packages/scripts/template}/package.json (90%) rename {template => packages/scripts/template}/src/index.ts (100%) create mode 100644 packages/scripts/template/tsconfig.esm.json rename {template => packages/scripts/template}/tsconfig.json (100%) rename {template => packages/scripts/template}/tslint.json (100%) diff --git a/packages/scripts/package.json b/packages/scripts/package.json index 960b582..abda409 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -13,5 +13,6 @@ "dependencies": {}, "types": "lib/index.d.ts", "devDependencies": {}, - "module": "lib/index.js" -} \ No newline at end of file + "module": "lib/index.js", + "main": "lib/index.js" +} diff --git a/packages/scripts/src/scripts/add.ts b/packages/scripts/src/scripts/add.ts index e42c303..bb75d5b 100644 --- a/packages/scripts/src/scripts/add.ts +++ b/packages/scripts/src/scripts/add.ts @@ -8,6 +8,11 @@ export async function add(...argv: string[]) { const {parse} = argparse({ name: arg('string', {positional: true, required: true}), namespace: arg('string', {default: '@rondo.dev'}), + template: arg('string', { + default: path.join(__dirname, '..', '..', 'template'), + alias: 't', + description: 'Path to project template directory', + }), help: arg('boolean', { alias: 'h', description: 'Print help message', @@ -23,7 +28,7 @@ export async function add(...argv: string[]) { const libraryName = `${args.namespace}/${args.name}` - const templateDir = path.join('.', 'template') + const templateDir = args.template for (const file of await walk(templateDir)) { const src = file const dest = path.join(destDir, path.relative(templateDir, file)) diff --git a/template/jest.config.js b/packages/scripts/template/jest.config.js similarity index 100% rename from template/jest.config.js rename to packages/scripts/template/jest.config.js diff --git a/template/jest.setup.js b/packages/scripts/template/jest.setup.js similarity index 100% rename from template/jest.setup.js rename to packages/scripts/template/jest.setup.js diff --git a/template/package.json b/packages/scripts/template/package.json similarity index 90% rename from template/package.json rename to packages/scripts/template/package.json index 860f837..0380692 100644 --- a/template/package.json +++ b/packages/scripts/template/package.json @@ -10,5 +10,6 @@ "dependencies": { }, "main": "lib/index.js", + "module": "esm/index.js", "types": "lib/index.d.ts" } diff --git a/template/src/index.ts b/packages/scripts/template/src/index.ts similarity index 100% rename from template/src/index.ts rename to packages/scripts/template/src/index.ts diff --git a/packages/scripts/template/tsconfig.esm.json b/packages/scripts/template/tsconfig.esm.json new file mode 100644 index 0000000..6e2aaa7 --- /dev/null +++ b/packages/scripts/template/tsconfig.esm.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "esm" + }, + "references": [ + ] +} diff --git a/template/tsconfig.json b/packages/scripts/template/tsconfig.json similarity index 100% rename from template/tsconfig.json rename to packages/scripts/template/tsconfig.json diff --git a/template/tslint.json b/packages/scripts/template/tslint.json similarity index 100% rename from template/tslint.json rename to packages/scripts/template/tslint.json diff --git a/packages/scripts/tsconfig.json b/packages/scripts/tsconfig.json index 2680de9..c2c0537 100644 --- a/packages/scripts/tsconfig.json +++ b/packages/scripts/tsconfig.json @@ -4,6 +4,12 @@ "outDir": "lib", "rootDir": "src" }, + "exclude": [ + "node_modules", + "template", + "lib", + "esm" + ], "references": [ {"path": "../argparse"} ]