diff --git a/.eslintrc.cjs b/.eslintrc.cjs index f600af38d..0105144fb 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -295,7 +295,7 @@ module.exports = { { // Only enforce JSDoc comments on UI components for now. // https://www.npmjs.com/package/eslint-plugin-jsdoc - files: ['src/soapbox/components/ui/**/*'], + files: ['src/components/ui/**/*'], rules: { 'jsdoc/require-jsdoc': ['error', { publicOnly: true, diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 729d114c0..41f1abf26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -72,7 +72,7 @@ lint-sass: # changes: # - "**/*.js" # - "**/*.json" -# - "src/soapbox/**/*" +# - "src/**/*" # - "webpack/**/*" # - "custom/**/*" # - "jest.config.cjs" diff --git a/dangerfile.ts b/dangerfile.ts index 0079123b4..e66369875 100644 --- a/dangerfile.ts +++ b/dangerfile.ts @@ -1,7 +1,7 @@ import { danger, warn, message } from 'danger'; // App changes -const app = danger.git.fileMatch('src/soapbox/**'); +const app = danger.git.fileMatch('src/**'); // Docs changes const docs = danger.git.fileMatch('docs/**/*.md'); @@ -18,24 +18,24 @@ if (app.edited && !changelog.edited) { } // UI components -const uiCode = danger.git.fileMatch('src/soapbox/components/ui/**'); -const uiTests = danger.git.fileMatch('src/soapbox/components/ui/**/__tests__/**'); +const uiCode = danger.git.fileMatch('src/components/ui/**'); +const uiTests = danger.git.fileMatch('src/components/ui/**/__tests__/**'); if (uiCode.edited && !uiTests.edited) { warn('You have UI changes (`soapbox/components/ui`) without tests.'); } // Actions -const actionsCode = danger.git.fileMatch('src/soapbox/actions/**'); -const actionsTests = danger.git.fileMatch('src/soapbox/actions/**__tests__/**'); +const actionsCode = danger.git.fileMatch('src/actions/**'); +const actionsTests = danger.git.fileMatch('src/actions/**__tests__/**'); if (actionsCode.edited && !actionsTests.edited) { warn('You have actions changes (`soapbox/actions`) without tests.'); } // Reducers -const reducersCode = danger.git.fileMatch('src/soapbox/reducers/**'); -const reducersTests = danger.git.fileMatch('src/soapbox/reducers/**__tests__/**'); +const reducersCode = danger.git.fileMatch('src/reducers/**'); +const reducersTests = danger.git.fileMatch('src/reducers/**__tests__/**'); if (reducersCode.edited && !reducersTests.edited) { warn('You have reducer changes (`soapbox/reducers`) without tests.'); diff --git a/docs/development/build-config.md b/docs/development/build-config.md index 293cd5d0e..ceae10631 100644 --- a/docs/development/build-config.md +++ b/docs/development/build-config.md @@ -71,7 +71,7 @@ For example: } ``` -See `src/soapbox/utils/features.js` for the full list of features. +See `src/utils/features.js` for the full list of features. ### Embedded app (`custom/app.json`) diff --git a/docs/development/developing-backend.md b/docs/development/developing-backend.md index 70dc62e34..7896323ce 100644 --- a/docs/development/developing-backend.md +++ b/docs/development/developing-backend.md @@ -48,7 +48,7 @@ Typically checks are done against `BACKEND_NAME` and `VERSION`. The version string is similar in purpose to a [User-Agent](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent) string. The format was first invented by Pleroma, but is now widely used, including by Pixelfed, Mitra, and Soapbox BE. -See [`features.ts`](https://gitlab.com/soapbox-pub/soapbox/-/blob/main/src/soapbox/utils/features.ts) for the complete list of features. +See [`features.ts`](https://gitlab.com/soapbox-pub/soapbox/-/blob/main/src/utils/features.ts) for the complete list of features. ## Forks of other software @@ -73,4 +73,4 @@ For Pleroma forks, the fork name should be in the compat section (eg Soapbox BE) ## Adding support for a new backend -If the backend conforms to the above format, please modify [`features.ts`](https://gitlab.com/soapbox-pub/soapbox/-/blob/main/src/soapbox/utils/features.ts) and submit a merge request to enable features for your backend! +If the backend conforms to the above format, please modify [`features.ts`](https://gitlab.com/soapbox-pub/soapbox/-/blob/main/src/utils/features.ts) and submit a merge request to enable features for your backend!