Skip to content

Commit

Permalink
Merge branch 'canary' into fix/remove-dev-ignores
Browse files Browse the repository at this point in the history
# Conflicts:
#	yarn.lock
  • Loading branch information
ijjk committed Nov 3, 2021
2 parents f6e9e64 + b2b7e78 commit b52caac
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 69 deletions.
16 changes: 2 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
"next": "node --trace-deprecation --enable-source-maps packages/next/dist/bin/next",
"next-no-sourcemaps": "node --trace-deprecation packages/next/dist/bin/next",
"clean-trace-jaeger": "rm -rf test/integration/basic/.next && TRACE_TARGET=JAEGER node --trace-deprecation --enable-source-maps packages/next/dist/bin/next build test/integration/basic",
"debug": "node --inspect packages/next/dist/bin/next"
"debug": "node --inspect packages/next/dist/bin/next",
"postinstall": "node scripts/install-native.mjs"
},
"pre-commit": "lint-staged",
"devDependencies": {
Expand Down Expand Up @@ -160,19 +161,6 @@
"webpack-bundle-analyzer": "4.3.0",
"worker-loader": "3.0.7"
},
"optionalDependencies": {
"@next/swc-android-arm64": "canary",
"@next/swc-darwin-arm64": "canary",
"@next/swc-darwin-x64": "canary",
"@next/swc-linux-arm-gnueabihf": "canary",
"@next/swc-linux-arm64-gnu": "canary",
"@next/swc-linux-arm64-musl": "canary",
"@next/swc-linux-x64-gnu": "canary",
"@next/swc-linux-x64-musl": "canary",
"@next/swc-win32-arm64-msvc": "canary",
"@next/swc-win32-ia32-msvc": "canary",
"@next/swc-win32-x64-msvc": "canary"
},
"resolutions": {
"browserslist": "4.16.6",
"caniuse-lite": "1.0.30001271"
Expand Down
55 changes: 55 additions & 0 deletions scripts/install-native.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import { execFile } from 'child_process'
import fs from 'fs-extra'
import os from 'os'
import path from 'path'
import util from 'util'

const exec = util.promisify(execFile)

;(async function () {
try {
let tmpdir = os.tmpdir() + `next-swc-${Date.now()}`
await fs.ensureDir(tmpdir)
let cwd = process.cwd()
let pkgJson = {
name: 'dummy-package',
version: '1.0.0',
optionalDependencies: {
'@next/swc-android-arm64': 'canary',
'@next/swc-darwin-arm64': 'canary',
'@next/swc-darwin-x64': 'canary',
'@next/swc-linux-arm-gnueabihf': 'canary',
'@next/swc-linux-arm64-gnu': 'canary',
'@next/swc-linux-arm64-musl': 'canary',
'@next/swc-linux-x64-gnu': 'canary',
'@next/swc-linux-x64-musl': 'canary',
'@next/swc-win32-arm64-msvc': 'canary',
'@next/swc-win32-ia32-msvc': 'canary',
'@next/swc-win32-x64-msvc': 'canary',
},
}
await fs.writeFile(
path.join(tmpdir, 'package.json'),
JSON.stringify(pkgJson)
)
let { stdout } = await exec('yarn', ['--force'], { cwd: tmpdir })
console.log(stdout)
let pkgs = await fs.readdir(path.join(tmpdir, 'node_modules/@next'))
await fs.ensureDir(path.join(cwd, 'node_modules/@next'))

await Promise.all(
pkgs.map((pkg) =>
fs.move(
path.join(tmpdir, 'node_modules/@next', pkg),
path.join(cwd, 'node_modules/@next', pkg),
{ overwrite: true }
)
)
)
await fs.remove(tmpdir)
console.log('Installed the following binary packages:', pkgs)
} catch (e) {
console.error(e)
console.error('Failed to load @next/swc binary packages')
}
})()
55 changes: 0 additions & 55 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3558,61 +3558,6 @@
resolved "https://registry.yarnpkg.com/@napi-rs/triples/-/triples-1.0.3.tgz#76d6d0c3f4d16013c61e45dfca5ff1e6c31ae53c"
integrity sha512-jDJTpta+P4p1NZTFVLHJ/TLFVYVcOqv6l8xwOeBKNPMgY/zDYH/YH7SJbvrr/h1RcS9GzbPcLKGzpuK9cV56UA==

"@next/swc-android-arm64@canary":
version "12.0.3-canary.1"
resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-12.0.3-canary.1.tgz#828b4c4b3f132cffeed81be5700937e17d001a20"
integrity sha512-wJ4B4U9T1Nv59nlEiuMSAt3GT+aF8cyKiRGB9r5TGzgC5i/BoMFaVbLvAC1f2dDg5sb0blN6f75o8C30qkdzfg==

"@next/swc-darwin-arm64@canary":
version "12.0.3-canary.1"
resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.0.3-canary.1.tgz#e00b37aa2a99b83f505f30130136035efd4fb7b1"
integrity sha512-oKmE2EwzHpVSC7efxE2GAHb+smCfvZ0VkYivATbZNj+Gd2wZzzNS9ofDHU1rhQTaftmUu77Ybku6WPdtO7GrrA==

"@next/swc-darwin-x64@canary":
version "12.0.3-canary.1"
resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-12.0.3-canary.1.tgz#b01cb93e70f29e56f60636efd6ca0caf0ec12a65"
integrity sha512-1xnc6SAIL8gVh0H2AyCZaoD08htpgQPaZShoJysY+aebCYf6MBflhILkxCGXvGhs6pvv0rNDSXHa5bZ/ezoHsA==

"@next/swc-linux-arm-gnueabihf@canary":
version "12.0.3-canary.1"
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.0.3-canary.1.tgz#b0308b433edb50648fbcfac8fdfd2fdeb70ee533"
integrity sha512-8p5HnJE6bnEE6ycZ7+1yfe11n/syc1ucgIWCgTjbEvJWKhQIySrj782kWmp2rA0qs/glhAzKZqRRHBYDEhWjrg==

"@next/swc-linux-arm64-gnu@canary":
version "12.0.3-canary.1"
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.0.3-canary.1.tgz#d690a107b7ff0c1f893c558291bda2709e0c3c72"
integrity sha512-HTMSyAOkNbSQVhU8FADHOnf7a3BhaWat/ERCDsHNbH6ZyYSJ7bgRfoA6NLYsIYR/3iwp3ooHwk4z1AeC6P/shA==

"@next/swc-linux-arm64-musl@canary":
version "12.0.3-canary.1"
resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.0.3-canary.1.tgz#2d1ae10a30c589fa31b17e0d46ce76608c23569f"
integrity sha512-5ER9oOQjzc8Ck2kFm4+RKDfDO4FR369brLicUDdwCbhFh3IV6kbQo0qy0KNJwN9Ck7EqRtfLE5kNHZldTNseTA==

"@next/swc-linux-x64-gnu@canary":
version "12.0.3-canary.1"
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.0.3-canary.1.tgz#f16fe509a33226d89d43f3d93c42fd21f4d658f7"
integrity sha512-aaw1aXHPfiw38Q3CpGzYbe0R/EdlplpHN4X8BZJLdWHu79x5U1SYoO385n/fSSkot5JSjGFFcXlqi74o65lBDg==

"@next/swc-linux-x64-musl@canary":
version "12.0.2-canary.2"
resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.0.2-canary.2.tgz#b3ce05442610e16d50cba8302f243bebdc2d61bc"
integrity sha512-RnWuxoHmYB4JEo0Yt9pdx5+8mbqvxr0vfULPWOzY03qLILNQakYFuZzKgtuE3DkFYeJF7yEtEAMhJ0cAwVKRSw==

"@next/swc-win32-arm64-msvc@canary":
version "12.0.3-canary.1"
resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.0.3-canary.1.tgz#58276bf8eb4489bfe354245b5fc0a54b79706e4e"
integrity sha512-qM9oit7cA9iMupd9x7IxFFNEu2f6SLntBCVZtwV1WyKOh/vr7Iq8aaMmc440HVPwZhAY7DD8Ddpu1Zfh8Uje6Q==

"@next/swc-win32-ia32-msvc@canary":
version "12.0.3-canary.1"
resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.0.3-canary.1.tgz#14da2dbb8bb21f2ae9796bfee183dc0d2a8b35a5"
integrity sha512-0TBN/Y/ilack7HEkrOR0hTVLcRfJ2nCKyqjokyrZgL+NN0m4idXxRyAwAGre4o3Ye2ItNoGoHB46vr7y/LusLg==

"@next/swc-win32-x64-msvc@canary":
version "12.0.3-canary.1"
resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.0.3-canary.1.tgz#91ed16282c1cb5c08ae760ac133ebdb3cbef3362"
integrity sha512-B1IZN4NcGpLcD5JwTsvRkbSfbMjF8WXBkly4JjMwmY+gGbVysVuX0InMQr6DRIttbYa8HwSYouYk4/uGxIe39w==

"@node-rs/helper@^1.0.0":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@node-rs/helper/-/helper-1.2.1.tgz#e079b05f21ff4329d82c4e1f71c0290e4ecdc70c"
Expand Down

0 comments on commit b52caac

Please sign in to comment.