Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update puppeteer for M1 support #13250

Closed
wants to merge 3 commits into from
Closed

Update puppeteer for M1 support #13250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15099da
Update puppeteer for M1 support
aherrmann Mar 10, 2022
9042335
Webpack 5 no longer includes shims
aherrmann Mar 10, 2022
4378610
fix some webpack config issues
garyverhaegen-da Mar 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion compatibility/bazel_tools/create-daml-app/testDeps.json
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
"@types/node": "^13.11.1",
"@types/puppeteer": "^3.0.1",
"@types/wait-on": "^4.0.0",
"puppeteer": "^4.0.1",
"puppeteer": "^10.0.0",
"wait-on": "^4.0.2"
}
}
2 changes: 1 addition & 1 deletion templates/create-daml-app-test-resources/testDeps.json
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
"@types/node": "^13.11.1",
"@types/puppeteer": "^3.0.1",
"@types/wait-on": "^4.0.0",
"puppeteer": "^4.0.1",
"puppeteer": "^10.0.0",
"wait-on": "^4.0.2"
}
}
22 changes: 22 additions & 0 deletions templates/create-daml-app/ui/config-overrides.js
View file
Open in desktop
@@ -0,0 +1,22 @@
/* config-overrides.js */
const webpack = require('webpack');
module.exports = function override(config, env) {
config.resolve.fallback = {
//url: require.resolve('url'),
//assert: require.resolve('assert'),
crypto: require.resolve('crypto-browserify'),
//http: require.resolve('stream-http'),
//https: require.resolve('https-browserify'),
//os: require.resolve('os-browserify/browser'),
//buffer: require.resolve('buffer'),
stream: require.resolve('stream-browserify'),
};
config.plugins.push(
new webpack.ProvidePlugin({
process: 'process/browser',
Buffer: ['buffer', 'Buffer'],
}),
);

return config;
}
14 changes: 9 additions & 5 deletions templates/create-daml-app/ui/package.json.template
View file
Open in desktop
Expand Up @@ -8,17 +8,20 @@
"@daml/react": "__VERSION__",
"@daml/types": "__VERSION__",
"@daml/hub-react": "^1.0.0",
"crypto-browserify": "^3.12.0",
"dotenv": "^8.2.0",
"jwt-simple": "^0.5.6",
"react": "^17.0.0",
"react-app-rewired": "^2.1.9",
"react-dom": "^17.0.0",
"semantic-ui-css": "^2.4.1",
"semantic-ui-react": "^2.0.0"
"semantic-ui-react": "^2.0.0",
"stream-browserify": "^3.0.0"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test --testURL='http://localhost:7575'",
"start": "react-app-rewired start",
"build": "react-app-rewired build",
"test": "react-app-rewired test --testURL='http://localhost:7575'",
"eject": "react-scripts eject",
"lint": "eslint --ext .js,.jsx,.ts,.tsx src/"
},
Expand All @@ -42,8 +45,9 @@
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"@types/dotenv": "^8.2.0",
"process": "0.11.10",
"http-proxy-middleware": "^1.0.4",
"react-scripts": "^4.0.3",
"react-scripts": "^5.0.0",
"typescript": "~3.8.3"
}
}