From 2fb8eb8c49e74a13968aa70083d35c2fa07e2fdb Mon Sep 17 00:00:00 2001 From: Fabian Chong Date: Fri, 4 Sep 2020 14:03:06 +0800 Subject: [PATCH 1/8] replace tsc dist dir to build --- .gitignore | 1 + packages/cli/src/lib/builder/config.ts | 4 ++-- tsconfig.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index aee80f4c10..deeca8aa11 100644 --- a/.gitignore +++ b/.gitignore @@ -89,6 +89,7 @@ typings/ # Nuxt.js build / generate output .nuxt dist +build # Microsite build output microsite/build diff --git a/packages/cli/src/lib/builder/config.ts b/packages/cli/src/lib/builder/config.ts index bc689a3eb0..78a50e29ed 100644 --- a/packages/cli/src/lib/builder/config.ts +++ b/packages/cli/src/lib/builder/config.ts @@ -37,7 +37,7 @@ export const makeConfigs = async ( options: BuildOptions, ): Promise => { const typesInput = paths.resolveTargetRoot( - 'dist', + 'build', relativePath(paths.targetRoot, paths.targetDir), 'src/index.d.ts', ); @@ -120,7 +120,7 @@ export const makeConfigs = async ( configs.push({ input: typesInput, output: { - file: 'dist/index.d.ts', + file: 'build/index.d.ts', format: 'es', }, plugins: [dts()], diff --git a/tsconfig.json b/tsconfig.json index 7ea674798c..b4eab1a6e0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,7 +7,7 @@ "plugins/*/migrations" ], "compilerOptions": { - "outDir": "dist", + "outDir": "build", "rootDir": "." } } From e205c57b80de0a7c5aaca48157832c0f7af6b897 Mon Sep 17 00:00:00 2001 From: Fabian Chong Date: Fri, 4 Sep 2020 15:07:16 +0800 Subject: [PATCH 2/8] test version --- packages/cli/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 3b69e9b1b5..e5f563c618 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/cli", "description": "CLI for developing Backstage plugins and apps", - "version": "0.1.1-alpha.21", + "version": "0.1.1-alpha.21.grab-fab", "private": false, "publishConfig": { "access": "public" From c7df9575424c228d4fd73a519d37a4cf39852743 Mon Sep 17 00:00:00 2001 From: Fabian Chong Date: Fri, 4 Sep 2020 16:02:12 +0800 Subject: [PATCH 3/8] remove test config --- packages/cli/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index e5f563c618..dce07a145a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { - "name": "@backstage/cli", + "name": "@fabian.chong/cli", "description": "CLI for developing Backstage plugins and apps", - "version": "0.1.1-alpha.21.grab-fab", + "version": "0.1.1-alpha.21", "private": false, "publishConfig": { "access": "public" From 00cfda33b30048883513a008fd977801ba2924ea Mon Sep 17 00:00:00 2001 From: Fabian Chong Date: Fri, 4 Sep 2020 16:02:52 +0800 Subject: [PATCH 4/8] remove private scope --- packages/cli/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index dce07a145a..3b69e9b1b5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,5 +1,5 @@ { - "name": "@fabian.chong/cli", + "name": "@backstage/cli", "description": "CLI for developing Backstage plugins and apps", "version": "0.1.1-alpha.21", "private": false, From 59fb93cd003a6344a0699a3f6d0cdda4cfc7cd40 Mon Sep 17 00:00:00 2001 From: Fabian Chong Date: Fri, 4 Sep 2020 21:20:21 +0800 Subject: [PATCH 5/8] rename build to dist-types --- .gitignore | 2 +- packages/cli/src/lib/builder/config.ts | 4 ++-- tsconfig.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index deeca8aa11..b9e7f7d597 100644 --- a/.gitignore +++ b/.gitignore @@ -89,7 +89,7 @@ typings/ # Nuxt.js build / generate output .nuxt dist -build +dist-types # Microsite build output microsite/build diff --git a/packages/cli/src/lib/builder/config.ts b/packages/cli/src/lib/builder/config.ts index 78a50e29ed..9a3be63404 100644 --- a/packages/cli/src/lib/builder/config.ts +++ b/packages/cli/src/lib/builder/config.ts @@ -37,7 +37,7 @@ export const makeConfigs = async ( options: BuildOptions, ): Promise => { const typesInput = paths.resolveTargetRoot( - 'build', + 'dist-types', relativePath(paths.targetRoot, paths.targetDir), 'src/index.d.ts', ); @@ -120,7 +120,7 @@ export const makeConfigs = async ( configs.push({ input: typesInput, output: { - file: 'build/index.d.ts', + file: 'dist-types/index.d.ts', format: 'es', }, plugins: [dts()], diff --git a/tsconfig.json b/tsconfig.json index b4eab1a6e0..d6cb6f4c96 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,7 +7,7 @@ "plugins/*/migrations" ], "compilerOptions": { - "outDir": "build", + "outDir": "dist-types", "rootDir": "." } } From 4f172359267b6f685e6a073f56588500d2b6763b Mon Sep 17 00:00:00 2001 From: Fabian Chong Date: Sat, 5 Sep 2020 15:58:34 +0800 Subject: [PATCH 6/8] create-app tsconfig --- packages/cli/src/commands/clean/clean.ts | 1 + packages/create-app/templates/default-app/.gitignore | 1 + packages/create-app/templates/default-app/tsconfig.json | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/cli/src/commands/clean/clean.ts b/packages/cli/src/commands/clean/clean.ts index 2fa3e4a18f..bc2bcd23ac 100644 --- a/packages/cli/src/commands/clean/clean.ts +++ b/packages/cli/src/commands/clean/clean.ts @@ -19,5 +19,6 @@ import { paths } from '../../lib/paths'; export default async function clean() { await fs.remove(paths.resolveTarget('dist')); + await fs.remove(paths.resolveTarget('dist-types')); await fs.remove(paths.resolveTarget('coverage')); } diff --git a/packages/create-app/templates/default-app/.gitignore b/packages/create-app/templates/default-app/.gitignore index 3e786d566e..4f9065c60b 100644 --- a/packages/create-app/templates/default-app/.gitignore +++ b/packages/create-app/templates/default-app/.gitignore @@ -22,6 +22,7 @@ node_modules/ # Build output dist +dist-types # Temporary change files created by Vim *.swp diff --git a/packages/create-app/templates/default-app/tsconfig.json b/packages/create-app/templates/default-app/tsconfig.json index cccc375f63..b1ec99b986 100644 --- a/packages/create-app/templates/default-app/tsconfig.json +++ b/packages/create-app/templates/default-app/tsconfig.json @@ -8,7 +8,7 @@ ], "exclude": ["node_modules"], "compilerOptions": { - "outDir": "dist", + "outDir": "dist-types", "rootDir": ".", "skipLibCheck": true } From 0499c27fec34c68d0bcd04e52234b6a71f4e96db Mon Sep 17 00:00:00 2001 From: Fabian Chong Date: Sat, 5 Sep 2020 16:45:25 +0800 Subject: [PATCH 7/8] index types --- packages/cli/src/lib/builder/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/lib/builder/config.ts b/packages/cli/src/lib/builder/config.ts index 9a3be63404..e91fc32633 100644 --- a/packages/cli/src/lib/builder/config.ts +++ b/packages/cli/src/lib/builder/config.ts @@ -120,7 +120,7 @@ export const makeConfigs = async ( configs.push({ input: typesInput, output: { - file: 'dist-types/index.d.ts', + file: 'dist/index.d.ts', format: 'es', }, plugins: [dts()], From df9fc649fd7b3eab8f901cf7c8d1e6a5e50c13f2 Mon Sep 17 00:00:00 2001 From: Fabian Chong Date: Sat, 5 Sep 2020 19:20:24 +0800 Subject: [PATCH 8/8] ignore dist-types dir --- .eslintignore | 1 + packages/cli/config/eslint.backend.js | 2 +- packages/cli/config/eslint.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.eslintignore b/.eslintignore index 2f59b98bca..c73074efb3 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,5 +1,6 @@ **/node_modules/** **/dist/** +**/dist-types/** **/storybook-static/** **/coverage/** **/build/** diff --git a/packages/cli/config/eslint.backend.js b/packages/cli/config/eslint.backend.js index 9b9efc7649..113ba55818 100644 --- a/packages/cli/config/eslint.backend.js +++ b/packages/cli/config/eslint.backend.js @@ -35,7 +35,7 @@ module.exports = { ecmaVersion: 2018, sourceType: 'module', }, - ignorePatterns: ['.eslintrc.js', '**/dist/**'], + ignorePatterns: ['.eslintrc.js', '**/dist/**', '**/dist-types/**'], rules: { 'no-console': 0, // Permitted in console programs 'new-cap': ['error', { capIsNew: false }], // Because Express constructs things e.g. like 'const r = express.Router()' diff --git a/packages/cli/config/eslint.js b/packages/cli/config/eslint.js index 792cd467d5..3e171d1f82 100644 --- a/packages/cli/config/eslint.js +++ b/packages/cli/config/eslint.js @@ -39,7 +39,7 @@ module.exports = { version: 'detect', }, }, - ignorePatterns: ['.eslintrc.js', '**/dist/**'], + ignorePatterns: ['.eslintrc.js', '**/dist/**', '**/dist-types/**'], rules: { 'import/newline-after-import': 'error', 'import/no-duplicates': 'warn',