[legacy-framework] Add new integration test harness

.eslintrc.js

@@ -87,9 +87,10 @@ module.exports = {
       },
     },
     {
-      files: ["**/__fixtures__/**"],
+      files: ["test/**", "**/__fixtures__/**"],
       rules: {
         "import/no-default-export": "off",
+        "require-await": "off",
       },
     },
   ],

.github/workflows/main.yml

@@ -89,7 +89,7 @@ jobs:
           path: ./*
           key: ${{ github.sha }}
 
-  build_and_test_pkgs:
+  testBlitzPackages:
     name: Blitz Packages Tests
     needs: build
     runs-on: ubuntu-latest
@@ -108,7 +108,7 @@ jobs:
         env:
           CI: true
 
-  build_and_test_examples:
+  testBlitzExamples:
     timeout-minutes: 30
     name: Blitz Example Apps Tests
     strategy:
@@ -193,6 +193,32 @@ jobs:
       - run: node run-tests.js --timings --type unit -g 1/1
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
 
+  testIntegrationBlitz:
+    name: Blitz - Test Integration
+    runs-on: ubuntu-latest
+    needs: build
+    env:
+      NEXT_TELEMETRY_DISABLED: 1
+      NEXT_TEST_JOB: 1
+      HEADLESS: true
+    strategy:
+      fail-fast: false
+    steps:
+      - run: echo ${{needs.build.outputs.docsChange}}
+      - uses: actions/cache@v2
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+        id: restore-build
+        with:
+          path: ./*
+          key: ${{ github.sha }}
+
+      # TODO: remove after we fix watchpack watching too much
+      - run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+
+      - run: xvfb-run node nextjs/run-tests.js -c 3
+        if: ${{needs.build.outputs.docsChange != 'docs only change'}}
+
   testIntegration:
     name: Nextjs - Test Integration
     defaults:
@@ -259,7 +285,15 @@ jobs:
   testsPass:
     name: thank you, next
     runs-on: ubuntu-latest
-    needs: [checkPrecompiled, testIntegration, testUnit]
+    needs:
+      [
+        checkPrecompiled,
+        testIntegration,
+        testIntegrationBlitz,
+        testUnit,
+        testBlitzPackages,
+        testBlitzExamples,
+      ]
     steps:
       - run: exit 0
 

.prettierignore

@@ -4,7 +4,7 @@
 .log
 .DS_Store
 .jest-*
-lib
+packages/cli/lib
 node_modules
 reports
 *.log

babel.config.js

@@ -26,4 +26,24 @@ module.exports = {
       },
     ],
   ],
+  overrides: [
+    {
+      test: "./test/**/*",
+      presets: [
+        [
+          "@babel/preset-env",
+          {
+            modules: false,
+            // loose: true,
+            exclude: [
+              "@babel/plugin-transform-async-to-generator",
+              "@babel/plugin-transform-regenerator",
+            ],
+          },
+        ],
+        "blitz/babel",
+      ],
+      plugins: [],
+    },
+  ],
 }

examples/auth/blitz.config.js

@@ -1,27 +1,25 @@
-const withMonorepoBuildTooling = require("@preconstruct/next")
 const {sessionMiddleware, simpleRolesIsAuthorized} = require("blitz")
 const withBundleAnalyzer = require("@next/bundle-analyzer")({
   enabled: process.env.ANALYZE === "true",
 })
 
-module.exports = withMonorepoBuildTooling(
-  withBundleAnalyzer({
-    middleware: [
-      sessionMiddleware({
-        isAuthorized: simpleRolesIsAuthorized,
-        // sessionExpiryMinutes: 4,
-      }),
-    ],
-    cli: {
-      clearConsoleOnBlitzDev: false,
-    },
-    log: {
-      // level: "trace",
-    },
-    experimental: {
-      isomorphicResolverImports: false,
-    },
-    /*
+module.exports = withBundleAnalyzer({
+  middleware: [
+    sessionMiddleware({
+      isAuthorized: simpleRolesIsAuthorized,
+      // sessionExpiryMinutes: 4,
+    }),
+  ],
+  cli: {
+    clearConsoleOnBlitzDev: false,
+  },
+  log: {
+    // level: "trace",
+  },
+  experimental: {
+    isomorphicResolverImports: false,
+  },
+  /*
   webpack: (config, {buildId, dev, isServer, defaultLoaders, webpack}) => {
     // Note: we provide webpack above so you should not `require` it
     // Perform customizations to webpack config
@@ -34,5 +32,4 @@ module.exports = withMonorepoBuildTooling(
     return config
   },
   */
-  }),
-)
+})

examples/custom-server/blitz.config.js

@@ -1,7 +1,6 @@
 const {sessionMiddleware, simpleRolesIsAuthorized} = require("blitz")
-const withMonorepoBuildTooling = require("@preconstruct/next")
 
-module.exports = withMonorepoBuildTooling({
+module.exports = {
   middleware: [
     sessionMiddleware({
       isAuthorized: simpleRolesIsAuthorized,
@@ -15,4 +14,4 @@ module.exports = withMonorepoBuildTooling({
     return config
   },
   */
-})
+}

examples/fauna/blitz.config.js

@@ -1,5 +1,4 @@
 const { sessionMiddleware, simpleRolesIsAuthorized } = require("blitz")
-const withMonorepoBuildTooling = require("@preconstruct/next")
 const { GraphQLClient, gql } = require("graphql-request")
 
 const graphQLClient = new GraphQLClient("https://graphql.fauna.com/graphql", {
@@ -18,7 +17,7 @@ const normalizeSession = (faunaSession) => {
   }
 }
 
-module.exports = withMonorepoBuildTooling({
+module.exports = {
   middleware: [
     sessionMiddleware({
       isAuthorized: simpleRolesIsAuthorized,
@@ -159,4 +158,4 @@ module.exports = withMonorepoBuildTooling({
     return config
   },
   */
-})
+}

examples/no-prisma/blitz.config.js

@@ -1,6 +1,4 @@
-const withMonorepoBuildTooling = require("@preconstruct/next")
-
-module.exports = withMonorepoBuildTooling({
+module.exports = {
   webpack: (config, { buildId, dev, isServer, defaultLoaders, webpack }) => {
     // Note: we provide webpack above so you should not `require` it
     // Perform customizations to webpack config
@@ -12,4 +10,4 @@ module.exports = withMonorepoBuildTooling({
     // Important: return the modified config
     return config
   },
-})
+}

examples/static/blitz.config.js

@@ -1,6 +1,4 @@
-const withMonorepoBuildTooling = require("@preconstruct/next")
-
-module.exports = withMonorepoBuildTooling({
+module.exports = {
   middleware: [],
   /* Uncomment this to customize the webpack config
   webpack: (config, { buildId, dev, isServer, defaultLoaders, webpack }) => {
@@ -10,4 +8,4 @@ module.exports = withMonorepoBuildTooling({
     return config
   },
   */
-})
+}

examples/store/blitz.config.js

@@ -1,6 +1,4 @@
-const withMonorepoBuildTooling = require("@preconstruct/next")
-
-module.exports = withMonorepoBuildTooling({
+module.exports = {
   middleware: [
     (req, res, next) => {
       res.blitzCtx.referer = req.headers.referer
@@ -24,4 +22,4 @@ module.exports = withMonorepoBuildTooling({
   //   // Important: return the modified config
   //   return config
   // },
-})
+}

jest-unit.config.js

@@ -0,0 +1,37 @@
+const {jsWithBabel: tsjPreset} = require("ts-jest/preset")
+
+module.exports = {
+  testEnvironment: "node",
+  moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
+  modulePathIgnorePatterns: ["<rootDir>/tmp", "<rootDir>/dist", "<rootDir>/templates"],
+  moduleNameMapper: {},
+  setupFilesAfterEnv: ["<rootDir>/jest.setup.js"],
+  transform: {
+    ...tsjPreset.transform,
+  },
+  transformIgnorePatterns: ["[/\\\\]node_modules[/\\\\].+\\.(js|jsx)$"],
+  testMatch: ["<rootDir>/**/*.(spec|test).{ts,tsx,js,jsx}"],
+  testURL: "http://localhost",
+  // watchPlugins: [
+  //   require.resolve("jest-watch-typeahead/filename"),
+  //   require.resolve("jest-watch-typeahead/testname"),
+  // ],
+  coverageReporters: ["json", "lcov", "text", "clover"],
+  // collectCoverage: !!`Boolean(process.env.CI)`,
+  collectCoverageFrom: ["src/**/*.{ts,tsx,js,jsx}"],
+  coveragePathIgnorePatterns: ["/templates/"],
+  // coverageThreshold: {
+  //   global: {
+  //     branches: 100,
+  //     functions: 100,
+  //     lines: 100,
+  //     statements: 100,
+  //   },
+  // },
+  globals: {
+    "ts-jest": {
+      tsconfig: __dirname + "/tsconfig.test.json",
+      isolatedModules: true,
+    },
+  },
+}

jest.config.js

@@ -1,37 +1,10 @@
-const {jsWithBabel: tsjPreset} = require("ts-jest/preset")
-
 module.exports = {
-  testEnvironment: "node",
-  moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
-  modulePathIgnorePatterns: ["<rootDir>/tmp", "<rootDir>/dist", "<rootDir>/templates"],
-  moduleNameMapper: {},
-  setupFilesAfterEnv: ["<rootDir>/jest.setup.js"],
-  transform: {
-    ...tsjPreset.transform,
-  },
-  transformIgnorePatterns: ["[/\\\\]node_modules[/\\\\].+\\.(js|jsx)$"],
-  testMatch: ["<rootDir>/**/*.(spec|test).{ts,tsx,js,jsx}"],
-  testURL: "http://localhost",
-  // watchPlugins: [
-  //   require.resolve("jest-watch-typeahead/filename"),
-  //   require.resolve("jest-watch-typeahead/testname"),
-  // ],
-  coverageReporters: ["json", "lcov", "text", "clover"],
-  // collectCoverage: !!`Boolean(process.env.CI)`,
-  collectCoverageFrom: ["src/**/*.{ts,tsx,js,jsx}"],
-  coveragePathIgnorePatterns: ["/templates/"],
-  // coverageThreshold: {
-  //   global: {
-  //     branches: 100,
-  //     functions: 100,
-  //     lines: 100,
-  //     statements: 100,
-  //   },
-  // },
-  globals: {
-    "ts-jest": {
-      tsconfig: __dirname + "/tsconfig.test.json",
-      isolatedModules: true,
-    },
-  },
+  testMatch: ["**/*.test.js", "**/*.test.ts"],
+  verbose: true,
+  rootDir: "test",
+  modulePaths: ["<rootDir>/lib"],
+  globalSetup: "<rootDir>/jest-global-setup.js",
+  globalTeardown: "<rootDir>/jest-global-teardown.js",
+  setupFilesAfterEnv: ["<rootDir>/jest-setup-after-env.js"],
+  testEnvironment: "<rootDir>/jest-environment.js",
 }

nextjs/packages/next/package.json

@@ -48,7 +48,7 @@
     "dev": "taskr",
     "release": "taskr release",
     "prepublish": "npm run release && yarn types",
-    "types": "tsc --declaration --emitDeclarationOnly --declarationDir dist",
+    "types": "rimraf \"dist/**/*.d.ts\" && tsc --declaration --emitDeclarationOnly --declarationDir dist",
     "typescript": "tsc --noEmit --declaration",
     "ncc-compiled": "ncc cache clean && taskr ncc"
   },

nextjs/run-tests.js

@@ -64,7 +64,7 @@ async function main() {
     tests = (
       await glob('**/*.test.js', {
         nodir: true,
-        cwd: path.join(__dirname, 'test'),
+        cwd: path.join(process.cwd(), 'test'),
       })
     ).filter((test) => {
       // only include the specified type
@@ -79,7 +79,7 @@ async function main() {
     if (outputTimings && groupArg) {
       console.log('Fetching previous timings data')
       try {
-        const timingsFile = path.join(__dirname, 'test-timings.json')
+        const timingsFile = path.join(process.cwd(), 'test-timings.json')
         try {
           prevTimings = JSON.parse(await fs.readFile(timingsFile, 'utf8'))
           console.log('Loaded test timings from disk successfully')
@@ -234,7 +234,7 @@ async function main() {
         } catch (err) {
           if (i < NUM_RETRIES) {
             try {
-              const testDir = path.dirname(path.join(__dirname, test))
+              const testDir = path.dirname(path.join(process.cwd(), test))
               console.log('Cleaning test files at', testDir)
               await exec(`git clean -fdx "${testDir}"`)
               await exec(`git checkout "${testDir}"`)