Merge branch 'main' into yarn-cache

javascript/.eslintrc.js → .eslintrc.js

@@ -7,14 +7,18 @@
  * @format
  */
 
-const path = require('path');
-
 module.exports = {
   root: true,
-  ignorePatterns: ['binaries/**', 'build/**', 'dist/**', 'tests/generated/**'],
+  ignorePatterns: [
+    '/website',
+    '**/binaries/**',
+    '**/build/**',
+    '**/generated/**',
+  ],
   extends: ['eslint:recommended', 'plugin:prettier/recommended'],
   plugins: ['prettier'],
   rules: {
+    'no-unused-vars': ['error', {argsIgnorePattern: '^_'}],
     'no-var': 'error',
     'prefer-arrow-callback': 'error',
     'prefer-const': 'error',
@@ -26,25 +30,25 @@ module.exports = {
     commonjs: true,
     es2018: true,
   },
+  parserOptions: {
+    sourceType: 'module',
+    ecmaVersion: 'latest',
+  },
   overrides: [
     {
-      files: ['**/*.js'],
-      parser: '@babel/eslint-parser',
-      parserOptions: {
-        babelOptions: {
-          configFile: path.join(__dirname, '.babelrc.js'),
-        },
-      },
-    },
-    {
-      files: ['**/*.ts'],
+      files: ['**/*.ts', '**/*.tsx'],
       extends: ['plugin:@typescript-eslint/recommended'],
       parser: '@typescript-eslint/parser',
       parserOptions: {
-        project: path.join(__dirname, 'tsconfig.json'),
+        project: true,
       },
       plugins: ['@typescript-eslint'],
       rules: {
+        '@typescript-eslint/ban-ts-comment': 'off',
+        '@typescript-eslint/no-unused-vars': [
+          'error',
+          {argsIgnorePattern: '^_'},
+        ],
         '@typescript-eslint/no-var-requires': 'off',
       },
     },
@@ -55,7 +59,7 @@ module.exports = {
       },
     },
     {
-      files: ['jest.*', 'tests/**'],
+      files: ['jest.*', '**/tests/**'],
       env: {
         node: true,
       },

.github/actions/setup-cpp/action.yml

@@ -1,4 +1,9 @@
 name: Setup C++ envirionment
+inputs:
+  toolchain:
+    description: Compiler toolchain to use (Clang, GCC, or MSVC)
+    required: false
+    default: 'Clang'
 
 runs:
   using: "composite"
@@ -7,6 +12,20 @@ runs:
       if: ${{ runner.os != 'Windows' }}
       uses: ./.github/actions/install-ninja
 
+    - name: Set Clang as compiler
+      if: ${{ inputs.toolchain == 'Clang' }}
+      shell: bash
+      run: |
+        echo "CC=/usr/bin/clang" >> $GITHUB_ENV
+        echo "CXX=/usr/bin/clang++" >> $GITHUB_ENV
+
+    - name: Set GCC as compiler
+      if: ${{ inputs.toolchain == 'GCC' }}
+      shell: bash
+      run: |
+        echo "CC=/usr/bin/gcc" >> $GITHUB_ENV
+        echo "CXX=/usr/bin/g++" >> $GITHUB_ENV
+
     - name: Setup VS Developer Command Prompt
       if: ${{ runner.os == 'Windows' }}
       uses: ilammy/msvc-dev-cmd@v1

.github/workflows/validate-cpp.yml

@@ -12,34 +12,38 @@ env:
 
 jobs:
   test:
-    name: Build and Test [${{ matrix.os }}][${{ matrix.mode }}]
-    runs-on: ${{ matrix.os }}
+    name: Build and Test [${{ matrix.toolchain }}][${{ matrix.mode }}]
+    runs-on: ${{ (matrix.toolchain == 'MSVC') && 'windows-latest' || 'ubuntu-latest'  }}
     strategy:
       matrix:
         mode: [Debug, Release]
-        os: [ubuntu-latest] # TODO: fix issues building GTest Binary with MSVC in GitHub Actions
+        toolchain: [Clang, GCC] # TODO: fix issues building GTest Binary with MSVC in GitHub Actions
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Setup
         uses: ./.github/actions/setup-cpp
+        with:
+          toolchain: ${{ matrix.toolchain }}
 
       - name: Unit tests
         run: ./unit_tests ${{ matrix.mode }}
 
   benchmark:
-    name: Benchmark [${{ matrix.os }}]
-    runs-on: ${{ matrix.os }}
+    name: Benchmark [${{ matrix.toolchain }}]
+    runs-on: ${{ (matrix.toolchain == 'MSVC') && 'windows-latest' || 'ubuntu-latest'  }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        toolchain: [Clang, GCC, MSVC]
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Setup
         uses: ./.github/actions/setup-cpp
+        with:
+          toolchain: ${{ matrix.toolchain }}
 
       - name: Build benchmark
         run: |
@@ -60,5 +64,3 @@ jobs:
 
       - name: clang-format
         uses: ./.github/actions/clang-format
-        with:
-          directory: ./yoga

.github/workflows/validate-js.yml

@@ -60,17 +60,29 @@ jobs:
         working-directory: javascript
 
   lint:
-    name: Lint
+    name: ESLint (All Packages)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
 
       - name: yarn install
         run: yarn install --frozen-lockfile
-        working-directory: javascript
 
       - name: yarn lint
         run: yarn lint
+
+  typecheck:
+    name: Typecheck
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: yarn install
+        run: yarn install --frozen-lockfile
+        working-directory: javascript
+
+      - name: yarn tsc
+        run: yarn tsc
         working-directory: javascript
 
   pack:

.github/workflows/validate-swiftpm.yml

@@ -0,0 +1,22 @@
+name: Swift
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  test:
+    name: Build
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Build Debug
+        run: swift build -c debug
+
+      - name: Build Release
+        run: swift build -c release

.github/workflows/validate-website-next.yml

@@ -0,0 +1,41 @@
+name: Website (Next)
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-js
+
+      - name: Build Yoga
+        run: yarn build
+        working-directory: javascript
+
+      - name: Build Website
+        run: yarn build
+        working-directory: website-next
+
+  typecheck:
+    name: Typecheck
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: yarn install
+        run: yarn install --frozen-lockfile
+        working-directory: javascript
+
+      - name: yarn tsc
+        run: yarn tsc
+        working-directory: website-next

.github/workflows/validate-website.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    name: Build
+    name: Build [Gatsby]
     runs-on: ubuntu-20.04
 
     steps:
@@ -21,3 +21,21 @@ jobs:
       - name: yarn build
         run: yarn build
         working-directory: website
+
+  build_next:
+    name: Build [Docusaurus]
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-js
+
+      - name: Build Yoga
+        run: yarn build
+        working-directory: javascript
+
+      - name: Build Website
+        run: yarn build
+        working-directory: website-next

.prettierignore

@@ -0,0 +1,3 @@
+**/binaries/**
+**/build/**
+**/generated/**

Package.swift

@@ -0,0 +1,32 @@
+// swift-tools-version:5.0
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+
+import PackageDescription
+
+let package = Package(
+    name: "yoga",
+    products: [
+        .library(name: "yoga", targets: [ "core" ])
+    ],
+    targets: [
+        .target(
+            name: "core",
+            path: ".",
+            sources: [
+                "yoga"
+            ],
+            publicHeadersPath: ".",
+            cxxSettings: [
+                .headerSearchPath(".")
+            ]
+        )
+    ],
+    cxxLanguageStandard: CXXLanguageStandard(rawValue: "c++17")
+)

Yoga.podspec

@@ -35,7 +35,14 @@ Pod::Spec.new do |spec|
       '-std=c++17',
       '-fPIC'
   ]
-  spec.source_files = 'yoga/**/*.{h,cpp}'
-  spec.public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
+
   spec.swift_version = '5.1'
+  spec.source_files = 'yoga/**/*.{h,cpp}'
+  spec.header_mappings_dir = 'yoga'
+
+  public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
+  spec.public_header_files = public_header_files
+
+  all_header_files = 'yoga/**/*.h'
+  spec.private_header_files = Dir.glob(all_header_files) - Dir.glob(public_header_files)
 end

enums.py

@@ -52,8 +52,6 @@
         "WebFlexBasis",
         # Conformance fix: https://github.com/facebook/yoga/pull/1028
         "AbsolutePercentageAgainstPaddingEdge",
-        # fix JNI local ref overflows
-        "FixJNILocalRefOverflows",
     ],
     "PrintOptions": [
         ("Layout", 1 << 0),