diff --git a/.eslintignore b/.eslintignore index 46b769557..fe31218da 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,6 +1,7 @@ /node_modules/** /static/** /static-test/** +/public/** /tmp/** /coverage/** !.eslintrc.js diff --git a/.gitignore b/.gitignore index 02f2cfaf8..55d383c8a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,20 +8,6 @@ /.vs/ yarn-error.log* -/static/packs -/static/packs-test -/static/emoji -/static/index.html -/static/index.html.gz -/static/404.html -/static/404.html.gz -/static/manifest.json -/static/manifest.json.gz -/static/report.html -/static/sw.js -/static/instance/** -!/static/instance/**.example -!/static/instance/**.example.* -!/static/instance/**.example/** -/static-test -/public +/static/ +/static-test/ +/public/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 34e101953..926f7b729 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: node:12 +image: node:14 variables: NODE_ENV: test @@ -17,6 +17,7 @@ stages: - deploy before_script: + - env - yarn lint-js: @@ -85,10 +86,10 @@ docs-deploy: pages: stage: deploy + before_script: [] script: - - yarn build + # artifacts are kept between jobs - mv static public - - cp public/{index.html,404.html} variables: NODE_ENV: production artifacts: diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 000000000..2d8169e51 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +nodejs 14.17.6 diff --git a/app/index.ejs b/app/index.ejs index 419feb22a..87c60d6c8 100644 --- a/app/index.ejs +++ b/app/index.ejs @@ -3,6 +3,8 @@
+ + diff --git a/static/instance/about.example/dmca.html b/app/instance/about.example/dmca.html similarity index 100% rename from static/instance/about.example/dmca.html rename to app/instance/about.example/dmca.html diff --git a/static/instance/about.example/index.html b/app/instance/about.example/index.html similarity index 100% rename from static/instance/about.example/index.html rename to app/instance/about.example/index.html diff --git a/static/instance/about.example/privacy.html b/app/instance/about.example/privacy.html similarity index 100% rename from static/instance/about.example/privacy.html rename to app/instance/about.example/privacy.html diff --git a/static/instance/about.example/tos.html b/app/instance/about.example/tos.html similarity index 100% rename from static/instance/about.example/tos.html rename to app/instance/about.example/tos.html diff --git a/static/instance/soapbox.example.json b/app/instance/soapbox.example.json similarity index 100% rename from static/instance/soapbox.example.json rename to app/instance/soapbox.example.json diff --git a/app/soapbox/__mocks__/api.js b/app/soapbox/__mocks__/api.js index 839cbfa70..6ecb81c41 100644 --- a/app/soapbox/__mocks__/api.js +++ b/app/soapbox/__mocks__/api.js @@ -1,6 +1,6 @@ import MockAdapter from 'axios-mock-adapter'; -const api = jest.requireActual('../api').default; +const api = jest.requireActual('../api'); let mocks = []; export const __stub = func => mocks.push(func); @@ -11,8 +11,10 @@ const setupMock = axios => { mocks.map(func => func(mock)); }; +export const staticClient = api.staticClient; + export default (...params) => { - const axios = api(...params); + const axios = api.default(...params); setupMock(axios); return axios; }; diff --git a/app/soapbox/actions/__tests__/about-test.js b/app/soapbox/actions/__tests__/about-test.js index 19fa9bcad..f6ce02099 100644 --- a/app/soapbox/actions/__tests__/about-test.js +++ b/app/soapbox/actions/__tests__/about-test.js @@ -5,15 +5,17 @@ import { fetchAboutPage, } from '../about'; import { Map as ImmutableMap } from 'immutable'; -import { __stub as stubApi } from 'soapbox/api'; +import MockAdapter from 'axios-mock-adapter'; +import { staticClient } from 'soapbox/api'; import { mockStore } from 'soapbox/test_helpers'; describe('fetchAboutPage()', () => { it('creates the expected actions on success', () => { - stubApi(mock => { - mock.onGet('/instance/about/index.html').reply(200, '