Michel2/pybricks-code
1
0
Fork 0
mirror of https://github.com/pybricks/pybricks-code.git synced 2026-09-12 09:36:27 +00:00
Code Issues Releases Activity

drop craco

Browse Source 
Since we aren't using react-scripts any more, craco doesn't do anything.
This merges the craco config into the config created by `yarn eject`.
This commit is contained in:
David Lechner
2022-05-10 20:27:58 -05:00
parent 5ee74187eb
commit df12c40802
6 changed files with 83 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.eslintrc.js
+1
View File
@@ -30,6 +30,7 @@ module.exports = {
react: { version: 'detect' },
},
ignorePatterns: [
'config/**/*.js',
'test/env.js',
'.eslintrc.js',
'.prettierrc.js',
config/jest/babelTransform.js
+1
View File
@@ -16,6 +16,7 @@ const hasJsxRuntime = (() => {
})();
module.exports = babelJest.createTransformer({
plugins: ['@shopify/react-i18n/babel'],
presets: [
[
require.resolve('babel-preset-react-app'),
craco.config.js → config/licenses.js
+34 -124
View File
@@ -1,15 +1,14 @@
// Configuration file to override create-react-app.
//
// https://github.com/gsoft-inc/craco/blob/master/packages/craco/README.md#configuration
// SPDX-License-Identifier: MIT
// Copyright (c) 2021-2022 The Pybricks Authors
// This module provides the license config object for LicenseWebpackPlugin.
const { addBeforeLoader, loaderByName } = require('@craco/craco');
const CopyPlugin = require('copy-webpack-plugin');
const LicensePlugin = require('license-webpack-plugin').LicenseWebpackPlugin;
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
const satisfies = require('spdx-satisfies');
const path = require('path');
const fs = require('fs');
const projectDir = path.resolve(__dirname, '..');
// Permissive licenses can be added here. We would like to avoid copyleft.
const approvedLicenses = ['0BSD', 'Apache-2.0', 'BSD-3-Clause', 'ISC', 'MIT'];
@@ -26,12 +25,15 @@ function personToString(person) {
}
let str = person.name;
if (person.email) {
str += ` <${person.email}>`;
}
if (person.url) {
str += ` (${person.url})`;
}
return str;
}
@@ -39,7 +41,7 @@ function personToString(person) {
// license here e.g. from the README.
const dexieLicense = fs.readFileSync(
path.join(__dirname, 'node_modules', 'dexie', 'LICENSE'),
path.join(projectDir, 'node_modules', 'dexie', 'LICENSE'),
{ encoding: 'utf-8' },
);
@@ -214,124 +216,32 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.`,
};
module.exports = {
babel: {
plugins: ['@shopify/react-i18n/babel'],
outputFilename: 'static/oss-licenses.json',
perChunkOutput: false,
renderLicenses: (modules) => {
return JSON.stringify(
modules
.map((m) => ({
name: m.packageJson.name,
version: m.packageJson.version,
author: personToString(m.packageJson.author),
license: m.licenseId,
licenseText: m.licenseText,
}))
.sort((a, b) => a.name.localeCompare(b.name, 'en')),
);
},
webpack: {
plugins: [
new CopyPlugin({
patterns: [
{
from: 'public/manifest.json',
transform(content, path) {
return content
.toString()
.replace(
/%\w+%/g,
(m) => process.env[m.slice(1, m.length - 1)] || '',
);
},
},
],
}),
new CopyPlugin({
patterns: [
{
from: 'node_modules/@pybricks/ide-docs/html',
to: 'static/docs',
},
],
}),
new LicensePlugin({
outputFilename: 'static/oss-licenses.json',
perChunkOutput: false,
renderLicenses: (modules) => {
return JSON.stringify(
modules
.map((m) => ({
name: m.packageJson.name,
version: m.packageJson.version,
author: personToString(m.packageJson.author),
license: m.licenseId,
licenseText: m.licenseText,
}))
.sort((a, b) => a.name.localeCompare(b.name, 'en')),
);
},
licenseTextOverrides,
additionalModules: [
{ name: '@pybricks/pybricks-code', directory: __dirname },
{
name: '@pybricks/ide-docs',
directory: path.join(
__dirname,
'node_modules',
'@pybricks',
'ide-docs',
),
},
],
unacceptableLicenseTest: (licenseType) =>
!satisfies(licenseType, `(${approvedLicenses.join(' OR ')})`),
handleMissingLicenseText: (packageName, licenseType) => {
throw new Error(
`missing license text for ${packageName} (${licenseType})`,
);
},
}),
new MonacoWebpackPlugin({
languages: ['python'],
filename: '[name].worker.[contenthash].js',
}),
],
},
plugins: [
licenseTextOverrides,
additionalModules: [
{ name: '@pybricks/pybricks-code', directory: projectDir },
{
plugin: {
overrideWebpackConfig: ({
webpackConfig,
cracoConfig,
pluginOptions,
context: { env, paths },
}) => {
// work around @shopify/* webpack compatibility
// https://github.com/Shopify/quilt/issues/1722#issuecomment-789883471
webpackConfig.module.rules.push({
test: /\.mjs$/,
include: /node_modules/,
type: 'javascript/auto',
});
// work around default handling of .wasm files
// https://github.com/webpack/webpack/issues/7352
addBeforeLoader(webpackConfig, loaderByName('file-loader'), {
test: /\.wasm$/,
type: 'javascript/auto',
loader: 'file-loader',
options: {
name: 'static/[name].[hash:8].[ext]',
},
});
return webpackConfig;
},
overrideJestConfig: ({
jestConfig,
cracoConfig,
pluginOptions,
context: { env, paths, resolve, rootDir },
}) => {
const index = jestConfig.transformIgnorePatterns.indexOf(
'[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs|cjs|ts|tsx)$',
);
// https://github.com/react-monaco-editor/react-monaco-editor/issues/306#issuecomment-701025628
// https://github.com/GoogleChromeLabs/browser-fs-access/issues/42
jestConfig.transformIgnorePatterns[index] =
'[/\\\\]node_modules[/\\\\](?!(monaco-editor|react-monaco-editor|browser-fs-access)[/\\\\]).+\\.(js|jsx|mjs|cjs|ts|tsx)$';
return jestConfig;
},
},
options: {},
name: '@pybricks/ide-docs',
directory: path.join(projectDir, 'node_modules', '@pybricks', 'ide-docs'),
},
],
unacceptableLicenseTest: (licenseType) =>
!satisfies(licenseType, `(${approvedLicenses.join(' OR ')})`),
handleMissingLicenseText: (packageName, licenseType) => {
throw new Error(`missing license text for ${packageName} (${licenseType})`);
},
};
config/webpack.config.js
+44 -1
View File
@@ -4,6 +4,9 @@ const fs = require('fs');
const path = require('path');
const webpack = require('webpack');
const resolve = require('resolve');
const CopyPlugin = require('copy-webpack-plugin');
const LicensePlugin = require('license-webpack-plugin').LicenseWebpackPlugin;
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
const InlineChunkHtmlPlugin = require('react-dev-utils/InlineChunkHtmlPlugin');
@@ -293,7 +296,8 @@ module.exports = function (webpackEnv) {
],
},
resolve: {
// This allows you to set a fallback for where webpack should look for modules.
// work around emscripten referencing node.js modules
fallback: { crypto: false, fs: false, path: false },
// We placed these paths second because we want `node_modules` to "win"
// if there are any conflicts. This matches Node resolution mechanism.
// https://github.com/facebook/create-react-app/issues/253
@@ -421,6 +425,7 @@ module.exports = function (webpackEnv) {
],
plugins: [
require.resolve('@shopify/react-i18n/babel'),
isEnvDevelopment &&
shouldUseReactRefresh &&
require.resolve('react-refresh/babel'),
@@ -543,6 +548,16 @@ module.exports = function (webpackEnv) {
'sass-loader'
),
},
// Adds support for wasm that runs as an application.
// https://github.com/webpack/webpack/issues/7352
{
test: /\.wasm$/,
type: 'javascript/auto',
loader: 'file-loader',
options: {
name: 'static/[name].[hash:8].[ext]',
},
},
// "file" loader makes sure those assets get served by WebpackDevServer.
// When you `import` an asset, you get its (virtual) filename.
// In production, they would get copied to the `build` folder.
@@ -563,6 +578,34 @@ module.exports = function (webpackEnv) {
].filter(Boolean),
},
plugins: [
new CopyPlugin({
patterns: [
{
from: 'public/manifest.json',
transform(content, path) {
return content
.toString()
.replace(
/%\w+%/g,
(m) => process.env[m.slice(1, m.length - 1)] || '',
);
},
},
],
}),
new CopyPlugin({
patterns: [
{
from: 'node_modules/@pybricks/ide-docs/html',
to: 'static/docs',
},
],
}),
new LicensePlugin(require('./licenses')),
new MonacoWebpackPlugin({
languages: ['python'],
filename: '[name].worker.[contenthash].js',
}),
// Generates an `index.html` file with the <script> injected.
new HtmlWebpackPlugin(
Object.assign(
package.json
+1 -2
View File
@@ -11,7 +11,6 @@
"@babel/core": "^7.16.0",
"@blueprintjs/core": "^4.0.0-rc.0",
"@blueprintjs/popover2": "^1.0.0-rc.0",
"@craco/craco": "^6.4.3",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
"@pybricks/firmware": "4.14.0",
"@pybricks/ide-docs": "2.1.0",
@@ -181,7 +180,7 @@
"^(?!.*\\.(js|jsx|mjs|cjs|ts|tsx|css|json)$)": "<rootDir>/config/jest/fileTransform.js"
},
"transformIgnorePatterns": [
"[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs|cjs|ts|tsx)$",
"[/\\\\]node_modules[/\\\\](?!(monaco-editor|react-monaco-editor|browser-fs-access)[/\\\\]).+\\.(js|jsx|mjs|cjs|ts|tsx)$",
"^.+\\.module\\.(css|sass|scss)$"
],
"modulePaths": [],
yarn.lock
+2 -175
View File
@@ -1832,40 +1832,6 @@ __metadata:
languageName: node
linkType: hard
"@craco/craco@npm:^6.4.3":
version: 6.4.3
resolution: "@craco/craco@npm:6.4.3"
dependencies:
cosmiconfig: ^7.0.1
cosmiconfig-typescript-loader: ^1.0.0
cross-spawn: ^7.0.0
lodash: ^4.17.15
semver: ^7.3.2
webpack-merge: ^4.2.2
peerDependencies:
react-scripts: ^4.0.0
bin:
craco: bin/craco.js
checksum: f177f0c15c32cb80ed5c25a62af7e0754268580bfdf2790f48f3d0399ae33288630ddcf3823e3f29b9f0010fef231eb48c91ba0371af6bac75ebc9e0e04b5a01
languageName: node
linkType: hard
"@cspotcode/source-map-consumer@npm:0.8.0":
version: 0.8.0
resolution: "@cspotcode/source-map-consumer@npm:0.8.0"
checksum: c0c16ca3d2f58898f1bd74c4f41a189dbcc202e642e60e489cbcc2e52419c4e89bdead02c886a12fb13ea37798ede9e562b2321df997ebc210ae9bd881561b4e
languageName: node
linkType: hard
"@cspotcode/source-map-support@npm:0.7.0":
version: 0.7.0
resolution: "@cspotcode/source-map-support@npm:0.7.0"
dependencies:
"@cspotcode/source-map-consumer": 0.8.0
checksum: 9faddda7757cd778b5fd6812137b2cc265810043680d6399acc20441668fafcdc874053be9dccd0d9110087287bfad27eb3bf342f72bceca9aa9059f5d0c4be8
languageName: node
linkType: hard
"@csstools/normalize.css@npm:*":
version: 12.0.0
resolution: "@csstools/normalize.css@npm:12.0.0"
@@ -2499,7 +2465,6 @@ __metadata:
"@babel/core": ^7.16.0
"@blueprintjs/core": ^4.0.0-rc.0
"@blueprintjs/popover2": ^1.0.0-rc.0
"@craco/craco": ^6.4.3
"@pmmmwh/react-refresh-webpack-plugin": ^0.5.3
"@pybricks/firmware": 4.14.0
"@pybricks/ide-docs": 2.1.0
@@ -3075,34 +3040,6 @@ __metadata:
languageName: node
linkType: hard
"@tsconfig/node10@npm:^1.0.7":
version: 1.0.8
resolution: "@tsconfig/node10@npm:1.0.8"
checksum: b8d5fffbc6b17ef64ef74f7fdbccee02a809a063ade785c3648dae59406bc207f70ea2c4296f92749b33019fa36a5ae716e42e49cc7f1bbf0fd147be0d6b970a
languageName: node
linkType: hard
"@tsconfig/node12@npm:^1.0.7":
version: 1.0.9
resolution: "@tsconfig/node12@npm:1.0.9"
checksum: a01b2400ab3582b86b589c6d31dcd0c0656f333adecde85d6d7d4086adb059808b82692380bb169546d189bf771ae21d02544a75b57bd6da4a5dd95f8567bec9
languageName: node
linkType: hard
"@tsconfig/node14@npm:^1.0.0":
version: 1.0.1
resolution: "@tsconfig/node14@npm:1.0.1"
checksum: 976345e896c0f059867f94f8d0f6ddb8b1844fb62bf36b727de8a9a68f024857e5db97ed51d3325e23e0616a5e48c034ff51a8d595b3fe7e955f3587540489be
languageName: node
linkType: hard
"@tsconfig/node16@npm:^1.0.2":
version: 1.0.2
resolution: "@tsconfig/node16@npm:1.0.2"
checksum: ca94d3639714672bbfd55f03521d3f56bb6a25479bd425da81faf21f13e1e9d15f40f97377dedbbf477a5841c5b0c8f4cd1b391f33553d750b9202c54c2c07aa
languageName: node
linkType: hard
"@types/aria-query@npm:^4.2.0":
version: 4.2.2
resolution: "@types/aria-query@npm:4.2.2"
@@ -4136,13 +4073,6 @@ __metadata:
languageName: node
linkType: hard
"acorn-walk@npm:^8.1.1":
version: 8.2.0
resolution: "acorn-walk@npm:8.2.0"
checksum: 1715e76c01dd7b2d4ca472f9c58968516a4899378a63ad5b6c2d668bba8da21a71976c14ec5f5b75f887b6317c4ae0b897ab141c831d741dc76024d8745f1ad1
languageName: node
linkType: hard
"acorn@npm:^7.0.0, acorn@npm:^7.1.1, acorn@npm:^7.4.0":
version: 7.4.1
resolution: "acorn@npm:7.4.1"
@@ -4431,13 +4361,6 @@ __metadata:
languageName: node
linkType: hard
"arg@npm:^4.1.0":
version: 4.1.3
resolution: "arg@npm:4.1.3"
checksum: 544af8dd3f60546d3e4aff084d451b96961d2267d668670199692f8d054f0415d86fc5497d0e641e91546f0aa920e7c29e5250e99fc89f5552a34b5d93b77f43
languageName: node
linkType: hard
"arg@npm:^5.0.1":
version: 5.0.1
resolution: "arg@npm:5.0.1"
@@ -5748,20 +5671,6 @@ __metadata:
languageName: node
linkType: hard
"cosmiconfig-typescript-loader@npm:^1.0.0":
version: 1.0.6
resolution: "cosmiconfig-typescript-loader@npm:1.0.6"
dependencies:
cosmiconfig: ^7
ts-node: ^10.6.0
peerDependencies:
"@types/node": "*"
cosmiconfig: ">=7"
typescript: ">=3"
checksum: da1dbdffe341688d1ea953f2ef9d69ea6c480d17922c7eb4b5fcdc0b410bc4db633f261316df78623a1ea45496fb109b90ade974e910114f77a5f150b324f85d
languageName: node
linkType: hard
"cosmiconfig@npm:^6.0.0":
version: 6.0.0
resolution: "cosmiconfig@npm:6.0.0"
@@ -5775,7 +5684,7 @@ __metadata:
languageName: node
linkType: hard
"cosmiconfig@npm:^7, cosmiconfig@npm:^7.0.0, cosmiconfig@npm:^7.0.1":
"cosmiconfig@npm:^7.0.0":
version: 7.0.1
resolution: "cosmiconfig@npm:7.0.1"
dependencies:
@@ -5788,14 +5697,7 @@ __metadata:
languageName: node
linkType: hard
"create-require@npm:^1.1.0":
version: 1.1.1
resolution: "create-require@npm:1.1.1"
checksum: a9a1503d4390d8b59ad86f4607de7870b39cad43d929813599a23714831e81c520bddf61bcdd1f8e30f05fd3a2b71ae8538e946eb2786dc65c2bbc520f692eff
languageName: node
linkType: hard
"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
"cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
version: 7.0.3
resolution: "cross-spawn@npm:7.0.3"
dependencies:
@@ -6399,13 +6301,6 @@ __metadata:
languageName: node
linkType: hard
"diff@npm:^4.0.1":
version: 4.0.2
resolution: "diff@npm:4.0.2"
checksum: f2c09b0ce4e6b301c221addd83bf3f454c0bc00caa3dd837cf6c127d6edf7223aa2bbe3b688feea110b7f262adbfc845b757c44c8a9f8c0c5b15d8fa9ce9d20d
languageName: node
linkType: hard
"dir-glob@npm:^3.0.1":
version: 3.0.1
resolution: "dir-glob@npm:3.0.1"
@@ -10084,13 +9979,6 @@ __metadata:
languageName: node
linkType: hard
"make-error@npm:^1.1.1":
version: 1.3.6
resolution: "make-error@npm:1.3.6"
checksum: b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402
languageName: node
linkType: hard
"make-fetch-happen@npm:^10.0.3":
version: 10.0.6
resolution: "make-fetch-happen@npm:10.0.6"
@@ -14375,44 +14263,6 @@ __metadata:
languageName: node
linkType: hard
"ts-node@npm:^10.6.0":
version: 10.7.0
resolution: "ts-node@npm:10.7.0"
dependencies:
"@cspotcode/source-map-support": 0.7.0
"@tsconfig/node10": ^1.0.7
"@tsconfig/node12": ^1.0.7
"@tsconfig/node14": ^1.0.0
"@tsconfig/node16": ^1.0.2
acorn: ^8.4.1
acorn-walk: ^8.1.1
arg: ^4.1.0
create-require: ^1.1.0
diff: ^4.0.1
make-error: ^1.1.1
v8-compile-cache-lib: ^3.0.0
yn: 3.1.1
peerDependencies:
"@swc/core": ">=1.2.50"
"@swc/wasm": ">=1.2.50"
"@types/node": "*"
typescript: ">=2.7"
peerDependenciesMeta:
"@swc/core":
optional: true
"@swc/wasm":
optional: true
bin:
ts-node: dist/bin.js
ts-node-cwd: dist/bin-cwd.js
ts-node-esm: dist/bin-esm.js
ts-node-script: dist/bin-script.js
ts-node-transpile-only: dist/bin-transpile.js
ts-script: dist/bin-script-deprecated.js
checksum: 2a379e43f7478d0b79e1e63af91fe222d83857727957df4bd3bdf3c0a884de5097b12feb9bbf530074526b8874c0338b0e6328cf334f3a5e2c49c71e837273f7
languageName: node
linkType: hard
"tsconfig-paths@npm:^3.12.0":
version: 3.14.0
resolution: "tsconfig-paths@npm:3.14.0"
@@ -14850,13 +14700,6 @@ __metadata:
languageName: node
linkType: hard
"v8-compile-cache-lib@npm:^3.0.0":
version: 3.0.0
resolution: "v8-compile-cache-lib@npm:3.0.0"
checksum: 674e312bbca796584b61dc915f33c7e7dc4e06d196e0048cb772c8964493a1ec723f1dd014d9419fd55c24a6eae148f60769da23f622e05cd13268063fa1ed6b
languageName: node
linkType: hard
"v8-compile-cache@npm:^2.0.3":
version: 2.3.0
resolution: "v8-compile-cache@npm:2.3.0"
@@ -15063,15 +14906,6 @@ __metadata:
languageName: node
linkType: hard
"webpack-merge@npm:^4.2.2":
version: 4.2.2
resolution: "webpack-merge@npm:4.2.2"
dependencies:
lodash: ^4.17.15
checksum: ce58bc8ab53a3dd5d9a0df65684571349eef53372bf8f224521072110485391335b26ab097c5f07829b88d0c146056944149566e5a953f05997b0fe2cbaf8dd6
languageName: node
linkType: hard
"webpack-sources@npm:^1.4.3":
version: 1.4.3
resolution: "webpack-sources@npm:1.4.3"
@@ -15658,13 +15492,6 @@ __metadata:
languageName: node
linkType: hard
"yn@npm:3.1.1":
version: 3.1.1
resolution: "yn@npm:3.1.1"
checksum: 2c487b0e149e746ef48cda9f8bad10fc83693cd69d7f9dcd8be4214e985de33a29c9e24f3c0d6bcf2288427040a8947406ab27f7af67ee9456e6b84854f02dd6
languageName: node
linkType: hard
"yocto-queue@npm:^0.1.0":
version: 0.1.0
resolution: "yocto-queue@npm:0.1.0"