Skip to content

Commit 7f4b4fb

Browse files
committed
merge-upstream: Initial merge of upstream/develop. Compiles but very broken.
2 parents e220547 + eaf3902 commit 7f4b4fb

File tree

199 files changed

+55019
-15923
lines changed

Some content is hidden

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

199 files changed

+55019
-15923
lines changed

.circleci/config.yml

-329
This file was deleted.

.eslintignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
node_modules/*
22
build/*
33
dist/*
4-
# Files imported from upstream
4+
test/*
5+
src/examples/*
6+
7+
# Files vendored from upstreams
58
src/addons/addons
69
src/addons/libraries
710
src/addons/api-libraries

.eslintrc.js

+1-1
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)