nullstack · Mortaro · Feb 6, 2022 · Dec 21, 2021 · Dec 28, 2021 · Dec 28, 2021
diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml
@@ -0,0 +1,51 @@
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Nullstack Tests
+
+on:
+  pull_request:
+    branches: [ master, next ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    container: lironavon/docker-puppeteer-container:14.16.0
+    env:
+      CI: true
+
+    strategy:
+      matrix:
+        node-version: [12.20.0, 14.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+      - uses: actions/checkout@v2
+      # cache the dependencies from any node_modules directory
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: |
+            **/node_modules
+            **/package-lock.json
+          key: node_modules-${{ matrix.node-version }}-${{ hashFiles('**/package.json') }}
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install and link main deps
+        run: |
+          npm install
+          npm link
+
+      - name: Install deps at tests folder
+        working-directory: ./tests
+        run: |
+          npm link nullstack
+          npm install
+
+      - name: Run tests
+        working-directory: ./tests
+        run: npm test
diff --git a/builders/spa.js b/builders/spa.js
@@ -1,4 +1,5 @@
-module.exports = async function spa(folder = 'spa') {
+module.exports = async function spa({ output, cache }) {
+  const folder = output || 'spa';
   process.env.NULLSTACK_ENVIRONMENT_MODE = 'spa';
 
   const dir = process.cwd();
@@ -32,5 +33,10 @@ module.exports = async function spa(folder = 'spa') {
   console.log()
 
   console.log('\x1b[36m%s\x1b[0m', ` ✅️ ${application.project.name} is ready at ${folder}\n`);
-  process.exit()
+
+  if (cache) {
+    console.log('Storing cache...');
+  } else {
+    process.exit();
+  }
 }
diff --git a/builders/ssg.js b/builders/ssg.js
@@ -1,4 +1,5 @@
-module.exports = async function ssg(folder = 'ssg') {
+module.exports = async function ssg({ output, cache }) {
+  const folder = output || 'ssg';
   process.env.NULLSTACK_ENVIRONMENT_MODE = 'ssg';
 
   const dir = process.cwd();
@@ -101,5 +102,10 @@ module.exports = async function ssg(folder = 'ssg') {
   console.log()
 
   console.log('\x1b[36m%s\x1b[0m', ` ✅️ ${application.project.name} is ready at ${folder}\n`);
-  process.exit()
+
+  if (cache) {
+    console.log('Storing cache...');
+  } else {
+    process.exit();
+  }
 }
diff --git a/builders/ssr.js b/builders/ssr.js
@@ -1,8 +1,12 @@
-module.exports = async function ssr() {
+module.exports = async function ssr({ cache }) {
   const dir = process.cwd();
   const application = require(`${dir}/.production/server`).default;
 
   console.log('\x1b[36m%s\x1b[0m', `\n ✅️ ${application.project.name} is ready for production\n`);
 
-  process.exit()
+  if (cache) {
+    console.log('Storing cache...');
+  } else {
+    process.exit();
+  }
 }
diff --git a/package.json b/package.json
@@ -35,17 +35,17 @@
     "fs-extra": "^10.0.0",
     "glob": "^7.1.7",
     "ignore-loader": "^0.1.2",
-    "mini-css-extract-plugin": "^0.9.0",
+    "mini-css-extract-plugin": "^2.4.5",
     "node-fetch": "3.0.0",
     "nodemon-webpack-plugin": "^4.3.1",
-    "purgecss-webpack-plugin": "^2.2.0",
+    "purgecss-webpack-plugin": "^4.1.3",
     "raw-loader": "^4.0.2",
     "sass": "^1.32.11",
     "sass-loader": "^8.0.2",
-    "string-replace-loader": "^2.2.0",
-    "terser-webpack-plugin": "^2.3.5",
-    "webpack": "^4.42.1",
-    "webpack-cli": "^3.3.11",
+    "string-replace-loader": "^3.1.0",
+    "terser-webpack-plugin": "^5.3.0",
+    "webpack": "^5.65.0",
+    "webpack-cli": "^4.9.1",
     "webpack-livereload-plugin": "^2.3.0",
     "ws": "^7.4.4"
   }

diff --git a/scripts/index.js b/scripts/index.js
@@ -22,7 +22,8 @@ function logCompiling(showCompiling) {
 
 function logTrace(stats, showCompiling) {
   if (stats.hasErrors()) {
-    const [file, loader, ...trace] = stats.toJson('errors-only', { colors: true }).children[0].errors[0].split('\n');
+    const { moduleName: file, message } = stats.toJson('errors-only', { colors: true }).children[0].errors[0];
+    const [loader, ...trace] = message.split('\n');
     if (loader.indexOf('/nullstack/loaders') === -1) trace.unshift(loader)
     const currentTrace = trace.join(' ');
     if (lastTrace === currentTrace) return;
@@ -55,14 +56,14 @@ function start({ input, port }) {
   compiler.watch({}, (error, stats) => logTrace(stats, true));
 }
 
-function build({ input, output, mode = 'ssr' }) {
+function build({ input, output, cache, mode = 'ssr' }) {
   const environment = 'production';
-  const compiler = getCompiler({ environment, input });
+  const compiler = getCompiler({ environment, input, cache });
   console.log(` 🚀️ Building your application in ${mode} mode...`);
   compiler.run((error, stats) => {
     logTrace(stats, false);
     if (stats.hasErrors()) process.exit(1);
-    require(`../builders/${mode}`)(output);
+    require(`../builders/${mode}`)({ output, cache });
   });
 }
 
@@ -82,6 +83,7 @@ program
   .addOption(new program.Option('-m, --mode <mode>', 'Build production bundles').choices(buildModes))
   .option('-i, --input <input>', 'Path to project that will be built')
   .option('-o, --output <output>', 'Path to build output folder')
+  .option('-c, --cache', 'Cache build results in .production folder')
   .helpOption('-h, --help', 'Learn more about this command')
   .action(build)
 

diff --git a/tests/jest-puppeteer.config.js b/tests/jest-puppeteer.config.js
@@ -0,0 +1,28 @@
+// get environment variable
+const CI = !!process.env.CI;
+
+const baseOptions = {
+  server: {
+    command: 'npm run start',
+    port: 6969,
+    launchTimeout: 25000
+  },
+  browserContext: 'incognito'
+}
+
+const ciPipelineOptions = {
+  launch: {
+    executablePath: '/usr/bin/google-chrome-stable',
+    headless: true,
+    args: [
+      '--ignore-certificate-errors',
+      '--no-sandbox',
+      '--disable-setuid-sandbox',
+      '--disable-accelerated-2d-canvas',
+      '--disable-gpu'
+    ]
+  },
+  ...baseOptions
+}
+
+module.exports = CI ? ciPipelineOptions : baseOptions;
diff --git a/tests/jest.config.js b/tests/jest.config.js
@@ -0,0 +1,7 @@
+const CI = !!process.env.CI;
+
+module.exports = {
+  preset: "jest-puppeteer",
+  forceExit: CI,
+  testTimeout: CI ? 5000 : 20000
+}
diff --git a/tests/package.json b/tests/package.json
@@ -8,12 +8,13 @@
     "jest": "^26.6.3",
     "nullstack": "*",
     "puppeteer": "^5.5.0",
+    "jest-puppeteer": "^6.0.3",
     "webpack-cli": "^3.3.12"
   },
   "scripts": {
     "start": "npx nullstack start --input=./tests --port=6969",
     "build": "npx nullstack build --input=./tests --mode=ssr",
-    "test": "npm run build && jest --testTimeout=20000",
+    "test": "npm run build && jest",
     "script": "node src/scripts/run.js"
   },
   "dependencies": {

diff --git a/tests/src/Application.test.js b/tests/src/Application.test.js
@@ -1,13 +1,3 @@
-const puppeteer = require('puppeteer');
-
-let browser;
-let page;
-
-beforeAll(async () => {
-  browser = await puppeteer.launch();
-  page = await browser.newPage();
-});
-
 describe('Application', () => {
 
   test('the application is running', async () => {
@@ -32,8 +22,4 @@ describe('Application', () => {
     expect(element).toBeTruthy();
   });
 
-});
-
-afterAll(async () => {
-  browser.close();
 });
diff --git a/tests/src/ChildComponent.test.js b/tests/src/ChildComponent.test.js
@@ -1,11 +1,4 @@
-const puppeteer = require('puppeteer');
-
-let browser;
-let page;
-
 beforeAll(async () => {
-  browser = await puppeteer.launch();
-  page = await browser.newPage();
   await page.goto('http://localhost:6969/child-component');
 });
 
@@ -43,9 +36,4 @@ describe('ChildComponent', () => {
     expect(element).toBeTruthy();
   });
 
-
-});
-
-afterAll(async () => {
-  browser.close();
 });
diff --git a/tests/src/Context.test.js b/tests/src/Context.test.js
@@ -1,11 +1,4 @@
-const puppeteer = require('puppeteer');
-
-let browser;
-let page;
-
 beforeAll(async () => {
-  browser = await puppeteer.launch();
-  page = await browser.newPage();
   await page.goto('http://localhost:6969/context');
 });
 
@@ -36,8 +29,4 @@ describe('Context', () => {
     expect(element).toBeTruthy();
   });
 
-});
-
-afterAll(async () => {
-  browser.close();
 });
diff --git a/tests/src/ContextData.test.js b/tests/src/ContextData.test.js
@@ -1,11 +1,4 @@
-const puppeteer = require('puppeteer');
-
-let browser;
-let page;
-
 beforeAll(async () => {
-  browser = await puppeteer.launch();
-  page = await browser.newPage();
   await page.goto('http://localhost:6969/context-data');
 });
 
@@ -28,8 +21,4 @@ describe('ContextData', () => {
     expect(element).toBeTruthy();
   });
 
-});
-
-afterAll(async () => {
-  browser.close();
 });
diff --git a/tests/src/ContextEnvironment.test.js b/tests/src/ContextEnvironment.test.js
@@ -1,11 +1,4 @@
-const puppeteer = require('puppeteer');
-
-let browser;
-let page;
-
 beforeAll(async () => {
-  browser = await puppeteer.launch();
-  page = await browser.newPage();
   await page.goto('http://localhost:6969/context-environment');
 });
 
@@ -48,8 +41,4 @@ describe('ContextEnvironment', () => {
     expect(element).toBeTruthy();
   });
 
-});
-
-afterAll(async () => {
-  browser.close();
 });
diff --git a/tests/src/ContextPage.test.js b/tests/src/ContextPage.test.js
@@ -1,11 +1,4 @@
-const puppeteer = require('puppeteer');
-
-let browser;
-let page;
-
 beforeAll(async () => {
-  browser = await puppeteer.launch();
-  page = await browser.newPage();
   await page.goto('http://localhost:6969/context-page');
 });
 
@@ -95,9 +88,4 @@ describe('ContextPage', () => {
     expect(element).toBeTruthy();  
   });
 
-
-});
-
-afterAll(async () => {
-  browser.close();
 });