Skip to content

Commit 6d068db

Browse files
cwillisfcwillisf
committed
Merge branch 'develop' into replace-text-encoding
2 parents edb6a45 + a994d4d commit 6d068db

File tree

242 files changed

+42204
-17779
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

242 files changed

+42204
-17779
lines changed

‎.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"messagesDir": "./translations/messages/"
88
}]],
99
"presets": [
10-
["@babel/preset-env", {"targets": {"browsers": ["last 3 versions", "Safari >= 8", "iOS >= 8"]}}],
10+
"@babel/preset-env",
1111
"@babel/preset-react"
1212
]
1313
}

‎.browserslistrc

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
last 3 versions
2-
Safari >= 8
3-
iOS >= 8
1+
# See https://scratch.mit.edu/faq
2+
Chrome >= 63
3+
Edge >= 15
4+
Firefox >= 57
5+
Safari >= 11
6+
Android >= 63
7+
iOS >= 11

‎.circleci/config.yml

Lines changed: 0 additions & 291 deletions
This file was deleted.

‎.eslintignore

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
node_modules/*
2-
build/*
3-
dist/*
1+
/node_modules/
2+
/build/
3+
/dist/
4+
/test/
5+
/src/examples/

‎.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module.exports = {
2-
extends: ['scratch', 'scratch/node']
2+
extends: ['scratch', 'scratch/node', 'scratch/es6']
33
};

0 commit comments

Comments
 (0)