Skip to content

4.5.2 #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 20, 2020
Merged

4.5.2 #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ed70b7
Merge branch 'frontierMaster' into develop
joeycozza May 19, 2020
0218080
alphabetized the deps list, and bumped eslint-config-frontier-react a…
joeycozza May 19, 2020
24d3e63
fixing path to snow file for isSnow check
joeycozza May 20, 2020
58bb481
4.5.2 version bump
joeycozza May 20, 2020
0a552c1
Merge branch 'frontierMaster' into develop
joeycozza May 20, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/react-scripts/config/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const imageInlineSizeLimit = parseInt(
const useTypeScript = fs.existsSync(paths.appTsConfig);

// FS - check if snow is installed in root node_modules
const isSnow = fs.existsSync(path.join(paths.appNodeModules, 'snow/package.json'));
const isSnow = fs.existsSync(path.join(paths.appNodeModules, '@fs/snow/package.json'));

// style files regexes
const cssRegex = /\.css$/;
Expand Down
2 changes: 1 addition & 1 deletion packages/react-scripts/config/webpackDevServer.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const path = require('path');
const protocol = process.env.HTTPS === 'true' ? 'https' : 'http';
const host = process.env.HOST || '0.0.0.0';

const isSnow = fs.existsSync(path.join(paths.appNodeModules, 'snow/package.json'));
const isSnow = fs.existsSync(path.join(paths.appNodeModules, '@fs/snow/package.json'));

module.exports = function(proxy, allowedHost) {
return {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-scripts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fs/react-scripts",
"version": "4.5.1",
"version": "4.5.2",
"upstreamVersion": "3.1.1",
"description": "Configuration and scripts for Create React App.",
"repository": {
Expand Down
22 changes: 11 additions & 11 deletions packages/react-scripts/scripts/utils/frontierInit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,36 +31,36 @@ function installFrontierDependencies(appPath, appName, ownPath) {
'@fs/zion-user@3',
'@sentry/browser@5',
'i18next@19',
'react-i18next@11',
'prop-types@15',
'react-i18next@11',
'yup@0.28',
]
)
devDepsToInstall.push(
...[
'@storybook/addon-actions@5',
'@alienfast/i18next-loader@1',
'@fs/eslint-config-frontier-react@5',
'@fs/storybook-addons@4',
'@fs/zion-testing-library@5',
'@storybook/addon-a11y@5',
'@storybook/addon-actions@5',
'@storybook/addon-console@1',
'@storybook/addon-docs@5',
'@storybook/addon-knobs@5',
'@storybook/addon-viewport@5',
'@storybook/addons@5',
"@storybook/preset-create-react-app@1",
'@storybook/preset-create-react-app@2',
'@storybook/react@5',
'@storybook/theming@5',
'@fs/eslint-config-frontier-react@4',
'@fs/storybook-addons@4',
'@fs/zion-testing-library@5',
'eslint@6',
'@alienfast/i18next-loader@1',
'dotenv@8',
'@testing-library/jest-dom@5',
'dotenv@8',
'eslint@6',
'gzip-cli@1',
'http-proxy-middleware@0.20',
'husky@4',
'lint-staged@10',
'suppress-exit-code@0.1',
'source-map-explorer@2',
'gzip-cli@1',
'suppress-exit-code@0.1',
]
)

Expand Down