Skip to content

Commit

Permalink
Fixes build
Browse files Browse the repository at this point in the history
  • Loading branch information
larixer committed Jul 5, 2023
1 parent 032ea92 commit f5a2f1d
Show file tree
Hide file tree
Showing 13 changed files with 43 additions and 93 deletions.
56 changes: 0 additions & 56 deletions modules/rest/server-ts/createRestAPI.ts

This file was deleted.

1 change: 0 additions & 1 deletion modules/rest/server-ts/index.ts

This file was deleted.

14 changes: 0 additions & 14 deletions modules/rest/server-ts/module.ts

This file was deleted.

8 changes: 0 additions & 8 deletions modules/rest/server-ts/package.json

This file was deleted.

9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"eslint": "eslint --fix --ext .js,.jsx,.ts,.tsx,.json .",
"heroku-postbuild": "yarn workspaces foreach -pv run heroku-postbuild",
"precommit": "lint-staged",
"postinstall": "opencollective postinstall"
"postinstall": "opencollective"
},
"lint-staged": {
"*.{js,jsx,ts,tsx,json}": [
Expand Down Expand Up @@ -109,7 +109,7 @@
"@typescript-eslint/eslint-plugin": "^5.23.0",
"@typescript-eslint/parser": "^5.23.0",
"@webpack-cli/serve": "^1.6.1",
"autoprefixer": "10.4.5",
"autoprefixer": "9.8.6",
"babel-core": "^7.0.0-0",
"babel-jest": "^24.8.0",
"babel-loader": "^8.0.6",
Expand Down Expand Up @@ -183,6 +183,7 @@
"resolutions": {
"card-validator": "8.1.1",
"@react-native-picker/picker": "1.16.8",
"extract-files": "6.0.0"
"extract-files": "6.0.0",
"file-loader/loader-utils": "2.0.4"
}
}
}
2 changes: 1 addition & 1 deletion packages/client-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,4 @@
"not ie < 11"
]
}
}
}
2 changes: 1 addition & 1 deletion packages/client-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,4 @@
"not ie < 11"
]
}
}
}
11 changes: 10 additions & 1 deletion packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,25 @@
"@fortawesome/fontawesome-svg-core": "^1.2.17",
"@fortawesome/free-brands-svg-icons": "^5.8.1",
"@fortawesome/react-fontawesome": "^0.1.4",
"@gqlapp/authentication-client-react": "^0.1.0",
"@gqlapp/chat-client-react": "^0.1.0",
"@gqlapp/contact-common": "^0.1.0",
"@gqlapp/contact-client-react": "^0.1.0",
"@gqlapp/core-client-react": "^0.1.0",
"@gqlapp/counter-client-react": "^0.1.0",
"@gqlapp/favicon-common": "^0.1.0",
"@gqlapp/forms-client-react": "^0.1.0",
"@gqlapp/i18n-client-react": "^0.1.0",
"@gqlapp/i18n-common-react": "^0.1.0",
"@gqlapp/module-client-react": "^0.1.0",
"@gqlapp/page-not-found-client-react": "^0.1.0",
"@gqlapp/pagination-client-react": "^0.1.0",
"@gqlapp/payments-client-react": "^0.1.0",
"@gqlapp/post-client-react": "^0.1.0",
"@gqlapp/reports-client-react": "^0.1.0",
"@gqlapp/router-client-react": "^0.1.0",
"@gqlapp/upload-client-react": "^0.1.0",
"@gqlapp/user-client-react": "^0.1.0",
"@gqlapp/validation-common-react": "^0.1.0",
"@loadable/component": "^5.10.1",
"antd": "^3.19.8",
Expand Down Expand Up @@ -175,4 +184,4 @@
"not ie < 11"
]
}
}
}
8 changes: 7 additions & 1 deletion packages/client/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,13 @@ const config = {
name: 'web',
module: {
rules: [
{ test: /\.mjs$/, include: /node_modules/, type: 'javascript/auto' },
{
test: /\.m?js$/,
include: /node_modules/,
resolve: {
fullySpecified: false,
},
},
{
test: /\.(png|ico|jpg|gif|xml)$/,
use: { loader: 'url-loader', options: { name: '[fullhash].[ext]', limit: 100000 } },
Expand Down
2 changes: 1 addition & 1 deletion packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@
"eslint": "^8.15.0",
"jest": "^26.2.2"
}
}
}
2 changes: 1 addition & 1 deletion packages/mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,4 @@
"rimraf": "^2.6.2",
"ws": "^5.1.1"
}
}
}
19 changes: 17 additions & 2 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,26 @@
"dependencies": {
"@babel/preset-env": "^7.0.0",
"@babel/register": "^7.0.0",
"@gqlapp/authentication-server-ts": "^0.1.0",
"@gqlapp/config": "^0.1.0",
"@gqlapp/core-server-ts": "^0.1.0",
"@gqlapp/chat-server-ts": "^0.1.0",
"@gqlapp/contact-server-ts": "^0.1.0",
"@gqlapp/cookies-server-ts": "^0.1.0",
"@gqlapp/counter-server-ts": "^0.1.0",
"@gqlapp/graphql-types-server-ts": "^0.1.0",
"@gqlapp/post-server-ts": "^0.1.0",
"@gqlapp/upload-server-ts": "^0.1.0",
"@gqlapp/i18n-server-ts": "^0.1.0",
"@gqlapp/core-common": "^0.1.0",
"@gqlapp/database-server-ts": "^0.1.0",
"@gqlapp/payments-server-ts": "^0.1.0",
"@gqlapp/mailer-server-ts": "^0.1.0",
"@gqlapp/reports-server-ts": "^0.1.0",
"@gqlapp/debug-server-ts": "^0.1.0",
"@gqlapp/module-server-ts": "^0.1.0",
"@gqlapp/user-server-ts": "^0.1.0",
"@gqlapp/testing-server-ts": "^0.1.0",
"@hofstadter-io/sofa-api": "^0.3.1",
"@loadable/component": "^5.10.1",
"@loadable/server": "^5.9.0",
"@types/compression": "^0.0.36",
Expand Down Expand Up @@ -172,4 +187,4 @@
"rimraf": "^2.6.2",
"ws": "^5.1.1"
}
}
}
2 changes: 0 additions & 2 deletions packages/server/src/modules.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import mailer from '@gqlapp/mailer-server-ts';
import graphqlTypes from '@gqlapp/graphql-types-server-ts';
import authentication from '@gqlapp/authentication-server-ts';
import reports from '@gqlapp/reports-server-ts';
import rest from '@gqlapp/rest-server-ts';
import '@gqlapp/debug-server-ts';

import ServerModule from '@gqlapp/module-server-ts';
Expand All @@ -32,7 +31,6 @@ const modules: ServerModule = new ServerModule(
mailer,
chat,
reports,
rest,
graphqlTypes,
core
);
Expand Down

0 comments on commit f5a2f1d

Please sign in to comment.