Skip to content

Commit 5d06e07

Browse files
authored
feat: ask for environment branching (#132)
1 parent 2be2afe commit 5d06e07

105 files changed

Lines changed: 13802 additions & 21717 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/e2e*

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/checkout@v2
1313
- uses: actions/setup-node@v1
1414
with:
15-
node-version: 11
15+
node-version: 14
1616
registry-url: 'https://registry.npmjs.org'
1717
- run: |
1818
npm install

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v2
1717
- uses: actions/setup-node@v1
1818
with:
19-
node-version: 11
19+
node-version: 14
2020
- run: |
2121
npm install
2222
npm run build

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Ignore built ts files
22
dist/**/*
33

4-
54
### Node template
65
# Logs
76
*.log
@@ -21,6 +20,7 @@ node_modules
2120
# Editors
2221
.idea
2322
*.iml
23+
.vscode
2424

2525
# Directory for instrumented libs generated by jscoverage/JSCover
2626
lib-cov
@@ -44,7 +44,6 @@ bower_components
4444
build/Release
4545

4646
# Dependency directories
47-
node_modules/
4847
jspm_packages/
4948

5049
# Typescript v1 declaration files

.prettierrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ module.exports = {
44
singleQuote: true,
55
printWidth: 120,
66
tabWidth: 2,
7+
arrowParens: 'avoid',
78
};

.vscode/launch.json

Lines changed: 0 additions & 49 deletions
This file was deleted.

.vscode/settings.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

.vscode/tasks.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

e2e-scaffold/config.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
{
2-
"globals": {
3-
"ts-jest": {
4-
"tsConfig": "<rootDir>/tsconfig.json"
5-
}
6-
},
72
"setupFiles": [
83
"./setup/setup.ts"
94
],
@@ -14,14 +9,20 @@
149
"globalTeardown": "./setup/globalTeardown.ts",
1510
"testEnvironment": "./setup/testEnvironment.js",
1611
"moduleFileExtensions": [
17-
"ts",
1812
"js",
19-
"json"
13+
"json",
14+
"ts"
2015
],
2116
"transform": {
22-
"^.+\\.(ts|tsx)$": "ts-jest"
17+
"^.+\\.tsx?$": [
18+
"ts-jest",
19+
{
20+
"tsconfig": "<rootDir>/tsconfig.json"
21+
}
22+
]
2323
},
2424
"testMatch": [
25-
"/**/*.test.(ts|js)"
26-
]
25+
"/**/*.test.(t|j)s"
26+
],
27+
"preset": "ts-jest"
2728
}

e2e-scaffold/setup/globalSetup.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ import { generateScaffoldProject } from './helpers/generateScaffoldProject';
22
import { startScaffoldProject } from './helpers/startScaffoldProject';
33

44
import * as puppeteer from 'puppeteer';
5-
import * as fs from 'fs';
6-
import * as mkdirp from 'mkdirp';
5+
import * as fs from 'fs-extra';
76
import * as os from 'os';
87
import * as path from 'path';
98
import * as dotenv from 'dotenv';
10-
import gql from 'graphql-tag';
119
import { Client } from '@8base/api-client';
10+
import gql from 'graphql-tag';
1211

1312
const DIR = path.join(os.tmpdir(), 'jest_puppeteer_global_setup');
1413

@@ -65,8 +64,7 @@ export default async () => {
6564
const launchOptions = getPuppeteerLaunchOptions();
6665

6766
const browser = await puppeteer.launch(launchOptions);
68-
69-
mkdirp.sync(DIR);
67+
fs.ensureDirSync(DIR);
7068
fs.writeFileSync(path.join(DIR, 'wsEndpoint'), browser.wsEndpoint());
7169

7270
global.__BROWSER__ = browser;

0 commit comments

Comments
 (0)