From a8116663f32194b6cd8ca1b071f6068ca9b522a0 Mon Sep 17 00:00:00 2001 From: William Candillon Date: Wed, 28 Aug 2024 15:48:47 +0200 Subject: [PATCH] Make root package private (#2594) --- .github/workflows/android-ubuntu.yml | 12 +- .github/workflows/android.yml | 16 +- .github/workflows/build-npm.yml | 9 +- .github/workflows/build-skia.yml | 76 +++--- .github/workflows/docs.yml | 1 + .github/workflows/ios-build.yml | 14 +- .github/workflows/tests.yml | 18 +- README.md | 1 + package.json | 31 +-- package/package.json | 19 +- .../scripts}/build-skia-android.ts | 2 +- .../scripts}/build-skia-ios-framework.ts | 17 +- .../scripts}/build-skia-ios.ts | 2 +- {scripts => package/scripts}/build-skia.ts | 9 +- package/scripts/copy-skia-module-headers.ts | 38 +++ .../scripts}/skia-configuration.ts | 6 +- {scripts => package/scripts}/utils.ts | 7 +- .../scripts}/workflow-copy-libs.ts | 5 +- package/tsconfig.json | 3 +- package/yarn.lock | 100 +++++++- scripts/copy-skia-module-headers.ts | 38 --- tsconfig.json | 106 -------- yarn.lock | 229 ------------------ 23 files changed, 264 insertions(+), 495 deletions(-) rename {scripts => package/scripts}/build-skia-android.ts (89%) rename {scripts => package/scripts}/build-skia-ios-framework.ts (72%) rename {scripts => package/scripts}/build-skia-ios.ts (89%) rename {scripts => package/scripts}/build-skia.ts (96%) create mode 100644 package/scripts/copy-skia-module-headers.ts rename {scripts => package/scripts}/skia-configuration.ts (98%) rename {scripts => package/scripts}/utils.ts (94%) rename {scripts => package/scripts}/workflow-copy-libs.ts (93%) delete mode 100644 scripts/copy-skia-module-headers.ts delete mode 100644 tsconfig.json delete mode 100644 yarn.lock diff --git a/.github/workflows/android-ubuntu.yml b/.github/workflows/android-ubuntu.yml index e2f9055f1b..8164ceb385 100644 --- a/.github/workflows/android-ubuntu.yml +++ b/.github/workflows/android-ubuntu.yml @@ -25,6 +25,7 @@ jobs: - uses: actions/setup-node@v3 with: cache: 'yarn' + cache-dependency-path: package/yarn.lock - name: Set up JDK 11 uses: actions/setup-java@v1 @@ -40,7 +41,8 @@ jobs: - name: Set ANDROID_NDK run: echo "ANDROID_NDK=$ANDROID_HOME/ndk-bundle" >> $GITHUB_ENV - - name: Install root node dependencies + - name: Install Package + working-directory: package run: yarn - name: Download Skia Binary Artifacts @@ -48,22 +50,20 @@ jobs: with: workflow: "build-skia.yml" repo: shopify/react-native-skia - path: artifacts + path: package/artifacts branch: main - name: Copy Artifacts to libs folder + working-directory: package run: yarn workflow-copy-libs - name: Copy Skia Headers + working-directory: package run: yarn copy-skia-headers - name: SDKs - accept licenses run: yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses - - name: Install Package - working-directory: package - run: yarn install - # Install node dependencies in specified directories using matrix - name: Install app node dependencies working-directory: ${{ matrix.directory }} diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 4a998d3354..1aec46c6a7 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -25,6 +25,7 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 16 + cache-dependency-path: package/yarn.lock cache: 'yarn' - name: Set up JDK 11 @@ -41,30 +42,29 @@ jobs: - name: Set ANDROID_NDK run: echo "ANDROID_NDK=$ANDROID_HOME/ndk-bundle" >> $GITHUB_ENV - - name: Install root node dependencies - run: yarn + - name: Install Package + working-directory: package + run: yarn install - name: Download Skia Binary Artifacts uses: dawidd6/action-download-artifact@v2 with: workflow: "build-skia.yml" repo: shopify/react-native-skia - path: artifacts + path: package/artifacts branch: main - name: Copy Artifacts to libs folder + working-directory: package run: yarn workflow-copy-libs - name: Copy Skia Headers + working-directory: package run: yarn copy-skia-headers - name: SDKs - accept licenses run: y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses - - name: Install Package - working-directory: package - run: yarn install - - name: Install example app node dependencies working-directory: ${{ matrix.working-directory }} run: yarn @@ -114,9 +114,11 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 16 + cache-dependency-path: package/yarn.lock cache: 'yarn' - name: Install root dependencies + working-directory: package run: yarn bootstrap - name: Restore APK diff --git a/.github/workflows/build-npm.yml b/.github/workflows/build-npm.yml index ed81f8ed43..25fc4578c8 100644 --- a/.github/workflows/build-npm.yml +++ b/.github/workflows/build-npm.yml @@ -18,11 +18,8 @@ jobs: - uses: actions/setup-node@v3 with: node-version: "lts/*" + cache-dependency-path: package/yarn.lock cache: 'yarn' - cache-dependency-path: 'package/yarn.lock' - - - name: Install root node dependencies - run: yarn - name: Install package dependencies working-directory: package @@ -32,13 +29,15 @@ jobs: uses: dawidd6/action-download-artifact@v2 with: workflow: "build-skia.yml" - path: artifacts + path: package/artifacts branch: main - name: Copy Artifacts to libs folder + working-directory: package run: yarn workflow-copy-libs - name: Copy Skia Headers + working-directory: package run: yarn copy-skia-headers - name: Build NPM Package diff --git a/.github/workflows/build-skia.yml b/.github/workflows/build-skia.yml index bc53726a30..08a9cf31d4 100644 --- a/.github/workflows/build-skia.yml +++ b/.github/workflows/build-skia.yml @@ -4,7 +4,7 @@ jobs: build: runs-on: macos-latest env: - WORKING_DIRECTORY: ./ + WORKING_DIRECTORY: ./package steps: - name: checkout uses: actions/checkout@v2 @@ -23,13 +23,15 @@ jobs: - name: Setup Nodejs and npm uses: actions/setup-node@v3 with: + cache-dependency-path: package/yarn.lock cache: yarn - name: Install root node dependencies + working-directory: ${{ env.WORKING_DIRECTORY }} run: yarn - name: Build Skia - working-directory: ${{ env.WORKING_DIRECTORY }}/ + working-directory: ${{ env.WORKING_DIRECTORY }} env: ANDROID_NDK: ${{ steps.setup-ndk.outputs.ndk-path }} run: yarn build-skia @@ -40,13 +42,13 @@ jobs: with: name: skia-android-arm path: | - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm/libskia.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm/libskshaper.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm/libsvg.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm/libskottie.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm/libsksg.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm/libskparagraph.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm/libskunicode.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm/libskia.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm/libskshaper.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm/libsvg.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm/libskottie.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm/libsksg.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm/libskparagraph.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm/libskunicode.a - name: Upload artifacts - Android arm64 if: github.ref == 'refs/heads/main' @@ -54,13 +56,13 @@ jobs: with: name: skia-android-arm-64 path: | - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm64/libskia.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm64/libskshaper.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm64/libsvg.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm64/libskottie.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm64/libsksg.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm64/libskparagraph.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/arm64/libskunicode.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm64/libskia.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm64/libskshaper.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm64/libsvg.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm64/libskottie.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm64/libsksg.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm64/libskparagraph.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/arm64/libskunicode.a - name: Upload artifacts - Android x86 if: github.ref == 'refs/heads/main' @@ -68,13 +70,13 @@ jobs: with: name: skia-android-arm-x86 path: | - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x86/libskia.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x86/libskshaper.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x86/libsvg.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x86/libskottie.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x86/libsksg.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x86/libskparagraph.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x86/libskunicode.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x86/libskia.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x86/libskshaper.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x86/libsvg.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x86/libskottie.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x86/libsksg.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x86/libskparagraph.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x86/libskunicode.a - name: Upload artifacts - Android x64 if: github.ref == 'refs/heads/main' @@ -82,13 +84,13 @@ jobs: with: name: skia-android-arm-x64 path: | - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x64/libskia.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x64/libskshaper.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x64/libsvg.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x64/libskottie.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x64/libsksg.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x64/libskparagraph.a - ${{ env.WORKING_DIRECTORY }}/externals/skia/out/android/x64/libskunicode.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x64/libskia.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x64/libskshaper.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x64/libsvg.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x64/libskottie.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x64/libsksg.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x64/libskparagraph.a + ${{ env.WORKING_DIRECTORY }}/../externals/skia/out/android/x64/libskunicode.a - name: Upload artifacts - iOS xcframeworks if: github.ref == 'refs/heads/main' @@ -96,10 +98,10 @@ jobs: with: name: skia-ios-xcframeworks path: | - ${{ env.WORKING_DIRECTORY }}/package/libs/ios/libskia.xcframework - ${{ env.WORKING_DIRECTORY }}/package/libs/ios/libskshaper.xcframework - ${{ env.WORKING_DIRECTORY }}/package/libs/ios/libsvg.xcframework - ${{ env.WORKING_DIRECTORY }}/package/libs/ios/libskottie.xcframework - ${{ env.WORKING_DIRECTORY }}/package/libs/ios/libsksg.xcframework - ${{ env.WORKING_DIRECTORY }}/package/libs/ios/libskparagraph.xcframework - ${{ env.WORKING_DIRECTORY }}/package/libs/ios/libskunicode.xcframework + ${{ env.WORKING_DIRECTORY }}/../package/libs/ios/libskia.xcframework + ${{ env.WORKING_DIRECTORY }}/../package/libs/ios/libskshaper.xcframework + ${{ env.WORKING_DIRECTORY }}/../package/libs/ios/libsvg.xcframework + ${{ env.WORKING_DIRECTORY }}/../package/libs/ios/libskottie.xcframework + ${{ env.WORKING_DIRECTORY }}/../package/libs/ios/libsksg.xcframework + ${{ env.WORKING_DIRECTORY }}/../package/libs/ios/libskparagraph.xcframework + ${{ env.WORKING_DIRECTORY }}/../package/libs/ios/libskunicode.xcframework diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 4c0c7e794e..19c64428cd 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -22,6 +22,7 @@ jobs: cache: yarn - name: Install dependencies + working-directory: package run: yarn bootstrap - name: Build Documentation diff --git a/.github/workflows/ios-build.yml b/.github/workflows/ios-build.yml index a71a4f3f31..4f2c43fd9c 100644 --- a/.github/workflows/ios-build.yml +++ b/.github/workflows/ios-build.yml @@ -27,28 +27,28 @@ jobs: - uses: actions/setup-node@v3 with: + cache-dependency-path: package/yarn.lock cache: 'yarn' - - name: Install root node dependencies - run: yarn + - name: Install Package + working-directory: package + run: yarn install --frozen-lockfile - name: Download Skia Binary Artifacts uses: dawidd6/action-download-artifact@v2 with: workflow: "build-skia.yml" repo: shopify/react-native-skia - path: artifacts + path: package/artifacts branch: main - name: Copy Artifacts to libs folder + working-directory: package run: yarn workflow-copy-libs - name: Copy Skia Headers - run: yarn copy-skia-headers - - - name: Install Package working-directory: package - run: yarn install --frozen-lockfile + run: yarn copy-skia-headers - name: Install app node_modules working-directory: ${{ matrix.working-directory }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 77c7dcba33..e0941dc279 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,35 +27,45 @@ jobs: run: sudo apt-get install -y clang-format - name: Run clang-format-ios + working-directory: package run: yarn clang-format-ios --dry-run --Werror - name: Run clang-format-android + working-directory: package run: yarn clang-format-android --dry-run --Werror - name: Run clang-format-common + working-directory: package run: yarn clang-format-common --dry-run --Werror - uses: actions/setup-node@v3 with: + cache-dependency-path: package/yarn.lock cache: 'yarn' - name: Install root node dependencies + working-directory: package run: yarn install --frozen-lockfile - name: Typecheck the build scripts + working-directory: package run: yarn tsc - name: Install Package - run: cd package; yarn install --frozen-lockfile + working-directory: package + run: yarn install --frozen-lockfile - name: Lint Package - run: cd package; yarn lint; + working-directory: package + run: yarn lint; - name: TypeScript Package - run: cd package; yarn tsc; + working-directory: package + run: yarn tsc; - name: Run Package Unit tests - run: cd package; yarn test; + working-directory: package + run: yarn test; - name: Install Example/Fabric Example run: cd ${{ matrix.directory }}; yarn install --frozen-lockfile diff --git a/README.md b/README.md index fbe6a00f6d..2a399a49e8 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,7 @@ And then the _SDK Location_ section. It will show you the NDK path, or the optio ### Building +- Go to the package folder `cd package` - Install dependencies `yarn bootstrap` - Build the Skia libraries with `yarn build-skia` (this can take a while) - Copy Skia headers `yarn copy-skia-headers` diff --git a/package.json b/package.json index 07de86c0d2..3b019b4040 100644 --- a/package.json +++ b/package.json @@ -1,36 +1,7 @@ { "name": "react-native-skia-dev-tools", "version": "1.0.0", - "description": "## Getting started", - "main": "index.js", - "directories": { - "example": "example" - }, - "devDependencies": { - "@types/node": "16.11.7", - "clang-format": "1.6.0", - "rimraf": "3.0.2", - "ts-node": "10.4.0", - "typescript": "5.3.3" - }, - "scripts": { - "build-skia-ios-framework": "ts-node ./scripts/build-skia-ios-framework.ts", - "build-skia-ios": "ts-node ./scripts/build-skia-ios.ts && yarn build-skia-ios-framework", - "build-skia-android": "ts-node ./scripts/build-skia-android.ts", - "build-skia": "yarn build-skia-ios && yarn build-skia-android", - "clean-skia": "yarn rimraf ./package/libs && yarn rimraf ./externals/skia/out", - "copy-skia-include-headers": "yarn rimraf ./package/cpp/skia/include/ && cp -a ./externals/skia/include/. ./package/cpp/skia/include", - "copy-skia-module-headers": "ts-node ./scripts/copy-skia-module-headers.ts", - "copy-skia-headers": "yarn copy-skia-include-headers && yarn copy-skia-module-headers", - "build": "yarn build-skia && yarn copy-skia-headers", - "clang-format": "yarn clang-format-ios && yarn clang-format-android && yarn clang-format-common", - "clang-format-ios": "find package/ios/ -iname *.h -o -iname *.mm -o -iname *.cpp | xargs clang-format -i", - "clang-format-android": "find package/android/cpp/ -iname *.h -o -iname *.m -o -iname *.cpp | xargs clang-format -i", - "clang-format-common": "find package/cpp/ -iname *.h -o -iname *.m -o -iname *.cpp | xargs clang-format -i", - "workflow-copy-libs": "yarn ts-node ./scripts/workflow-copy-libs.ts", - "bootstrap": "yarn && cd ./package && yarn && cd .. && cd ./example && yarn && cd .. && cd ./fabricexample && yarn && cd ..", - "cpplint": "cpplint --linelength=230 --filter=-legal/copyright,-whitespace/indent,-whitespace/comments,-whitespace/ending_newline,-build/include_order,-runtime/references,-readability/todo,-whitespace/blank_line,-whitespace/todo,-runtime/int,-build/c++11,-whitespace/parens --exclude=package/cpp/skia --exclude=package/ios --exclude=package/android/build --exclude=package/node_modules --recursive package" - }, + "private": true, "license": "MIT", "licenseFilename": "LICENSE.md", "readmeFilename": "README.md", diff --git a/package/package.json b/package/package.json index b1e7485a07..03d08c589c 100644 --- a/package/package.json +++ b/package/package.json @@ -49,7 +49,22 @@ "test": "jest", "e2e": "E2E=true yarn test -i e2e", "build": "bob build && merge-dirs lib/typescript/src lib/commonjs && merge-dirs lib/typescript/src lib/module", - "release": "semantic-release" + "release": "semantic-release", + "build-skia-ios-framework": "ts-node ./scripts/build-skia-ios-framework.ts", + "build-skia-ios": "ts-node ./scripts/build-skia-ios.ts && yarn build-skia-ios-framework", + "build-skia-android": "ts-node ./scripts/build-skia-android.ts", + "clean-skia": "yarn rimraf ./libs && yarn rimraf ../externals/skia/out", + "copy-skia-include-headers": "yarn rimraf ./cpp/skia/include/ && cp -a ../externals/skia/include/. ./cpp/skia/include", + "copy-skia-module-headers": "ts-node ./scripts/copy-skia-module-headers.ts", + "copy-skia-headers": "yarn copy-skia-include-headers && yarn copy-skia-module-headers", + "build-skia": "yarn build-skia-ios && yarn build-skia-android && yarn copy-skia-headers", + "clang-format": "yarn clang-format-ios && yarn clang-format-android && yarn clang-format-common", + "clang-format-ios": "find ios/ -iname *.h -o -iname *.mm -o -iname *.cpp | xargs clang-format -i", + "clang-format-android": "find android/cpp/ -iname *.h -o -iname *.m -o -iname *.cpp | xargs clang-format -i", + "clang-format-common": "find cpp/ -iname *.h -o -iname *.m -o -iname *.cpp | xargs clang-format -i", + "workflow-copy-libs": "yarn ts-node ./scripts/workflow-copy-libs.ts", + "bootstrap": "yarn && cd .. && cd ./example && yarn && cd .. && cd ./fabricexample && yarn && cd ..", + "cpplint": "cpplint --linelength=230 --filter=-legal/copyright,-whitespace/indent,-whitespace/comments,-whitespace/ending_newline,-build/include_order,-runtime/references,-readability/todo,-whitespace/blank_line,-whitespace/todo,-runtime/int,-build/c++11,-whitespace/parens --exclude=package/cpp/skia --exclude=package/ios --exclude=package/android/build --exclude=package/node_modules --recursive package" }, "repository": { "type": "git", @@ -106,7 +121,9 @@ "react-native": "0.72.6", "react-native-builder-bob": "0.18.2", "react-native-reanimated": "3.6.2", + "rimraf": "3.0.2", "ts-jest": "29.1.1", + "ts-node": "^10.9.2", "typescript": "5.1.6", "ws": "8.18.0" }, diff --git a/scripts/build-skia-android.ts b/package/scripts/build-skia-android.ts similarity index 89% rename from scripts/build-skia-android.ts rename to package/scripts/build-skia-android.ts index f3a78e05b6..3591effc95 100644 --- a/scripts/build-skia-android.ts +++ b/package/scripts/build-skia-android.ts @@ -13,5 +13,5 @@ Object.keys(configuration.targets).forEach((targetKey) => { }); executeCmd(command, "Android", () => { - console.log(`Done building skia for Android.`); + console.log("Done building skia for Android."); }); diff --git a/scripts/build-skia-ios-framework.ts b/package/scripts/build-skia-ios-framework.ts similarity index 72% rename from scripts/build-skia-ios-framework.ts rename to package/scripts/build-skia-ios-framework.ts index cdf1739c4b..2bc4732760 100644 --- a/scripts/build-skia-ios-framework.ts +++ b/package/scripts/build-skia-ios-framework.ts @@ -1,4 +1,3 @@ -/* eslint-disable max-len */ import { configurations } from "./skia-configuration"; import { executeCmdSync, checkFileExists } from "./utils"; @@ -21,9 +20,9 @@ console.log("Checking prerequisites..."); Object.keys(configurations.ios.targets).forEach((targetKey) => { configurations.ios.outputNames.forEach((out) => { checkFileExists( - `package/libs/ios/${targetKey}/${out}`, - `package/libs/ios/${targetKey}/${out}`, - `package/libs/ios/${targetKey}/${out} not found` + `libs/ios/${targetKey}/${out}`, + `libs/ios/${targetKey}/${out}`, + `libs/ios/${targetKey}/${out} not found` ); }); }); @@ -36,7 +35,7 @@ console.log("Building fat binary for iphone simulator"); configurations.ios.outputNames.forEach((out) => { console.log(`Building fat binary for simulator for file ${out}`); executeCmdSync( - `lipo -create package/libs/ios/x64/${out} package/libs/ios/arm64-iphonesimulator/${out} -output package/libs/ios/${ + `lipo -create libs/ios/x64/${out} libs/ios/arm64-iphonesimulator/${out} -output libs/ios/${ out.split(".")[0] }.a` ); @@ -51,10 +50,10 @@ configurations.ios.outputNames.forEach((out) => { executeCmdSync(`rm -rf ./package/libs/ios/${libName}.xcframework`); executeCmdSync( "xcodebuild -create-xcframework " + - `-library ./package/libs/ios/${libName}.a ` + - `-library ./package/libs/ios/arm64-iphoneos/${libName}.a ` + - ` -output ./package/libs/ios/${libName}.xcframework ` + `-library libs/ios/${libName}.a ` + + `-library libs/ios/arm64-iphoneos/${libName}.a ` + + ` -output libs/ios/${libName}.xcframework ` ); }); -console.log("Frameworks successfully built."); \ No newline at end of file +console.log("Frameworks successfully built."); diff --git a/scripts/build-skia-ios.ts b/package/scripts/build-skia-ios.ts similarity index 89% rename from scripts/build-skia-ios.ts rename to package/scripts/build-skia-ios.ts index 20bab85771..6166000d76 100644 --- a/scripts/build-skia-ios.ts +++ b/package/scripts/build-skia-ios.ts @@ -13,5 +13,5 @@ Object.keys(configuration.targets).forEach((targetKey) => { }); executeCmd(command, "iOS", () => { - console.log(`Done building skia for iOS.`); + console.log("Done building skia for iOS."); }); diff --git a/scripts/build-skia.ts b/package/scripts/build-skia.ts similarity index 96% rename from scripts/build-skia.ts rename to package/scripts/build-skia.ts index 9674c9c21a..b1c9e05a9a 100644 --- a/scripts/build-skia.ts +++ b/package/scripts/build-skia.ts @@ -1,8 +1,10 @@ -import { executeCmd, executeCmdSync } from "./utils"; import { exit } from "process"; -import { commonArgs, configurations, PlatformName } from "./skia-configuration"; import { existsSync, mkdirSync } from "fs"; +import { executeCmd, executeCmdSync } from "./utils"; +import type { PlatformName } from "./skia-configuration"; +import { commonArgs, configurations } from "./skia-configuration"; + const typedKeys = (obj: T) => Object.keys(obj) as (keyof T)[]; /** @@ -49,7 +51,7 @@ if (process.argv.length !== 4) { } const currentDir = process.cwd(); -const SkiaDir = "./externals/skia"; +const SkiaDir = "../externals/skia"; const SelectedPlatform = (process.argv[2] as PlatformName) ?? ""; const SelectedTarget = process.argv[3] ?? ""; @@ -102,6 +104,7 @@ const configurePlatform = (platform: PlatformName, targetName: string) => { target.options?.reduce((a, cur) => (a += `--${cur[0]}=${cur[1]} `), "") || ""; + // eslint-disable-next-line max-len const command = `${commandline} ${options} ${targetOptions} --script-executable=python3 --args='target_os="${platform}" target_cpu="${target.cpu}" ${common}${args}${targetArgs}'`; console.log("Command:"); console.log(command); diff --git a/package/scripts/copy-skia-module-headers.ts b/package/scripts/copy-skia-module-headers.ts new file mode 100644 index 0000000000..b3c2091f4f --- /dev/null +++ b/package/scripts/copy-skia-module-headers.ts @@ -0,0 +1,38 @@ +import { executeCmdSync } from "./utils"; + +const copyModule = (module: string) => [ + `mkdir -p ./cpp/skia/modules/${module}/include`, + `cp -a ../externals/skia/modules/${module}/include/. ./cpp/skia/modules/${module}/include`, +]; + +[ + "yarn rimraf ./cpp/skia/modules/", + ...copyModule("svg"), + ...copyModule("skresources"), + ...copyModule("skparagraph"), + "cp -a ../externals/skia/modules/skcms/. ./cpp/skia/modules/skcms", + "mkdir -p ./cpp/skia/src/", + "mkdir -p ./cpp/skia/src/core/", + "cp -a ../externals/skia/src/core/SkPathEnums.h ./cpp/skia/src/core/.", + "cp -a ../externals/skia/src/core/SkPathPriv.h ./cpp/skia/src/core/.", + "cp -a ../externals/skia/src/core/SkChecksum.h ./cpp/skia/src/core/.", + "cp -a ../externals/skia/src/core/SkTHash.h ./cpp/skia/src/core/.", + + "mkdir -p ./cpp/skia/src/gpu/ganesh/gl", + "cp -a ../externals/skia/src/gpu/ganesh/gl/GrGLDefines.h ./cpp/skia/src/gpu/ganesh/gl/.", + + "cp -a ../externals/skia/src/core/SkLRUCache.h ./cpp/skia/src/core/.", + + "mkdir -p ./cpp/skia/src/base", + "cp -a ../externals/skia/src/base/SkTInternalLList.h ./cpp/skia/src/base/.", + "cp -a ../externals/skia/src/base/SkUTF.h ./cpp/skia/src/base/.", + + "mkdir -p ./cpp/skia/modules/skunicode/include/", + "cp -a ../externals/skia/modules/skunicode/include/SkUnicode.h ./cpp/skia/modules/skunicode/include/.", + + // eslint-disable-next-line max-len + "rm ./cpp/skia/include/gpu/GrBackendDrawableInfo.h", // Remove since there are now (Skia M123) two headers with the same name +].map((cmd) => { + console.log(cmd); + executeCmdSync(cmd); +}); diff --git a/scripts/skia-configuration.ts b/package/scripts/skia-configuration.ts similarity index 98% rename from scripts/skia-configuration.ts rename to package/scripts/skia-configuration.ts index 4680e5a76a..b9c3d7a342 100644 --- a/scripts/skia-configuration.ts +++ b/package/scripts/skia-configuration.ts @@ -104,7 +104,7 @@ export const configurations: Configuration = { ], ...ParagraphArgsAndroid, ], - outputRoot: "package/libs/android", + outputRoot: "libs/android", outputNames: [ "libskia.a", "libskshaper.a", @@ -151,7 +151,7 @@ export const configurations: Configuration = { ["cxx", '"clang++"'], ...ParagraphArgsIOS, ], - outputRoot: "package/libs/ios", + outputRoot: "libs/ios", outputNames: [ "libskia.a", "libskshaper.a", @@ -159,6 +159,6 @@ export const configurations: Configuration = { "libskottie.a", "libsksg.a", ...ParagraphOutputs, - ] + ], }, }; diff --git a/scripts/utils.ts b/package/scripts/utils.ts similarity index 94% rename from scripts/utils.ts rename to package/scripts/utils.ts index 78e4f9aaf4..11777d187c 100644 --- a/scripts/utils.ts +++ b/package/scripts/utils.ts @@ -38,10 +38,13 @@ export const getDistFolder = () => "./dist"; export const ensureFolderExists = (dirPath: string) => { try { console.log(`Ensuring that ${dirPath} exists...`); - return fs.mkdirSync(dirPath, { recursive: true }); + fs.mkdirSync(dirPath, { recursive: true }); } catch (err) { + // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore - if (err.code !== "EEXIST") throw err; + if (err.code !== "EEXIST") { + throw err; + } } }; diff --git a/scripts/workflow-copy-libs.ts b/package/scripts/workflow-copy-libs.ts similarity index 93% rename from scripts/workflow-copy-libs.ts rename to package/scripts/workflow-copy-libs.ts index da28a3f04c..4fb9fedb8e 100644 --- a/scripts/workflow-copy-libs.ts +++ b/package/scripts/workflow-copy-libs.ts @@ -1,4 +1,5 @@ import fs from "fs"; + import { ensureFolderExists, copyRecursiveSync } from "./utils"; /** * This build script prepares the npm build command by copying @@ -67,10 +68,10 @@ const copyFiles = (from: string, to: string, files: string[]) => { console.log("Copying android files..."); destinations.forEach((d, i) => { - copyFiles(sources[i], "./package/libs/android/" + d, androidFiles); + copyFiles(sources[i], "./libs/android/" + d, androidFiles); }); console.log("Copying ios files..."); -copyFiles("skia-ios-xcframeworks", "./package/libs/ios", iosFiles); +copyFiles("skia-ios-xcframeworks", "./libs/ios", iosFiles); console.log("Done copying artifacts."); diff --git a/package/tsconfig.json b/package/tsconfig.json index e4e4c1126d..8d58f5f8a0 100644 --- a/package/tsconfig.json +++ b/package/tsconfig.json @@ -33,7 +33,6 @@ "babel.config.js", "metro.config.js", "jest.config.js", - "lib", - "scripts" + "lib" ] } \ No newline at end of file diff --git a/package/yarn.lock b/package/yarn.lock index 221d5b1c62..79d948b6c4 100644 --- a/package/yarn.lock +++ b/package/yarn.lock @@ -1193,6 +1193,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@cspotcode/source-map-support@^0.8.0": + version "0.8.1" + resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" + integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw== + dependencies: + "@jridgewell/trace-mapping" "0.3.9" + "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" @@ -1497,6 +1504,11 @@ "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" +"@jridgewell/resolve-uri@^3.0.3": + version "3.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" + integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw== + "@jridgewell/resolve-uri@^3.1.0": version "3.1.1" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" @@ -1520,6 +1532,14 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== +"@jridgewell/trace-mapping@0.3.9": + version "0.3.9" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" + integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.9": version "0.3.22" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz#72a621e5de59f5f1ef792d0793a82ee20f645e4c" @@ -1826,6 +1846,26 @@ dependencies: "@sinonjs/commons" "^3.0.0" +"@tsconfig/node10@^1.0.7": + version "1.0.11" + resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.11.tgz#6ee46400685f130e278128c7b38b7e031ff5b2f2" + integrity sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw== + +"@tsconfig/node12@^1.0.7": + version "1.0.11" + resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d" + integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag== + +"@tsconfig/node14@^1.0.0": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1" + integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow== + +"@tsconfig/node16@^1.0.2": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9" + integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA== + "@types/babel__core@^7.1.14": version "7.20.5" resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017" @@ -2218,6 +2258,18 @@ acorn-jsx@^5.3.2: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== +acorn-walk@^8.1.1: + version "8.3.3" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.3.tgz#9caeac29eefaa0c41e3d4c65137de4d6f34df43e" + integrity sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw== + dependencies: + acorn "^8.11.0" + +acorn@^8.11.0, acorn@^8.4.1: + version "8.12.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248" + integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg== + acorn@^8.8.2, acorn@^8.9.0: version "8.11.3" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a" @@ -2319,6 +2371,11 @@ appdirsjs@^1.2.4: resolved "https://registry.yarnpkg.com/appdirsjs/-/appdirsjs-1.2.7.tgz#50b4b7948a26ba6090d4aede2ae2dc2b051be3b3" integrity sha512-Quji6+8kLBC3NnBeo14nPDq0+2jUs5s3/xEye+udFHumHhRk4M7aAMXp/PBJqkKYGuuyR9M/6Dq7d2AViiGmhw== +arg@^4.1.0: + version "4.1.3" + resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" + integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== + argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -2981,6 +3038,11 @@ create-jest@^29.7.0: jest-util "^29.7.0" prompts "^2.0.1" +create-require@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" + integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== + cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" @@ -3119,6 +3181,11 @@ diff-sequences@^29.6.3: resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921" integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q== +diff@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" + integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== + dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" @@ -5205,7 +5272,7 @@ make-dir@^4.0.0: dependencies: semver "^7.5.3" -make-error@1.x: +make-error@1.x, make-error@^1.1.1: version "1.3.6" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== @@ -6392,7 +6459,7 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rimraf@^3.0.2: +rimraf@3.0.2, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -6935,6 +7002,25 @@ ts-jest@29.1.1: semver "^7.5.3" yargs-parser "^21.0.1" +ts-node@^10.9.2: + version "10.9.2" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f" + integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ== + dependencies: + "@cspotcode/source-map-support" "^0.8.0" + "@tsconfig/node10" "^1.0.7" + "@tsconfig/node12" "^1.0.7" + "@tsconfig/node14" "^1.0.0" + "@tsconfig/node16" "^1.0.2" + acorn "^8.4.1" + acorn-walk "^8.1.1" + arg "^4.1.0" + create-require "^1.1.0" + diff "^4.0.1" + make-error "^1.1.1" + v8-compile-cache-lib "^3.0.1" + yn "3.1.1" + tsconfig-paths@^3.14.1: version "3.15.0" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4" @@ -7141,6 +7227,11 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== +v8-compile-cache-lib@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" + integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== + v8-compile-cache@^2.0.3: version "2.4.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz#cdada8bec61e15865f05d097c5f4fd30e94dc128" @@ -7412,6 +7503,11 @@ yargs@^17.3.1, yargs@^17.6.2: y18n "^5.0.5" yargs-parser "^21.1.1" +yn@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" + integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== + yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" diff --git a/scripts/copy-skia-module-headers.ts b/scripts/copy-skia-module-headers.ts deleted file mode 100644 index 693f10f9fd..0000000000 --- a/scripts/copy-skia-module-headers.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { executeCmdSync } from "./utils"; - -const copyModule = (module: string) => [ - `mkdir -p ./package/cpp/skia/modules/${module}/include`, - `cp -a ./externals/skia/modules/${module}/include/. ./package/cpp/skia/modules/${module}/include`, -]; - -[ - "yarn rimraf ./package/cpp/skia/modules/", - ...copyModule("svg"), - ...copyModule("skresources"), - ...copyModule("skparagraph"), - `cp -a ./externals/skia/modules/skcms/. ./package/cpp/skia/modules/skcms`, - `mkdir -p ./package/cpp/skia/src/`, - `mkdir -p ./package/cpp/skia/src/core/`, - `cp -a ./externals/skia/src/core/SkPathEnums.h ./package/cpp/skia/src/core/.`, - `cp -a ./externals/skia/src/core/SkPathPriv.h ./package/cpp/skia/src/core/.`, - `cp -a ./externals/skia/src/core/SkChecksum.h ./package/cpp/skia/src/core/.`, - `cp -a ./externals/skia/src/core/SkTHash.h ./package/cpp/skia/src/core/.`, - - "mkdir -p ./package/cpp/skia/src/gpu/ganesh/gl", - `cp -a ./externals/skia/src/gpu/ganesh/gl/GrGLDefines.h ./package/cpp/skia/src/gpu/ganesh/gl/.`, - - `cp -a ./externals/skia/src/core/SkLRUCache.h ./package/cpp/skia/src/core/.`, - - "mkdir -p ./package/cpp/skia/src/base", - "cp -a ./externals/skia/src/base/SkTInternalLList.h ./package/cpp/skia/src/base/.", - "cp -a ./externals/skia/src/base/SkUTF.h ./package/cpp/skia/src/base/.", - - "mkdir -p ./package/cpp/skia/modules/skunicode/include/", - "cp -a externals/skia/modules/skunicode/include/SkUnicode.h ./package/cpp/skia/modules/skunicode/include/.", - - `rm ./package/cpp/skia/include/gpu/GrBackendDrawableInfo.h`, // Remove since there are now (Skia M123) two headers with the same name - -].map((cmd) => { - console.log(cmd); - executeCmdSync(cmd); -}); diff --git a/tsconfig.json b/tsconfig.json deleted file mode 100644 index 67d4017ea1..0000000000 --- a/tsconfig.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "compilerOptions": { - /* Visit https://aka.ms/tsconfig.json to read more about this file */ - - /* Projects */ - // "incremental": true, /* Enable incremental compilation */ - // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ - // "tsBuildInfoFile": "./", /* Specify the folder for .tsbuildinfo incremental compilation files. */ - // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects */ - // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ - // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ - - /* Language and Environment */ - "target": "es5", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ - // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ - // "jsx": "preserve", /* Specify what JSX code is generated. */ - // "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */ - // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ - // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h' */ - // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ - // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx*`.` */ - // "reactNamespace": "", /* Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit. */ - // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ - // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ - - /* Modules */ - "module": "commonjs", /* Specify what module code is generated. */ - // "rootDir": "./", /* Specify the root folder within your source files. */ - // "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */ - // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ - // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ - // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ - // "typeRoots": [], /* Specify multiple folders that act like `./node_modules/@types`. */ - // "types": [], /* Specify type package names to be included without being referenced in a source file. */ - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - // "resolveJsonModule": true, /* Enable importing .json files */ - // "noResolve": true, /* Disallow `import`s, `require`s or ``s from expanding the number of files TypeScript should add to a project. */ - - /* JavaScript Support */ - // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */ - // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ - // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`. */ - - /* Emit */ - // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ - // "declarationMap": true, /* Create sourcemaps for d.ts files. */ - // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ - // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ - // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */ - // "outDir": "./", /* Specify an output folder for all emitted files. */ - // "removeComments": true, /* Disable emitting comments. */ - "noEmit": true, /* Disable emitting files from a compilation. */ - // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ - // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types */ - // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ - // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ - // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ - // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ - // "newLine": "crlf", /* Set the newline character for emitting files. */ - // "stripInternal": true, /* Disable emitting declarations that have `@internal` in their JSDoc comments. */ - // "noEmitHelpers": true, /* Disable generating custom helper functions like `__extends` in compiled output. */ - // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ - // "preserveConstEnums": true, /* Disable erasing `const enum` declarations in generated code. */ - // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ - - /* Interop Constraints */ - // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ - // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ - "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */ - // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ - "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ - - /* Type Checking */ - "strict": true, /* Enable all strict type-checking options. */ - // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied `any` type.. */ - // "strictNullChecks": true, /* When type checking, take into account `null` and `undefined`. */ - // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ - // "strictBindCallApply": true, /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */ - // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ - // "noImplicitThis": true, /* Enable error reporting when `this` is given the type `any`. */ - // "useUnknownInCatchVariables": true, /* Type catch clause variables as 'unknown' instead of 'any'. */ - // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ - // "noUnusedLocals": true, /* Enable error reporting when a local variables aren't read. */ - // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read */ - // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ - // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ - // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ - // "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */ - // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ - // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type */ - // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ - // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ - - /* Completeness */ - "skipLibCheck": true, /* Skip type checking all .d.ts files. */ - }, - "exclude": [ - "package", - "example", - "fabricexample", - "docs", - "externals" - ] -} diff --git a/yarn.lock b/yarn.lock deleted file mode 100644 index 2d9f2a24eb..0000000000 --- a/yarn.lock +++ /dev/null @@ -1,229 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@cspotcode/source-map-consumer@0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b" - integrity sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg== - -"@cspotcode/source-map-support@0.7.0": - version "0.7.0" - resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz#4789840aa859e46d2f3173727ab707c66bf344f5" - integrity sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA== - dependencies: - "@cspotcode/source-map-consumer" "0.8.0" - -"@tsconfig/node10@^1.0.7": - version "1.0.9" - resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2" - integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA== - -"@tsconfig/node12@^1.0.7": - version "1.0.11" - resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d" - integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag== - -"@tsconfig/node14@^1.0.0": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1" - integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow== - -"@tsconfig/node16@^1.0.2": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9" - integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA== - -"@types/node@16.11.7": - version "16.11.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.7.tgz#36820945061326978c42a01e56b61cd223dfdc42" - integrity sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw== - -acorn-walk@^8.1.1: - version "8.3.2" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.2.tgz#7703af9415f1b6db9315d6895503862e231d34aa" - integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A== - -acorn@^8.4.1: - version "8.11.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a" - integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== - -arg@^4.1.0: - version "4.1.3" - resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" - integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== - -async@^1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" - integrity sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w== - -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -clang-format@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/clang-format/-/clang-format-1.6.0.tgz#48fac4387712aeeae0f47b5d72f639f3fd95f4b6" - integrity sha512-W3/L7fWkA8DoLkz9UGjrRnNi+J5a5TuS2HDLqk6WsicpOzb66MBu4eY/EcXhicHriVnAXWQVyk5/VeHWY6w4ow== - dependencies: - async "^1.5.2" - glob "^7.0.0" - resolve "^1.1.6" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== - -create-require@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" - integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== - -diff@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" - integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== - -function-bind@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" - integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== - -glob@^7.0.0, glob@^7.1.3: - version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.1.1" - once "^1.3.0" - path-is-absolute "^1.0.0" - -hasown@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c" - integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA== - dependencies: - function-bind "^1.1.2" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -is-core-module@^2.13.0: - version "2.13.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" - integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw== - dependencies: - hasown "^2.0.0" - -make-error@^1.1.1: - version "1.3.6" - resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" - integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== - -minimatch@^3.1.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== - dependencies: - brace-expansion "^1.1.7" - -once@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== - dependencies: - wrappy "1" - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== - -path-parse@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - -resolve@^1.1.6: - version "1.22.8" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" - integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== - dependencies: - is-core-module "^2.13.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -rimraf@3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -supports-preserve-symlinks-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" - integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== - -ts-node@10.4.0: - version "10.4.0" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.4.0.tgz#680f88945885f4e6cf450e7f0d6223dd404895f7" - integrity sha512-g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A== - dependencies: - "@cspotcode/source-map-support" "0.7.0" - "@tsconfig/node10" "^1.0.7" - "@tsconfig/node12" "^1.0.7" - "@tsconfig/node14" "^1.0.0" - "@tsconfig/node16" "^1.0.2" - acorn "^8.4.1" - acorn-walk "^8.1.1" - arg "^4.1.0" - create-require "^1.1.0" - diff "^4.0.1" - make-error "^1.1.1" - yn "3.1.1" - -typescript@5.3.3: - version "5.3.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37" - integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== - -yn@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" - integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==