Skip to content

Commit

Permalink
Merge pull request #689 from tubone24/versionup-gatsbyv4
Browse files Browse the repository at this point in the history
Versionup gatsbyv4
  • Loading branch information
tubone24 authored Nov 20, 2021
2 parents f14bd27 + 8cf015d commit 5b21b68
Show file tree
Hide file tree
Showing 7 changed files with 13,036 additions and 12,650 deletions.
26 changes: 10 additions & 16 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,11 @@ jobs:
steps:
- name: Checkout source code
uses: actions/checkout@v2
- name: Cache node_modules
uses: actions/cache@v2
with:
path: node_modules
key: ${{ runner.OS }}-node14-build-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node14-build-
${{ runner.OS }}
- name: cache clear workaround # https://github.com/gatsbyjs/gatsby/issues/31853#issuecomment-858517772
run: |
npm install -g rimraf
npm run clean-all
rimraf package-lock.json
- name: Setup Node
uses: actions/setup-node@v2
with:
Expand Down Expand Up @@ -51,14 +48,11 @@ jobs:
steps:
- name: Checkout source code
uses: actions/checkout@v2
- name: Cache node_modules
uses: actions/cache@v2
with:
path: node_modules
key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-build-
${{ runner.OS }}
- name: cache clear workaround # https://github.com/gatsbyjs/gatsby/issues/31853#issuecomment-858517772
run: |
npm install -g rimraf
npm run clean-all
rimraf package-lock.json
- name: Setup Node
uses: actions/setup-node@v2
with:
Expand Down
32 changes: 11 additions & 21 deletions .github/workflows/previewDeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,15 @@ jobs:
steps:
- name: Checkout source code
uses: actions/checkout@v2
- name: Cache node_modules
uses: actions/cache@v2
with:
path: node_modules
key: ${{ runner.OS }}-node14-build-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node14-build-
${{ runner.OS }}
- name: Setup Node
uses: actions/setup-node@v2
with:
node-version: 14.x
- name: cache clear workaround # https://github.com/gatsbyjs/gatsby/issues/31853#issuecomment-858517772
run: |
npm install -g rimraf
npm run clean-all
rimraf package-lock.json
- name: npm install
run: |
npm install
Expand All @@ -44,29 +41,22 @@ jobs:
with:
name: main.spec.js.mp4
path: ./cypress/videos/e2e/main.spec.js.mp4
- uses: actions/upload-artifact@v2
with:
name: bundle_analyzer.png
path: ./cypress/snapshots/actual/e2e/main.spec.js/bundle_analyzer.png

build:
runs-on: ubuntu-latest

steps:
- name: Checkout source code
uses: actions/checkout@v2
- name: Cache node_modules
uses: actions/cache@v2
with:
path: node_modules
key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-build-
${{ runner.OS }}
- name: Setup Node
uses: actions/setup-node@v2
with:
node-version: 14.x
- name: cache clear workaround # https://github.com/gatsbyjs/gatsby/issues/31853#issuecomment-858517772
run: |
npm install -g rimraf
npm run clean-all
rimraf package-lock.json
- name: "depcheck"
uses: tubone24/[email protected]
with:
Expand Down Expand Up @@ -95,7 +85,7 @@ jobs:
GATSBY_GITHUB_SHA: ${{ github.sha }}
FAUNADB_SERVER_SECRET: ${{secrets.FAUNADB_SERVER_SECRET}}
NETLIFY_ENV: deploy-preview
run: npm run build
run: npm run build:nocache
- name: Deploy to netlify
run: npx netlify-cli deploy --dir=./public > cli.txt
env:
Expand Down
7 changes: 0 additions & 7 deletions cypress/integration/e2e/main.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,3 @@ describe("UI Test", () => {
cy.window().its('scrollY').should('be.lt', 100);
});
});

describe("Capture Bundle Analyzer", () => {
it('Bundle Report', ()=>{
cy.visit("/bundle-report.html");
cy.screenshot('bundle_analyzer')
})
});
10 changes: 5 additions & 5 deletions gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,11 @@ module.exports = {
],
},
},
{
resolve: 'gatsby-plugin-algolia',
// eslint-disable-next-line global-require
options: require('./gatsby-plugin-algolia-config.js'),
},
// { // comment out because reach free request
// resolve: 'gatsby-plugin-algolia',
// // eslint-disable-next-line global-require
// options: require('./gatsby-plugin-algolia-config.js'),
// },
{
resolve: 'gatsby-transformer-remark',
options: {
Expand Down
Loading

0 comments on commit 5b21b68

Please sign in to comment.