From c0497d607dd5530550536fc61de1f94481fc6c94 Mon Sep 17 00:00:00 2001 From: Na Li Date: Fri, 6 Mar 2020 13:59:18 -0800 Subject: [PATCH] [layers]Temporary solution to symlink dependencies. --- tfjs-layers/package.json | 8 +++++--- tfjs-layers/scripts/build-npm.sh | 2 +- tfjs-layers/scripts/test-ci.sh | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tfjs-layers/package.json b/tfjs-layers/package.json index 45ba8885e27..e88df1a5fb0 100644 --- a/tfjs-layers/package.json +++ b/tfjs-layers/package.json @@ -37,15 +37,17 @@ "yalc": "~1.0.0-pre.21" }, "scripts": { - "prep": "yarn install && yarn build", - "build": "tsc", + "prep": "yarn install && yarn build-ci", + "build": "yarn link-core-master && tsc", + "build-ci": "tsc", "build-core": "cd ../tfjs-core && yarn && yarn build", "build-core-ci": "cd ../tfjs-core && yarn && yarn build-ci", "build-npm": "./scripts/build-npm.sh", "format": "./tools/clang_format_ts.sh", + "link-core-master": "../scripts/link-core-master.js", "link-local": "yalc link", "publish-local": "yarn build-npm && yalc push", - "test": "yarn build-core && yarn && karma start", + "test": "yarn link-core-master && yarn build-core && yarn && karma start", "tfjs2keras": "yarn tfjs2keras-js && yarn tfjs2keras-py --stable && yarn tfjs2keras-py --stable --tfkeras && yarn tfjs2keras-py --dev --tfkeras", "tfjs2keras-js": "./scripts/tfjs2keras-js.sh", "tfjs2keras-py": "./scripts/tfjs2keras-py.sh", diff --git a/tfjs-layers/scripts/build-npm.sh b/tfjs-layers/scripts/build-npm.sh index 4a108535b08..41aff224ee5 100755 --- a/tfjs-layers/scripts/build-npm.sh +++ b/tfjs-layers/scripts/build-npm.sh @@ -19,7 +19,7 @@ set -e rimraf dist/ yarn -yarn build +yarn build-ci rollup -c --visualize # Use minified files for miniprogram diff --git a/tfjs-layers/scripts/test-ci.sh b/tfjs-layers/scripts/test-ci.sh index 4154044a6c0..15b222bfc81 100755 --- a/tfjs-layers/scripts/test-ci.sh +++ b/tfjs-layers/scripts/test-ci.sh @@ -10,6 +10,6 @@ set -e # Regular testing. -yarn build +yarn build-ci yarn lint yarn run-browserstack