Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
4da3d8c
chore(react-scripts): add appIncludes
Dec 22, 2019
19ffe5c
chore(react-scripts): update package.json
Dec 22, 2019
3118b6a
chore(react-scripts): update package.json
Dec 22, 2019
06891a0
chore(react-scripts): fix export
Dec 22, 2019
a5c0873
v3.3.1
Dec 22, 2019
493b8c2
chore(react-scripts): adjust webpack config
Dec 22, 2019
2de5ad8
chore(react-scripts): remove commas
Dec 22, 2019
1866ce3
v3.3.2
Dec 22, 2019
ea941ee
chore(react-scripts): add missing imports
Dec 22, 2019
e2b4394
v3.3.3
Dec 22, 2019
6be812a
chore(react-scripts): add error handling when not in monorepo
Dec 22, 2019
d359f16
v3.3.4
Dec 22, 2019
5829bc2
chore(react-scripts): bump version
Dec 22, 2019
66eecb1
chore(react-scripts): delete file
Jan 6, 2020
af71664
chore(react-script): re-add file
Jan 6, 2020
1d12367
chore(react-scripts): bump version
Jan 6, 2020
5b4d2cb
Merge branch 'master' into develop
Feb 29, 2020
ccfe991
chore(app): remove file
Mar 1, 2020
c3dfe19
chore(app): re-add file
Mar 1, 2020
8c5e1f3
chore(react-scripts): fixed building issue with yarn v1.22.0 and up
DalderupMaurice Mar 5, 2020
a25fb24
v3.4.0-nosplatform.2
DalderupMaurice Mar 5, 2020
eff6fa6
chore(app): remove file
DalderupMaurice Mar 5, 2020
37f30fa
chore(app): add file
DalderupMaurice Mar 5, 2020
5ed0cee
v3.4.0-nosplatform.3
DalderupMaurice Mar 5, 2020
173c2f1
chore(app): remove file
Mar 6, 2020
35c7892
chore(app): add file
Mar 6, 2020
40d2ddc
v3.4.0-nosplatform.4
Mar 6, 2020
48d7891
Merge tag 'v3.4.1' into develop
Mar 24, 2020
5d00a5f
chore(react-scripts): bump version
Mar 24, 2020
c7ff674
Merge branch 'master' into develop
Oct 24, 2020
a5fa4a1
chore(root): linting
Oct 24, 2020
b7e94e2
Revert "chore(root): linting"
Oct 24, 2020
d5c5632
chore(app): bump version
DalderupMaurice Oct 24, 2020
8247010
chore(app): adjust package.json path
DalderupMaurice Oct 24, 2020
23e58ad
v4.0.0-nosplatform.2
DalderupMaurice Oct 25, 2020
4663285
Merge branch 'parent-master' into develop
DalderupMaurice Dec 5, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,4 +217,4 @@ We are grateful to the authors of existing related projects for their ideas and

## License

Create React App is open source software [licensed as MIT](https://github.com/facebook/create-react-app/blob/master/LICENSE). The Create React App logo is licensed under a [Creative Commons Attribution 4.0 International license](https://creativecommons.org/licenses/by/4.0/).
Create React App is open source software [licensed as MIT](https://github.com/facebook/create-react-app/blob/master/LICENSE). The Create React App logo is licensed under a [Creative Commons Attribution 4.0 International license](https://creativecommons.org/licenses/by/4.0/).
Empty file modified packages/react-scripts/bin/react-scripts.js
100755 → 100644
Empty file.
24 changes: 19 additions & 5 deletions packages/react-scripts/config/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ const ESLintPlugin = require('eslint-webpack-plugin');
const paths = require('./paths');
const modules = require('./modules');
const getClientEnvironment = require('./env');
const spawn = require('cross-spawn');
const root = require('find-yarn-workspace-root')();
const ModuleNotFoundPlugin = require('react-dev-utils/ModuleNotFoundPlugin');
const ForkTsCheckerWebpackPlugin = require('react-dev-utils/ForkTsCheckerWebpackPlugin');
const typescriptFormatter = require('react-dev-utils/typescriptFormatter');
Expand Down Expand Up @@ -71,6 +73,21 @@ const cssModuleRegex = /\.module\.css$/;
const sassRegex = /\.(scss|sass)$/;
const sassModuleRegex = /\.module\.(scss|sass)$/;

let includedSources;
if (root) {
const vrs = spawn.sync('yarn', ['-v']);
const pgks = spawn.sync('yarn', ['workspaces', 'info', '--json']);
const output = JSON.parse(pgks.output[1].toString());
const version = vrs.output[1].toString();
const packages = version < '1.22.0' ? JSON.parse(output.data) : output;

includedSources = Object.values(packages).map(val =>
path.join(root, val.location)
);
} else {
includedSources = paths.appSrc;
}

const hasJsxRuntime = (() => {
if (process.env.DISABLE_NEW_JSX_TRANSFORM === 'true') {
return false;
Expand Down Expand Up @@ -351,10 +368,7 @@ module.exports = function (webpackEnv) {
// To fix this, we prevent you from importing files out of src/ -- if you'd like to,
// please link the files into your node_modules/ and let module-resolution kick in.
// Make sure your source files are compiled, as they will not be processed in any way.
new ModuleScopePlugin(paths.appSrc, [
paths.appPackageJson,
reactRefreshOverlayEntry,
]),
new ModuleScopePlugin(paths.appSrc, [reactRefreshOverlayEntry]),
],
},
resolveLoader: {
Expand Down Expand Up @@ -400,7 +414,7 @@ module.exports = function (webpackEnv) {
// The preset includes JSX, Flow, TypeScript, and some ESnext features.
{
test: /\.(js|mjs|jsx|ts|tsx)$/,
include: paths.appSrc,
include: includedSources,
loader: require.resolve('babel-loader'),
options: {
customize: require.resolve(
Expand Down
14 changes: 9 additions & 5 deletions packages/react-scripts/package.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"name": "react-scripts",
"version": "4.0.1",
"description": "Configuration and scripts for Create React App.",
"name": "@nosplatform/react-scripts",
"version": "4.0.1-nosplatform.1",
"description": "nOS Configuration and scripts for Create React App.",
"repository": {
"type": "git",
"url": "https://github.com/facebook/create-react-app.git",
"url": "https://github.com/nos/create-react-app.git",
"directory": "packages/react-scripts"
},
"license": "MIT",
"engines": {
"node": "^10.12.0 || >=12.0.0"
},
"bugs": {
"url": "https://github.com/facebook/create-react-app/issues"
"url": "https://github.com/nos/create-react-app/issues"
},
"files": [
"bin",
Expand Down Expand Up @@ -55,6 +55,7 @@
"eslint-plugin-testing-library": "^3.9.2",
"eslint-webpack-plugin": "^2.1.0",
"file-loader": "6.1.1",
"find-yarn-workspace-root": "2.0.0",
"fs-extra": "^9.0.1",
"html-webpack-plugin": "4.5.0",
"identity-obj-proxy": "3.0.0",
Expand Down Expand Up @@ -113,5 +114,8 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"publishConfig": {
"access": "public"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,9 @@ function verifyTypeScriptSetup() {
} else {
// This is bug fix code of https://github.com/facebook/create-react-app/issues/9868
// Bellow code release variable from non-extensible and freeze status.
appTsConfig.compilerOptions = JSON.parse(JSON.stringify(appTsConfig.compilerOptions));
appTsConfig.compilerOptions = JSON.parse(
JSON.stringify(appTsConfig.compilerOptions)
);

// Original appTsConfig.compilerOptions status
// Object.isExtensible(appTsConfig.compilerOptions) output: false
Expand Down