Merge pull request #43 from wednesday-solutions/fix/scripts

Fix scripts
wednesday-solutions · May 9, 2023 · 9bb9576 · 9bb9576
2 parents 7e6f0e5 + 525a345
commit 9bb9576
Show file tree

Hide file tree

Showing 5 changed files with 318 additions and 252 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -5,15 +5,25 @@ on:
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [16.x]
+
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'yarn'
 
       - name: Install dependencies
         run: yarn
 
       - name: Build
-        run: yarn build
+        run: yarn build:prod
 
       - name: Deploy to S3
         uses: jakejarvis/s3-sync-action@master

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [16.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -27,7 +27,7 @@ jobs:
         run: yarn test
 
       - name: Build
-        run: yarn build
+        run: yarn build:prod
 
       # - name: SonarCloud Scan
       #   uses: sonarsource/sonarcloud-github-action@master

diff --git a/.github/workflows/jest-coverage.yml b/.github/workflows/jest-coverage.yml
@@ -11,19 +11,25 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
     steps:
       - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'yarn'
+
       - name: Get Threshold
         id: threshold
         uses: notiz-dev/github-action-json-property@release
         with:
           path: 'jest.config.json'
           prop_path: 'coverageThreshold.global.statements'
-          
+
       - name: Install dependencies
         run: yarn
-        
+
       - name: Test and generate coverage report
         uses: artiomtr/[email protected]
         with:

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   },
   "engines": {
     "npm": ">=5",
-    "node": ">=8.15.1"
+    "node": ">=8.15.1 <17.9.1"
   },
   "author": "Mac",
   "homepage": "https://github.com/wednesday-solutions/react-graphql-ts-template",
@@ -20,15 +20,13 @@
     "extract-intl": "node ./internals/scripts/extract-intl.js",
     "npmcheckversion": "node ./internals/scripts/npmcheckversion.js",
     "preinstall": "npm run npmcheckversion",
-    "prebuild": "npm run build:clean",
-    "build": "export NODE_OPTIONS=--openssl-legacy-provider && export ENVIRONMENT_NAME=production && cross-env NODE_ENV=production webpack --config internals/webpack/webpack.config.prod.js --color --progress --stats-children --stats-error-details",
-    "build:dev": "export NODE_OPTIONS=--openssl-legacy-provider && export ENVIRONMENT_NAME=development && cross-env NODE_ENV=production webpack --config internals/webpack/webpack.config.dev.js --color --progress",
+    "prebuild:prod": "npm run build:clean",
+    "build:prod": "export ENVIRONMENT_NAME=production && cross-env NODE_ENV=production webpack --config internals/webpack/webpack.config.prod.js --color --progress --stats-children --stats-error-details",
+    "build:dev": "export ENVIRONMENT_NAME=development && cross-env NODE_ENV=production webpack --config internals/webpack/webpack.config.dev.js --color --progress",
     "build:clean": "rimraf ./build",
-    "predeploy": "yarn build && yarn build-storybook -o build/stories",
-    "deploy": "gh-pages -d build",
-    "start": "export NODE_OPTIONS=--openssl-legacy-provider && export ENVIRONMENT_NAME=local && concurrently -c green.bold,blue.bold -n WEBPACK,TYPESCRIPT \"cross-env NODE_ENV=development node server\" \"yarn tsc:watch\"",
+    "start": "export ENVIRONMENT_NAME=local && concurrently -c green.bold,blue.bold -n WEBPACK,TYPESCRIPT \"cross-env NODE_ENV=development node server\" \"yarn tsc:watch\"",
     "start:tunnel": "cross-env NODE_ENV=development ENABLE_TUNNEL=true node server",
-    "start:production": "npm run test && npm run build && npm run start:prod",
+    "start:production": "npm run test && npm run build:prod && npm run start:prod",
     "start:prod": "cross-env NODE_ENV=production node server",
     "presetup": "npm i chalk shelljs",
     "setup": "node ./internals/scripts/setup.js",
@@ -196,7 +194,6 @@
     "eslint-plugin-redux-saga": "1.1.3",
     "eslint-plugin-standard": "4.0.1",
     "file-loader": "6.2.0",
-    "gh-pages": "^3.2.3",
     "html-loader": "2.1.2",
     "html-webpack-plugin": "5.3.2",
     "image-webpack-loader": "7.0.1",