Skip to content

Commit

Permalink
chore: bump found (router) version
Browse files Browse the repository at this point in the history
  • Loading branch information
Joona Ojapalo committed Aug 30, 2022
1 parent b02b120 commit e582f77
Show file tree
Hide file tree
Showing 6 changed files with 139 additions and 68 deletions.
3 changes: 3 additions & 0 deletions app/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import { getFarceResult } from 'found/server';
import makeRouteConfig from 'found/makeRouteConfig';
import { Resolver } from 'found-relay';
import { Helmet } from 'react-helmet';

// see: https://github.com/relay-tools/react-relay-network-modern#what-if-regeneratorruntime-is-not-defined
import 'regenerator-runtime/runtime';
import {
RelayNetworkLayer,
urlMiddleware,
Expand Down
6 changes: 5 additions & 1 deletion config/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@ const globals = {
i18next: 'i18next',
'moment-timezone': 'moment',
'react-autosuggest': 'Autosuggest',
'react-cookie': 'reactCookie',
'react-select': 'Select',
'react-sortablejs': 'reactSortablejs',
'react-modal': 'ReactModal',
'@babel/runtime/helpers/interopRequireDefault': 'interopRequireDefault',
'@babel/runtime/helpers/inheritsLoose': 'inheritsLoose',
'@hsl-fi/modal': 'Modal',
'@hsl-fi/shimmer': 'Shimmer',
'@hsl-fi/container-spinner': 'ContainerSpinner',
Expand Down Expand Up @@ -50,6 +54,7 @@ const globals = {
'lodash/compact': 'compact',
moment: 'moment',
'react-relay': 'reactRelay',
'prop-types/checkPropTypes': 'checkPropTypes',
};

async function getSortedPackages() {
Expand Down Expand Up @@ -97,7 +102,6 @@ export default async () => {
globals,
},
],
context: 'self',
plugins: [
peerDepsExternal({
packageJsonPath: path.join(__dirname, basePath, 'package.json'),
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@
"fast-xml-parser": "3.17.4",
"fluxible": "1.4.0",
"fluxible-addons-react": "0.2.16",
"found": "0.5.9",
"found-relay": "0.8.2",
"found": "^1.1.1",
"found-relay": "^1.0.2",
"foundation-apps": "1.2.0",
"helmet": "4.1.0",
"hoist-non-react-statics": "^3.3.2",
Expand All @@ -194,7 +194,7 @@
"prop-types": "15.7.2",
"raven": "2.6.4",
"raven-js": "3.27.0",
"react": "16.13.0",
"react": "16.14.0",
"react-autosuggest": "10.0.3",
"react-autowhatever": "10.2.1",
"react-click-outside": "3.0.1",
Expand Down Expand Up @@ -307,6 +307,7 @@
"postcss-flexbugs-fixes": "4.2.1",
"postcss-loader": "4.0.1",
"prettier": "2.1.1",
"proxyquire": "^2.1.3",
"relay-compiler": "^14.1.0",
"rollup": "2.35.1",
"rollup-plugin-babel": "4.4.0",
Expand Down
3 changes: 1 addition & 2 deletions server/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ require('@babel/register')({
global.fetch = require('node-fetch');
const proxy = require('express-http-proxy');

global.self = { fetch: global.fetch };

let Raven;
const devhost = '';

Expand Down Expand Up @@ -161,6 +159,7 @@ function setUpRoutes() {
}

function setUpAvailableRouteTimetables() {
// eslint-disable-next-line compat/compat
return new Promise(resolve => {
// Stores available route pdf names to config.availableRouteTimetables.HSL
// All routes don't have available pdf and some have their timetable inside other route
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ const productionPlugins = [
module.exports = {
mode,
entry: {
main: ['./app/util/publicPath', './app/client'],
main: ['./app/util/publicPath.js', './app/client.js'],
...(isProduction ? themeEntries : {}),
},
output: {
Expand Down
Loading

0 comments on commit e582f77

Please sign in to comment.