Skip to content

Commit 1af8866

Browse files
committed
Merge branch 'ew/swc' into ken/github-actions
2 parents dd4d3ff + 4d4b09e commit 1af8866

File tree

4 files changed

+83
-35
lines changed

4 files changed

+83
-35
lines changed

.github/workflows/test.yml

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,24 @@ on:
33
push:
44
branches-ignore: [main]
55
workflow_dispatch:
6-
workflow_call:
76

87
jobs:
98
yarn-lockfile-check:
109
uses: salesforcecli/github-workflows/.github/workflows/lockFileCheck.yml@main
11-
# Since the Windows unit tests take much longer, we run the linux unit tests first and then run the windows unit tests in parallel with NUTs
10+
# Since the Windows unit tests take much longer, we run the linux unit tests first and then run the windows unit tests in parallel with NUTs
1211
linux-unit-tests:
1312
needs: yarn-lockfile-check
1413
uses: salesforcecli/github-workflows/.github/workflows/unitTestsLinux.yml@main
1514
windows-unit-tests:
15+
needs: linux-unit-tests
16+
uses: salesforcecli/github-workflows/.github/workflows/unitTestsWindows.yml@main
17+
nuts:
18+
needs: linux-unit-tests
19+
uses: salesforcecli/github-workflows/.github/workflows/nut.yml@main
20+
secrets: inherit
1621
strategy:
1722
matrix:
18-
# node_version: [lts/-1, lts/*, latest]
19-
node_version: [lts/-1, lts/*]
23+
os: [ubuntu-latest, windows-latest]
2024
fail-fast: false
21-
runs-on: windows-latest
22-
steps:
23-
- uses: actions/checkout@v3
24-
with:
25-
persist-credentials: false
26-
- uses: salesforcecli/github-workflows/.github/actions/windowsCachePerf@main
27-
- uses: actions/setup-node@v3
28-
with:
29-
node-version: ${{ matrix.node_version }}
30-
cache: yarn
31-
- name: Cache node modules
32-
id: cache-nodemodules
33-
uses: actions/cache@v3
34-
env:
35-
cache-name: cache-node-modules
36-
with:
37-
path: "**/node_modules"
38-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}
39-
40-
- run: yarn install --network-timeout 600000
41-
- run: yarn build
42-
- run: yarn test
25+
with:
26+
os: ${{ matrix.os }}

bin/dev

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ const project = path.join(__dirname, '..', 'tsconfig.json');
88
// In dev mode -> use ts-node and dev plugins
99
process.env.NODE_ENV = 'development';
1010

11-
require('ts-node').register({ project });
11+
// Enable SWC for faster typescript compiling
12+
require('ts-node').register({ project, swc: true });
1213

1314
// In dev mode, always show stack traces
14-
oclif.settings.debug = true;
15+
const g = (global.oclif = global.oclif || {});
16+
17+
// In dev mode, always show stack traces
18+
global.oclif.debug = true;
1519

1620
// Start the CLI
17-
oclif.run().then(oclif.flush).catch(oclif.Errors.handle);
21+
oclif.run().then(require('@oclif/core/flush')).catch(require('@oclif/core/handle'));

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"@salesforce/prettier-config": "^0.0.2",
2323
"@salesforce/ts-sinon": "^1.1.2",
2424
"@salesforce/ts-types": "1.2.2",
25+
"@swc/core": "^1.3.21",
2526
"@types/chai": "^4",
2627
"@types/mkdirp": "0.5.2",
2728
"@types/mocha": "^5",

yarn.lock

Lines changed: 65 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -709,12 +709,71 @@
709709
resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz#5981a8db18b56ba38ef0efb7d995b12aa7b51918"
710710
integrity sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==
711711

712-
"@szmarczak/http-timer@^4.0.5":
713-
version "4.0.6"
714-
resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
715-
integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==
716-
dependencies:
717-
defer-to-connect "^2.0.0"
712+
713+
version "1.3.21"
714+
resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.21.tgz#9fe6d5c4c3ca0854194ab7d3e42ac29cda422abf"
715+
integrity sha512-5dBrJyrCzdHOQ9evS9NBJm2geKcXffIuAvSrnwbMHkfTpl+pOM7crry2tolydFXdOE/Jbx8yyahAIXPne1fTHw==
716+
717+
718+
version "1.3.21"
719+
resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.21.tgz#6fb005ff27c5521534dd75732973182f45836681"
720+
integrity sha512-CAtzfsRoVZr7DLKOOWPua6npFdj06wRuv1us275CY2QS3mg1bPl9BxA3c94q3mMcu5Bf06+dzUOjJSGrsBD7Ig==
721+
722+
723+
version "1.3.21"
724+
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.21.tgz#3c54f62c1718408993b82ae4726c081e3271f002"
725+
integrity sha512-oPO7oFr89pjDFlHJ2aZvzGR6hwy5nmQyeiuqpTgfn+RFFLLbipFawJe/2NBWyD35bxuguW6a3/w9I6edKTpLUw==
726+
727+
728+
version "1.3.21"
729+
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.21.tgz#7a4e17420ad98f35712cd2cbde46b8a78c39beb3"
730+
integrity sha512-cgPw35T8HO4gB/tvPJMwjJuNNpydmw6U5hkxZ+7jiE+qA8hN8a71i+BBfXeSzlo60t4c44+zK4t+gK7UacZg2w==
731+
732+
733+
version "1.3.21"
734+
resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.21.tgz#2b98140cc6dcd23c28f823a8ab8d61df8f876aed"
735+
integrity sha512-kwH+HHtcakSqR3gF5QJ7N7SPs96ilFiXuauB02Ct3UflaGbVYVoeFYj/VEIJ+ZJvlvvOEDByOiLyrk2bw0bG7A==
736+
737+
738+
version "1.3.21"
739+
resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.21.tgz#6dc8105f6a6252322010896e79ad8a12269862ed"
740+
integrity sha512-/kLQLNxwdX6kO2R751uUrxXZsAhOkA1EeQzAqj+5Y+bzt3hA5asH5evkY0w0Aj1zCofX4p4o/Q35mandUPxMlw==
741+
742+
743+
version "1.3.21"
744+
resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.21.tgz#e94eeecf389b441f09cf2de712caf5c9d0a0d5da"
745+
integrity sha512-s+l3LqUzDli6rbmIPR3IfO23IOLYBVxk97CDdcJWrRTVtCwUKFhFVJVZyErveriqLXSGJhy5+UL+aOuxC4dk8g==
746+
747+
748+
version "1.3.21"
749+
resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.21.tgz#07374179e0422ad7352430e8b8fd7fd0f92e099c"
750+
integrity sha512-59gWcdbZxvmyzh+J50yCCodKDYRUnMwNypzzfamF1Vusa4Np+IGMWEaE2KsZUq50OQIRo0PGHpBPMKVYkuGv8g==
751+
752+
753+
version "1.3.21"
754+
resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.21.tgz#abc4aa533a21da7c0812698ba485314797032edf"
755+
integrity sha512-3gH86ffVAiCmeRy+xSxR5iWSbKy4nUddo4PIahD1zwGJx6LC5ahC/I6EpL1pvoX3KdJKVioUBn0KDfPDUYfqJw==
756+
757+
758+
version "1.3.21"
759+
resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.21.tgz#2d5264370a737e0842434988f9afe9924cc0c4b6"
760+
integrity sha512-JKWLJdJ3oFc8fGBk4P6mGKhW8n+FmEjLLbsST+h94bZmelrSTeShBt3rr+pMMatFevlu/c9lM3OW2GHsZeZNkg==
761+
762+
"@swc/core@^1.3.21":
763+
version "1.3.21"
764+
resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.21.tgz#5168604c9bcd81740d8aa3a602a2a64dbb9377d1"
765+
integrity sha512-RTmqkm5e5sb+Q+YbyqiE52xjvX+kcIVDgaSdSD7mNy2opgDfIdFMhExmB8UQStt3TLrlpAslWaFNWNmvaHP9rg==
766+
optionalDependencies:
767+
"@swc/core-darwin-arm64" "1.3.21"
768+
"@swc/core-darwin-x64" "1.3.21"
769+
"@swc/core-linux-arm-gnueabihf" "1.3.21"
770+
"@swc/core-linux-arm64-gnu" "1.3.21"
771+
"@swc/core-linux-arm64-musl" "1.3.21"
772+
"@swc/core-linux-x64-gnu" "1.3.21"
773+
"@swc/core-linux-x64-musl" "1.3.21"
774+
"@swc/core-win32-arm64-msvc" "1.3.21"
775+
"@swc/core-win32-ia32-msvc" "1.3.21"
776+
"@swc/core-win32-x64-msvc" "1.3.21"
718777

719778
"@tootallnate/once@1":
720779
version "1.1.2"

0 commit comments

Comments
 (0)