Skip to content

Commit

Permalink
berry
Browse files Browse the repository at this point in the history
  • Loading branch information
SimenB committed Jan 28, 2020
1 parent bc195e4 commit 1971cbf
Show file tree
Hide file tree
Showing 8 changed files with 20,989 additions and 162,430 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,7 @@ yarn-error.log*
junit.xml

*.tsbuildinfo

/.pnp.js
/.yarn/
!/.yarn/releases
147,315 changes: 0 additions & 147,315 deletions .yarn/releases/yarn-1.21.1.js

This file was deleted.

58 changes: 58 additions & 0 deletions .yarn/releases/yarn-berry.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@


lastUpdateCheck 1576854265612
yarn-path ".yarn/releases/yarn-1.21.1.js"
yarn-path ".yarn/releases/yarn-berry.js"
16 changes: 16 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"@types/which": "^1.3.2",
"@typescript-eslint/eslint-plugin": "^2.2.0",
"@typescript-eslint/parser": "^2.2.0",
"@yarnpkg/pnpify": "^2.0.0-rc.16",
"ansi-regex": "^5.0.0",
"ansi-styles": "^4.2.0",
"babel-eslint": "^10.0.3",
Expand Down Expand Up @@ -64,6 +65,7 @@
"mocha": "^7.0.0",
"mock-fs": "^4.4.1",
"opencollective": "^1.0.3",
"pnp-webpack-plugin": "^1.6.0",
"prettier": "^1.19.0",
"prettylint": "^1.0.0",
"progress": "^2.0.0",
Expand Down Expand Up @@ -146,5 +148,19 @@
},
"engines": {
"node": ">= 8.3"
},
"dependenciesMeta": {
"get-symbol-from-current-process-h": {
"unplugged": true
},
"get-uv-event-loop-napi-h": {
"unplugged": true
},
"node-addon-api": {
"unplugged": true
},
"setimmediate-napi": {
"unplugged": true
}
}
}
5 changes: 5 additions & 0 deletions scripts/browserBuild.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const path = require('path');
const webpack = require('webpack');
const camelCase = require('camelcase');
const rimraf = require('rimraf');
const PnpWebpackPlugin = require('pnp-webpack-plugin');

const transformOptions = require('../babel.config.js');

Expand Down Expand Up @@ -65,11 +66,15 @@ function browserBuild(pkgName, entryPath, destination) {
'../packages/expect/build/fakeChalk.js'
),
},
plugins: [PnpWebpackPlugin],
extensions: ['.js', '.json', '.ts'],
},
node: {
fs: 'empty',
},
resolveLoader: {
plugins: [PnpWebpackPlugin.moduleLoader(module)],
},
},
/* eslint-enable */
(err, stats) => {
Expand Down
10 changes: 3 additions & 7 deletions scripts/buildTs.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,8 @@ const packagesWithTs = packages.filter(p =>
);

const args = [
'--max-old-space-size=4096',
path.resolve(
require.resolve('typescript/package.json'),
'..',
require('typescript/package.json').bin.tsc
),
'pnpify',
'tsc',
'-b',
...packagesWithTs,
...process.argv.slice(2),
Expand All @@ -35,7 +31,7 @@ const args = [
console.log(chalk.inverse('Building TypeScript definition files'));

try {
execa.sync('node', args, {stdio: 'inherit'});
execa.sync('yarn', args, {stdio: 'inherit'});
console.log(
chalk.inverse.green('Successfully built TypeScript definition files')
);
Expand Down
Loading

0 comments on commit 1971cbf

Please sign in to comment.