Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/templates/core/OpenAPI.hbs
#	src/templates/core/Result.ts
#	src/templates/core/request.ts
#	src/templates/core/requestUsingFetch.ts
#	src/templates/core/requestUsingXHR.ts
#	test/__snapshots__/index.spec.js.snap

Author: richgoldmd

.babelrc.js

@@ -2,14 +2,13 @@
 
 module.exports = {
     presets: [
-        [
-            '@babel/preset-env',
-            {
-                targets: {
-                    esmodules: true,
-                },
+        ['@babel/preset-env', {
+            targets: {
+                node: true,
             },
-        ],
-        '@babel/preset-typescript',
+        }],
+        ['@babel/preset-typescript', {
+            onlyRemoveTypeImports: true,
+        }],
     ],
 };

.circleci/config.yml

@@ -3,26 +3,29 @@ jobs:
     build:
         working_directory: ~/repo
         docker:
-            - image: circleci/node:lts
+            - image: circleci/node:latest-browsers
         steps:
             - checkout
             - restore_cache:
                 keys:
                     - v1-dependencies-{{ checksum "package.json" }}
                     - v1-dependencies-
             - run:
-                  name: install
+                  name: Install dependencies
                   command: yarn install
             - save_cache:
                 key: v1-dependencies-{{ checksum "package.json" }}
                 paths:
                     - node_modules
             - run:
-                name: build
+                name: Build library
                 command: yarn run release
             - run:
-                name: test
+                name: Run unit tests
                 command: yarn run test:coverage
             - run:
-                name: codecov
+                name: Run e2e tests
+                command: yarn run test:e2e
+            - run:
+                name: Submit to Codecov
                 command: yarn run codecov

.gitignore

@@ -9,6 +9,9 @@ junit.xml
 .vscode
 *.iml
 dist
-archive
 coverage
-test/result
+test/generated
+test/e2e/generated
+samples/generated
+samples/swagger-codegen-cli-v2.jar
+samples/swagger-codegen-cli-v3.jar