Shared Jest Cache + Shared devDeps + Incremental builds + Reverts outputs dependencies (#3694)

Author: kamilkisiela

.github/workflows/main.yml

@@ -22,15 +22,36 @@ jobs:
       - name: Use Node ${{matrix.node_version}}
         uses: actions/setup-node@master
         with:
-          version: ${{ matrix.node_version }}
+          node-version: ${{ matrix.node_version }}
+      - name: Get yarn cache
+        id: yarn-cache
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+        if: matrix.os != 'macos-latest'
+      - name: Cache Yarn
+        uses: actions/cache@v1
+        if: matrix.os != 'macos-latest'
+        with:
+          path: ${{ steps.yarn-cache.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+      - name: Cache Jest
+        uses: actions/cache@v1
+        with:
+          path: .cache/jest
+          key: ${{ runner.os }}-jest-${{ hashFiles('yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-jest-
       - name: Install Dependencies using Yarn
         run: yarn install
       - name: Lint
         run: yarn lint
       - name: Build
         run: yarn build
       - name: Test
-        run: yarn test
+        run: yarn test --logHeapUsage
+        env:
+          CI: true
       - name: Test dev-tests
         run: |
           dev-test/generate-all.sh
@@ -43,7 +64,7 @@ jobs:
       - name: Checkout Master
         uses: actions/checkout@v1
       - name: Use Node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@master
         with:
           node-version: '13.x'
       - name: Install Dependencies using Yarn
@@ -62,12 +83,11 @@ jobs:
 
               if [ "$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER" != "" ]
               then
-                npm install -g dfds-github-scripts
                 export BUILD_REPOSITORY_NAME="${{github.repository}}"
                 export ALPHA_VERSION=`cat out.txt | sed -n 's/.*cli => //p' | sed -n 's/+.*//p'`
                 export GH_API_TOKEN="${{ secrets.GH_API_TOKEN }}"
                 export COMMENT_BODY="The latest changes of this PR are available as alpha in npm: \`$ALPHA_VERSION\`"
-                pr-comment
+                ./scripts/comment.js
               fi
           else    
               echo "Skipping canary publish due to a fork/PR..."

.gitignore

@@ -14,4 +14,6 @@ temp
 test-results/
 junit.xml
 dist
-out.txt
+bob/
+out.txt
+.cache

jest.config.js

@@ -1,52 +1,10 @@
-module.exports = {
-  collectCoverageFrom: [
-    'packages/**/src/**/*.ts',
-    '!packages/utils/**/*',
-    '!**/*.d.ts'
-  ],
-  coverageDirectory: 'coverage',
-  coverageReporters: ['html', 'lcov', 'text'],
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-  rootDir: __dirname,
-  globals: {
-    'ts-jest': {
-      diagnostics: false,
-    },
-  },
-  reporters: [
-    'default',
-    [
-      'jest-junit',
-      {
-        classNameTemplate: '{classname}',
-        titleTemplate: '{title}',
-        addFileAttribute: 'true',
-      },
-    ],
-  ],
-  roots: ['<rootDir>/packages'],
-  modulePathIgnorePatterns: ['<rootDir>/packages/.*/dist/'],
-  moduleNameMapper: {
-    '^@graphql-codegen/cli$': '<rootDir>/packages/graphql-codegen-cli/src/index.ts',
-    '^@graphql-codegen/core$': '<rootDir>/packages/graphql-codegen-core/src/index.ts',
-
-    '^@graphql-codegen/(typescript|flow|java)$': '<rootDir>/packages/plugins/$1/$1/src/index.ts',
-    '^@graphql-codegen/(typescript|flow|java)-([\\w-]+)$': '<rootDir>/packages/plugins/$1/$2/src/index.ts',
-    '^@graphql-codegen/kotlin$': '<rootDir>/packages/plugins/java/kotlin/src/index.ts',
-
-    '^@graphql-codegen/add$': '<rootDir>/packages/plugins/other/add/src/index.ts',
-    '^@graphql-codegen/fragment-matcher$': '<rootDir>/packages/plugins/other/fragment-matcher/src/index.ts',
-    '^@graphql-codegen/introspection$': '<rootDir>/packages/plugins/other/introspection/src/index.ts',
-    '^@graphql-codegen/schema-ast$': '<rootDir>/packages/plugins/other/schema-ast/src/index.ts',
-    '^@graphql-codegen/time$': '<rootDir>/packages/plugins/other/time/src/index.ts',
-    '^@graphql-codegen/visitor-plugin-common$': '<rootDir>/packages/plugins/other/visitor-plugin-common/src/index.ts',
-
-    '^@graphql-codegen/import-types-preset$': '<rootDir>/packages/presets/import-types/src/index.ts',
-    '^@graphql-codegen/near-operation-file-preset$': '<rootDir>/packages/presets/near-operation-file/src/index.ts',
-
-    '^@graphql-codegen/config-markdown-generator$': '<rootDir>/packages/utils/config-md-generator/src/index.ts',
-    '^@graphql-codegen/testing$': '<rootDir>/packages/utils/graphql-codegen-testing/src/index.ts',
-    '^@graphql-codegen/plugin-helpers$': '<rootDir>/packages/utils/plugins-helpers/src/index.ts'
-  },
-};
+const PROJECTS = false;
+const CI = !!process.env.CI;
+
+module.exports =
+  !PROJECTS || CI
+    ? require('./jest.project')({ dirname: __dirname, projectMode: PROJECTS })
+    : {
+        rootDir: __dirname,
+        projects: ['<rootDir>/packages/**/*/jest.config.js'],
+      };

jest.project.js

@@ -0,0 +1,30 @@
+const { resolve } = require('path');
+const { pathsToModuleNameMapper } = require('ts-jest/utils');
+
+const ROOT_DIR = __dirname;
+const TSCONFIG = resolve(ROOT_DIR, 'tsconfig.json');
+const tsconfig = require(TSCONFIG);
+const CI = !!process.env.CI;
+
+module.exports = ({ dirname, projectMode = true }) => {
+  const pkg = require(resolve(dirname, 'package.json'));
+
+  return {
+    ...(CI || !projectMode ? {} : { displayName: pkg.name.replace('@graphql-codegen/', '') }),
+    transform: { '^.+\\.tsx?$': 'ts-jest' },
+    testEnvironment: 'node',
+    rootDir: dirname,
+    globals: {
+      'ts-jest': {
+        diagnostics: false,
+        tsConfig: 'tsconfig.json',
+      },
+    },
+    restoreMocks: true,
+    reporters: ['default'],
+    modulePathIgnorePatterns: ['dist'],
+    moduleNameMapper: pathsToModuleNameMapper(tsconfig.compilerOptions.paths, { prefix: `${ROOT_DIR}/` }),
+    cacheDirectory: resolve(ROOT_DIR, `${CI ? '' : 'node_modules/'}.cache/jest`),
+    collectCoverage: false,
+  };
+};

package.json

@@ -3,9 +3,8 @@
   "scripts": {
     "clean": "rimraf node_modules packages/{*,plugins/*/*,presets/*,utils/*}/node_modules",
     "prebuild": "rimraf packages/{*,plugins/*/*,presets/*,utils/*}/dist",
-    "build": "lerna run build --ignore @graphql-codegen/live-demo --ignore @graphql-codegen/website",
+    "build": "tsc --project tsconfig.json && node ./scripts/bundle.js",
     "test": "jest --no-watchman",
-    "coverage": "jest --no-watchman --runInBand --coverage",
     "lint": "eslint --ext .ts .",
     "prettier": "prettier --ignore-path .gitignore --write --list-different \"**/*.{ts,tsx,graphql,yml}\"",
     "prettier:check": "prettier --ignore-path .gitignore --check \"**/*.{ts,tsx,graphql,yml}\"",
@@ -42,11 +41,12 @@
     ]
   },
   "devDependencies": {
-    "dfds-github-scripts": "0.0.2",
+    "axios": "0.19.2",
     "@apollo/react-common": "3.1.3",
     "@apollo/react-components": "3.1.3",
     "@apollo/react-hoc": "3.1.3",
     "@apollo/react-hooks": "3.1.3",
+    "@babel/preset-typescript": "7.9.0",
     "@types/common-tags": "1.8.0",
     "@types/glob": "7.1.1",
     "@types/jest": "25.1.4",
@@ -56,6 +56,12 @@
     "@types/request": "2.48.4",
     "react": "16.13.1",
     "react-dom": "16.13.1",
+    "p-limit": "2.2.2",
+    "fs-extra": "9.0.0",
+    "rollup": "2.1.0",
+    "@rollup/plugin-node-resolve": "7.1.1",
+    "rollup-plugin-generate-package-json": "3.2.0",
+    "rollup-plugin-auto-external": "2.0.0",
     "apollo-cache": "1.3.4",
     "apollo-client": "2.6.8",
     "apollo-link": "1.2.13",
@@ -70,9 +76,12 @@
     "eslint-plugin-promise": "4.2.1",
     "eslint-plugin-react-hooks": "2.5.1",
     "eslint-plugin-standard": "4.0.1",
+    "flow-bin": "0.121.0",
+    "flow-parser": "0.121.0",
     "graphql": "14.6.0",
     "graphql-tag": "2.10.3",
     "husky": "4.2.3",
+    "java-ast": "0.1.0",
     "jest": "25.1.0",
     "jest-docblock": "25.1.0",
     "jest-junit": "10.0.0",
@@ -86,12 +95,10 @@
   },
   "lint-staged": {
     "packages/**/src/**/*.{ts,tsx}": [
-      "eslint --fix",
-      "git add"
+      "eslint --fix"
     ],
     "**/*.{ts,tsx,graphql,yml}": [
-      "prettier --write",
-      "git add -f"
+      "prettier --write"
     ]
   },
   "resolutions": {

packages/graphql-codegen-cli/jest.config.js

@@ -0,0 +1 @@
+module.exports = require('../../jest.project')({	dirname: __dirname });

packages/graphql-codegen-cli/package.json

@@ -9,15 +9,13 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/dotansimha/graphql-code-generator.git"
+    "url": "https://github.com/dotansimha/graphql-code-generator.git",
+    "directory": "packages/graphql-codegen-cli"
   },
   "scripts": {
     "lint": "eslint **/*.ts",
-    "prepack": "bob-update-version",
-    "clean": "rimraf ./dist",
-    "prebuild": "yarn clean",
-    "build": "bob",
-    "test": "jest --no-watchman --config ../../jest.config.js"
+    "test": "jest --no-watchman",
+    "prepack": "../../scripts/prepack.js"
   },
   "keywords": [
     "gql",
@@ -90,7 +88,6 @@
     "valid-url": "1.0.9"
   },
   "devDependencies": {
-    "bob-the-bundler": "0.3.4",
     "@types/chokidar": "1.7.5",
     "@types/detect-indent": "5.0.0",
     "@types/inquirer": "6.5.0",
@@ -100,31 +97,25 @@
     "@types/minimatch": "3.0.3",
     "bdd-stdin": "0.2.0",
     "dotenv": "8.2.0",
-    "graphql": "14.6.0",
     "js-yaml": "3.13.1",
-    "make-dir": "3.0.2",
-    "ts-jest": "25.2.1"
+    "make-dir": "3.0.2"
   },
   "peerDependencies": {
     "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0"
   },
-  "main": "./dist/index.cjs.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/index.d.ts",
-  "typescript": {
-    "definition": "dist/index.d.ts"
+  "main": "dist/index.cjs.js",	
+  "module": "dist/index.esm.js",	
+  "typings": "dist/index.d.ts",	
+  "typescript": {	
+    "definition": "dist/index.d.ts"	
   },
   "buildOptions": {
-    "input": "./src/index.ts",
     "bin": {
       "graphql-codegen": {
-        "input": "./src/bin.ts"
+        "input": "src/bin.ts"
       }
     }
   },
-  "jest-junit": {
-    "outputDirectory": "../../test-results/cli"
-  },
   "publishConfig": {
     "access": "public"
   }