Permalink
Browse files

Sync with internal: Update to MIT LICENSE, fix lint errors

Summary:

Test Plan:

Reviewers:

Subscribers:

Tasks:

Tags:
  • Loading branch information...
jrwats committed Dec 19, 2018
1 parent d4f37cb commit f9911c296bf2ea294fcb3db416e5e10b5f5a6129
@@ -1,8 +1,7 @@
node_modules
node_modules/*
yarn.lock
yarn-error.log

demo-app/.flowconfig
demo-app/yarn-error.log
demo-app/yarn.lock
demo-app/output
44 LICENSE
@@ -1,31 +1,21 @@
BSD License
MIT License

For fbt software
Copyright (c) Facebook, Inc. and its affiliates.

Copyright (c) 2013-present, Facebook, Inc.
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name Facebook nor the names of its contributors may be used to
endorse or promote products derived from this software without specific
prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
@@ -1,4 +1,6 @@
module.exports = require("babel-jest").createTransformer({
// Copyright 2004-present Facebook. All Rights Reserved.

module.exports = require('babel-jest').createTransformer({
plugins:[
'@babel/plugin-proposal-class-properties',
'@babel/plugin-proposal-object-rest-spread',
@@ -9,8 +9,8 @@
"modulePaths": [
"src",
"src/example",
"../runtime",
"../runtime/FbtNumber",
"../runtime/shared",
"../runtime/shared/FbtNumber",
"../runtime/nonfb",
"../runtime/nonfb/mocks",
"node_modules"
@@ -3,13 +3,13 @@
"name": "fbt-example",
"version": "1.0.0",
"main": "index.js",
"license": "BSD-3-Clause",
"license": "MIT",
"scripts": {
"build": "babel-node ../node_modules/webpack/bin/webpack",
"collect-fbts": "babel-node ../transform/babel-plugin-fbt/bin/collectFBT --hash-module './tigerTexts.js' --json-input < src-manifest.json > source_strings.json",
"collect-fbts": "babel-node ../transform/babel-plugin-fbt/bin/collectFBT --json-input < src-manifest.json > source_strings.json",
"translate-fbts": "babel-node ../transform/babel-plugin-fbt/bin/translate.js --jenkins < ./translation_input.json > src/translatedFbts.json",
"start": "babel-node ../node_modules/webpack-dev-server/bin/webpack-dev-server --open",
"test": "babel-node ../node_modules/jest/bin/jest --config ./jest.config.json"
"test": "babel-node ../node_modules/jest/bin/jest --config ./jest.config.json"
},
"devDependencies": {
"@babel/core": "7.2.2",
@@ -1,39 +1,50 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates. All rights reserved.
* @format
*/

html {
font: 12px / 1.34 'Segoe UI', -apple-system, system-ui, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', sans-serif;
font: 12px / 1.34 'Segoe UI', -apple-system, system-ui, 'Apple Color Emoji',
'Segoe UI Emoji', 'Segoe UI Symbol', sans-serif;
height: 100%;
}

html:lang(ar) {
font-family: 'Segoe UI', -apple-system, system-ui, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Segoe UI Regular Arabic', sans-serif;
font-family: 'Segoe UI', -apple-system, system-ui, 'Apple Color Emoji',
'Segoe UI Emoji', 'Segoe UI Symbol', 'Segoe UI Regular Arabic', sans-serif;
}

html:lang(hi) {
font-family: 'Segoe UI', -apple-system, system-ui, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Nirmala UI', sans-serif;
font-family: 'Segoe UI', -apple-system, system-ui, 'Apple Color Emoji',
'Segoe UI Emoji', 'Segoe UI Symbol', 'Nirmala UI', sans-serif;
}

html:lang(ja) {
font-family: 'Segoe UI', -apple-system, system-ui, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Yu Gothic UI', YuGothic, 'Meiryo UI', Meiryo, 'MS Pgothic', Osaka, sans-serif;
font-family: 'Segoe UI', -apple-system, system-ui, 'Apple Color Emoji',
'Segoe UI Emoji', 'Segoe UI Symbol', 'Yu Gothic UI', YuGothic, 'Meiryo UI',
Meiryo, 'MS Pgothic', Osaka, sans-serif;
}

html:lang(ko) {
font-family: 'Segoe UI', -apple-system, system-ui, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Malgun Gothic', Gulim, sans-serif;
font-family: 'Segoe UI', -apple-system, system-ui, 'Apple Color Emoji',
'Segoe UI Emoji', 'Segoe UI Symbol', 'Malgun Gothic', Gulim, sans-serif;
}

html:lang(zh-Hans) {
font-family: 'Segoe UI', -apple-system, system-ui, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Microsoft Yahei UI', 'Microsoft Yahei', Verdana, Simsun, sans-serif;
font-family: 'Segoe UI', -apple-system, system-ui, 'Apple Color Emoji',
'Segoe UI Emoji', 'Segoe UI Symbol', 'Microsoft Yahei UI', 'Microsoft Yahei',
Verdana, Simsun, sans-serif;
}

html:lang(zh-Hant) {
font-family: 'Segoe UI', -apple-system, system-ui, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Microsoft Jhenghei UI', 'Microsoft Jhenghei', Pmingliu, sans-serif;
font-family: 'Segoe UI', -apple-system, system-ui, 'Apple Color Emoji',
'Segoe UI Emoji', 'Segoe UI Symbol', 'Microsoft Jhenghei UI',
'Microsoft Jhenghei', Pmingliu, sans-serif;
}

body {
background: #fff;
color: #1d2129;
background: '#fff';
color: '#1d2129';
direction: ltr;
font-variant: common-ligatures;
height: 100%;
@@ -44,7 +55,7 @@ body {
unicode-bidi: embed;
}

html:lang(ar) body {
body.rtl {
direction: rtl;
}

@@ -2,11 +2,11 @@
* Copyright 2004-present Facebook. All Rights Reserved.
*/
const Example$FbtEnum = {
LINK: "link",
PAGE: "page",
PHOTO: "photo",
POST: "post",
VIDEO: "video",
LINK: 'link',
PAGE: 'page',
PHOTO: 'photo',
POST: 'post',
VIDEO: 'video',
};

module.exports = Example$FbtEnum;
Oops, something went wrong.

0 comments on commit f9911c2

Please sign in to comment.