From ad32f90beb8b2f8beebb4b547fd97ba6335b1fa6 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 17 Dec 2020 13:09:35 +0000 Subject: [PATCH 1/6] Stop building at local install time This speeds up local development and CI runs by skipping build steps by default. They will now only run when just before publishing. Related to https://github.com/matrix-org/matrix-js-sdk/pull/1552 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b328823b24..b30b430a62 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "typings": "./lib/index.d.ts", "matrix_src_main": "./src/index.js", "scripts": { - "prepare": "yarn build", + "prepublishOnly": "yarn build", "i18n": "matrix-gen-i18n", "prunei18n": "matrix-prune-i18n", "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && ./scripts/gen-i18n.js && node scripts/compare-file.js src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json", From 3d3490c6d7a771eae9008cdc77e9a07b3dbb1a69 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 17 Dec 2020 15:36:32 +0000 Subject: [PATCH 2/6] For cloned deps, we only need to build types --- scripts/ci/install-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/install-deps.sh b/scripts/ci/install-deps.sh index 14b5fc5393..8a6f7489a0 100755 --- a/scripts/ci/install-deps.sh +++ b/scripts/ci/install-deps.sh @@ -7,7 +7,7 @@ scripts/fetchdep.sh matrix-org matrix-js-sdk pushd matrix-js-sdk yarn link yarn install $@ -yarn build +yarn build:types popd yarn link matrix-js-sdk From 19cfe44b16d20275abaa8298704dc41d056af76c Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 17 Dec 2020 15:46:32 +0000 Subject: [PATCH 3/6] Types from dependencies are now built explicitly --- scripts/ci/layered.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ci/layered.sh b/scripts/ci/layered.sh index 306f9c9974..78a490f7a8 100755 --- a/scripts/ci/layered.sh +++ b/scripts/ci/layered.sh @@ -14,12 +14,14 @@ scripts/fetchdep.sh matrix-org matrix-js-sdk pushd matrix-js-sdk yarn link yarn install +yarn build:types popd # Now set up the react-sdk yarn link matrix-js-sdk yarn link yarn install +yarn build:types # Finally, set up element-web scripts/fetchdep.sh vector-im element-web From b22c28eac9d8bce4c745101df63e25fa795c651e Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 18 Dec 2020 14:49:28 +0000 Subject: [PATCH 4/6] Use TypeScript source for development, swap to build during release This changes the JS SDK to point `main` to TypeScript source and remove any indication of `typings`. For local development and CI workflows, it means many steps can run without building first, which saves lots of time. During release, we still build for Node and browsers as before. The release script adjusts the `main` and `typings` fields before publishing and distribution to point to the built output for those that use them. --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b30b430a62..a3443af38b 100644 --- a/package.json +++ b/package.json @@ -27,9 +27,10 @@ "matrix-gen-i18n": "scripts/gen-i18n.js", "matrix-prune-i18n": "scripts/prune-i18n.js" }, - "main": "./lib/index.js", - "typings": "./lib/index.d.ts", + "main": "./src/index.js", "matrix_src_main": "./src/index.js", + "matrix_lib_main": "./lib/index.js", + "matrix_lib_typings": "./lib/index.d.ts", "scripts": { "prepublishOnly": "yarn build", "i18n": "matrix-gen-i18n", From 50427786f9c268be0d42c6fb16bfd0c4276d79ac Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 18 Dec 2020 14:59:09 +0000 Subject: [PATCH 5/6] Cloned deps do not need any building now --- scripts/ci/install-deps.sh | 1 - scripts/ci/layered.sh | 2 -- 2 files changed, 3 deletions(-) diff --git a/scripts/ci/install-deps.sh b/scripts/ci/install-deps.sh index 8a6f7489a0..bbda74ef9d 100755 --- a/scripts/ci/install-deps.sh +++ b/scripts/ci/install-deps.sh @@ -7,7 +7,6 @@ scripts/fetchdep.sh matrix-org matrix-js-sdk pushd matrix-js-sdk yarn link yarn install $@ -yarn build:types popd yarn link matrix-js-sdk diff --git a/scripts/ci/layered.sh b/scripts/ci/layered.sh index 78a490f7a8..306f9c9974 100755 --- a/scripts/ci/layered.sh +++ b/scripts/ci/layered.sh @@ -14,14 +14,12 @@ scripts/fetchdep.sh matrix-org matrix-js-sdk pushd matrix-js-sdk yarn link yarn install -yarn build:types popd # Now set up the react-sdk yarn link matrix-js-sdk yarn link yarn install -yarn build:types # Finally, set up element-web scripts/fetchdep.sh vector-im element-web From e90e51cc9b269005f52671daa842ff3c61363e84 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 18 Dec 2020 15:13:09 +0000 Subject: [PATCH 6/6] React SDK needs to build the component index --- scripts/ci/layered.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci/layered.sh b/scripts/ci/layered.sh index 306f9c9974..039f90c7df 100755 --- a/scripts/ci/layered.sh +++ b/scripts/ci/layered.sh @@ -20,6 +20,7 @@ popd yarn link matrix-js-sdk yarn link yarn install +yarn reskindex # Finally, set up element-web scripts/fetchdep.sh vector-im element-web