diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 000000000..204b1023d --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,7 @@ +{ + "recommendations": [ + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode", + "wayou.vscode-todo-highlight" + ] +} diff --git a/packages/create-modular-react-app/src/__tests__/index.test.ts b/packages/create-modular-react-app/src/__tests__/index.test.ts index 342ae869b..09a2a9584 100644 --- a/packages/create-modular-react-app/src/__tests__/index.test.ts +++ b/packages/create-modular-react-app/src/__tests__/index.test.ts @@ -59,10 +59,15 @@ describe('create-modular-react-app', () => { createModularApp({ _: [destination] }); expect(tree(destination)).toMatchInlineSnapshot(` "test-repo + ├─ .editorconfig #1p4gvuw ├─ .eslintignore #1ugsijf ├─ .gitignore #1ugsijf + ├─ .vscode + │ ├─ extensions.json #1i4584r + │ └─ settings.json #xncm1d ├─ README.md #1nksyzj ├─ modular + │ ├─ setupEnvironment.ts #m0s4vb │ └─ setupTests.ts #bnjknz ├─ package.json ├─ packages diff --git a/packages/create-modular-react-app/src/cli.ts b/packages/create-modular-react-app/src/cli.ts index de0112ff5..920830012 100755 --- a/packages/create-modular-react-app/src/cli.ts +++ b/packages/create-modular-react-app/src/cli.ts @@ -62,8 +62,6 @@ export default function createModularApp(argv: { name[0] === '/' || name.includes(':\\') ? /* absolute */ name : path.join(process.cwd(), name); - const packagesPath = path.join(newModularRoot, 'packages'); - const modularGlobalConfigsPath = path.join(newModularRoot, 'modular'); const projectPackageJsonPath = path.join(newModularRoot, 'package.json'); const templatePath = path.join(__dirname, '..', 'template'); @@ -131,35 +129,19 @@ export default function createModularApp(argv: { { cwd: newModularRoot }, ); - fs.mkdirpSync(packagesPath); - fs.copySync( - path.join(templatePath, 'packages/README.md'), - path.join(packagesPath, 'README.md'), - ); - - fs.mkdirpSync(modularGlobalConfigsPath); - fs.copySync( - path.join(templatePath, 'modular/setupTests.ts'), - path.join(modularGlobalConfigsPath, 'setupTests.ts'), - ); + fs.copySync(templatePath, newModularRoot); - fs.copySync( - path.join(templatePath, 'gitignore'), + // rename gitgnore to .gitgnore so it actually works + fs.moveSync( + path.join(newModularRoot, 'gitignore'), path.join(newModularRoot, '.gitignore'), ); + // make an eslintignore file from gitignore fs.copySync( - path.join(templatePath, 'gitignore'), + path.join(newModularRoot, '.gitignore'), path.join(newModularRoot, '.eslintignore'), ); - fs.copySync( - path.join(templatePath, 'tsconfig.json'), - path.join(newModularRoot, 'tsconfig.json'), - ); - fs.copySync( - path.join(templatePath, 'README.md'), - path.join(newModularRoot, 'README.md'), - ); execSync( 'yarnpkg', diff --git a/packages/create-modular-react-app/template/.editorconfig b/packages/create-modular-react-app/template/.editorconfig new file mode 100644 index 000000000..7526bd7ab --- /dev/null +++ b/packages/create-modular-react-app/template/.editorconfig @@ -0,0 +1,18 @@ +# https://editorconfig.org +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 2 +indent_style = space +insert_final_newline = true +max_line_length = 80 +trim_trailing_whitespace = true + +[*.{md,mdx}] +max_line_length = 0 +trim_trailing_whitespace = false + +[COMMIT_EDITMSG] +max_line_length = 0 diff --git a/packages/create-modular-react-app/template/.vscode/extensions.json b/packages/create-modular-react-app/template/.vscode/extensions.json new file mode 100644 index 000000000..204b1023d --- /dev/null +++ b/packages/create-modular-react-app/template/.vscode/extensions.json @@ -0,0 +1,7 @@ +{ + "recommendations": [ + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode", + "wayou.vscode-todo-highlight" + ] +} diff --git a/packages/create-modular-react-app/template/.vscode/settings.json b/packages/create-modular-react-app/template/.vscode/settings.json new file mode 100644 index 000000000..25fa6215f --- /dev/null +++ b/packages/create-modular-react-app/template/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "typescript.tsdk": "node_modules/typescript/lib" +} diff --git a/packages/modular-scripts/src/__tests__/index.test.ts b/packages/modular-scripts/src/__tests__/index.test.ts index 786b86c16..f794326ad 100644 --- a/packages/modular-scripts/src/__tests__/index.test.ts +++ b/packages/modular-scripts/src/__tests__/index.test.ts @@ -189,6 +189,11 @@ describe('modular-scripts', () => { }); it('can start an app', async () => { + // this leaves habing processes on local environments + // so we're disabling it for now. Still runs on CI though. + if (!process.env.CI) { + return; + } let browser: puppeteer.Browser | undefined; let devServer: DevServer | undefined; try { diff --git a/packages/tree-view-for-tests/src/__tests__/tree.test.ts b/packages/tree-view-for-tests/src/__tests__/tree.test.ts index 6975da0a6..ec076c533 100644 --- a/packages/tree-view-for-tests/src/__tests__/tree.test.ts +++ b/packages/tree-view-for-tests/src/__tests__/tree.test.ts @@ -15,10 +15,14 @@ test('it can serialise a folder', () => { ├─ package.json ├─ src │ ├─ __tests__ - │ │ └─ index.test.ts #vp1gkc - │ ├─ cli.ts #9pkwel + │ │ └─ index.test.ts #1lu3g5f + │ ├─ cli.ts #gcx3cm │ └─ index.ts #un0l9d └─ template + ├─ .editorconfig #1p4gvuw + ├─ .vscode + │ ├─ extensions.json #1i4584r + │ └─ settings.json #xncm1d ├─ README.md #1nksyzj ├─ gitignore #1ugsijf ├─ modular