Skip to content

Commit 16f24f5

Browse files
authored
Merge pull request #70 from holidayextras/combine_fix_modules
Merge fix-modules branch into master
2 parents d5d24ce + 70b3c1b commit 16f24f5

File tree

15 files changed

+6856
-17030
lines changed

15 files changed

+6856
-17030
lines changed

.babelrc

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
{
2+
"sourceType": "unambiguous",
23
"presets": [
3-
"react",
4-
["env", {
5-
"target": {
4+
"@babel/preset-react",
5+
["@babel/preset-env", {
6+
"targets": {
67
"browsers": [
7-
"not ie <= 8",
8+
"ie >= 9",
89
"last 2 iOS major versions",
910
"last 2 Firefox major versions",
1011
"last 2 Safari major versions",
11-
"> 10% in UK"
12+
"last 2 Chrome major versions"
1213
]
13-
}
14-
}]
14+
}
15+
}]
1516
]
1617
}

.circleci/config.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ references:
1515
defaults: &defaults
1616
working_directory: *workspace_root
1717
docker:
18-
- image: circleci/node:10.14.0
18+
- image: circleci/node:14.17.2
1919

2020
jobs:
2121
initialise:
@@ -52,7 +52,8 @@ jobs:
5252
- ./node_modules/
5353
- run:
5454
name: Run build
55-
command: npm run build
55+
command:
56+
npm run build
5657
- *save_workspace
5758
test:
5859
<<: *defaults

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10
1+
14

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10
1+
14

0 commit comments

Comments
 (0)