Skip to content
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.

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

Update Calypso #733

Merged
merged 6 commits into from
Jan 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ references:
nvm install "$NODE_VERSION"
nvm alias default "$NODE_VERSION"
nvm use "$NODE_VERSION"
cp calypso/.nvmrc .
save_nvm: &save_nvm
save_cache:
name: Saving NVM cache
Expand Down Expand Up @@ -200,12 +201,12 @@ references:
jobs:
build:
docker:
- image: circleci/node:10.14.0-browsers
- image: circleci/node:12.13.1-browsers
working_directory: ~/wp-desktop
environment:
CONFIG_ENV: release
MINIFY_JS: true
NODE_ARGS: --max_old_space_size=2048
NODE_ARGS: --max_old_space_size=3072
steps:
- checkout
- *install_linux_dependencies
Expand All @@ -231,7 +232,7 @@ jobs:

linux:
docker:
- image: circleci/node:10.14.0-browsers
- image: circleci/node:12.13.1-browsers
working_directory: ~/wp-desktop
steps:
- checkout
Expand Down
1 change: 0 additions & 1 deletion .nvmrc

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ CURRENT_NODE_VERSION := $(shell node --version | sed -n 's/v\{0,1\}\(.*\)/\1/p')
# Check that the current node & npm versions are the versions Calypso expects to ensure it is built safely.
check-node-version-parity:
ifneq ("$(CALYPSO_NODE_VERSION)", "$(CURRENT_NODE_VERSION)")
$(warning Please ensure that wp-desktop is using NodeJS $(CALYPSO_NODE_VERSION) to match wp-calypso before continuing. Current NodeJS version: $(CURRENT_NODE_VERSION))
$(error Please ensure that wp-desktop is using NodeJS $(CALYPSO_NODE_VERSION) to match wp-calypso before continuing. Current NodeJS version: $(CURRENT_NODE_VERSION))
else
@echo $(GREEN)$(CHECKMARK) Current NodeJS version is on par with Calypso \($(CALYPSO_NODE_VERSION)\) $(RESET)
endif
Expand Down
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const electronVersion = require( 'electron/package.json' ).version;

module.exports = {
presets: [
[ '@babel/env', { targets: { electron: electronVersion } } ],
[ '@babel/env', { targets: { electron: electronVersion }, useBuiltIns: 'usage', corejs: '3.6.1' } ],
'@babel/react',
'@babel/preset-typescript',
],
Expand Down
2 changes: 1 addition & 1 deletion calypso
Submodule calypso updated 7247 files
Loading