Skip to content

Commit 2123e4c

Browse files
devlocodevloco
authored
Merge pull request #46 from devloco/3.4.0-Issue.45
3.4.0 issue.45
2 parents a8d508b + 41e6269 commit 2123e4c

File tree

7 files changed

+44
-96
lines changed

7 files changed

+44
-96
lines changed

‎README.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
# Create React WP Theme <!-- omit in toc -->
22

3-
## Still Up to Date
3+
## Update to 3.4.1 Coming Soon
44

5-
Mar. 19, 2020
5+
Apr. 12, 2020
66
<br />
7-
It's been a while, so I thought I'd just let everyone know that [v3.4.0](https://github.com/facebook/create-react-app/releases/tag/v3.4.0) of `Create-React-App` is still the latest. I'll keep my eye on it and update this project whenever Facebook releases a new version.
7+
Facebook released [v3.4.1](https://github.com/facebook/create-react-app/releases/tag/v3.4.1) of `Create-React-App`. I'm preparing an update and should be done soon.
8+
9+
Until then you can continue to create new projects using [v3.4.0](https://github.com/facebook/create-react-app/releases/tag/v3.4.0). When the new release is ready,
10+
[updating is easy](#updating-existing-themes)!
811

912
---
1013

‎packages/create-react-wptheme-utils/getPublicUrlOrPath.js‎

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎packages/create-react-wptheme-utils/getUserConfig.js‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,43 +26,47 @@ function _getUserConfig(paths, configName, defaultConfig) {
2626
userConfig = require(path.join(paths.appPath, configName));
2727
} catch (err) {
2828
userConfig = JSON.stringify(defaultConfig, null, 4);
29-
_writeUserConfig(paths, configName, userConfig);
29+
// Issue 45; Always write the dev config on error; only write the prod config if it is complete.
30+
if (configName === _userDevConfigName || (configName === _userProdConfigName && defaultConfig && typeof defaultConfig.homepage === "string")) {
31+
_writeUserConfig(paths, configName, userConfig);
32+
}
3033
return defaultConfig;
3134
}
3235

3336
return userConfig;
3437
}
3538

36-
module.exports = function(paths, nodeEnv) {
39+
module.exports = function (paths, nodeEnv) {
3740
const appPackageJson = require(paths.appPackageJson);
3841

3942
const defaultUserDevConfig = {
4043
fileWatcherPlugin: {
4144
touchFile: "./public/index.php",
4245
ignored: "./public/index.php",
43-
watchFileGlobs: ["./public/**/*.js", "./public/**/*.css", "./public/**/*.php"]
46+
watchFileGlobs: ["./public/**/*.js", "./public/**/*.css", "./public/**/*.php"],
4447
},
4548
wpThemeServer: {
4649
enable: true,
4750
host: "127.0.0.1",
4851
port: 8090,
4952
sslCert: null,
5053
sslKey: null,
51-
watchFile: "../index.php"
54+
watchFile: "../index.php",
5255
},
5356
injectWpThemeClient: {
5457
override: null,
55-
file: "./build/index.php"
56-
}
58+
file: "./build/index.php",
59+
},
5760
};
5861

5962
const defaultUserProdConfig = {
6063
finalBuildPath: null,
61-
homepage: appPackageJson.homepage
64+
homepage: appPackageJson.homepage,
6265
};
6366

6467
// Create both files ASAP.
6568
if (!wpThemePostInstallerInfo.postInstallerExists(paths)) {
69+
nodeEnv = "init"; // Issue 45; this should only happen during setup of a new theme...
6670
_getUserConfig(paths, _userDevConfigName, defaultUserDevConfig);
6771
_getUserConfig(paths, _userProdConfigName, defaultUserProdConfig);
6872
}
@@ -78,6 +82,7 @@ module.exports = function(paths, nodeEnv) {
7882
switch (nodeEnv) {
7983
case "dev":
8084
case "development":
85+
case "init":
8186
return _getUserConfig(paths, _userDevConfigName, defaultUserDevConfig);
8287
case "build":
8388
case "prod":

‎packages/create-react-wptheme-utils/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devloco/create-react-wptheme-utils",
3-
"version": "3.4.0-wp.1",
3+
"version": "3.4.0-wp.11",
44
"description": "Utilities used by create-react-wptheme.",
55
"engines": {
66
"node": ">=8"
@@ -20,7 +20,6 @@
2020
"files": [
2121
"fileFunctions.js",
2222
"fileWatcherPlugin.js",
23-
"getPublicUrlOrPath.js",
2423
"getUserConfig.js",
2524
"postInstallerInfo.js",
2625
"shell-js.js",

‎packages/create-react-wptheme/README.md‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
# Create React WP Theme
22

3-
## Still Up to Date
3+
Facebook released v3.4.1 of Create-React-App. I'm preparing an update that should be done soon.
44

5-
Mar. 19, 2020
5+
Until then you can continue to create new projects using v3.4.0. When the new release is ready, updating is easy!
6+
7+
## Update to 3.4.1 Coming Soon
8+
9+
Apr. 12, 2020
610
<br />
7-
It's been a while, so I thought I'd just let everyone know that [v3.4.0](https://github.com/facebook/create-react-app/releases/tag/v3.4.0) of `Create-React-App` is still the latest. I'll keep my eye on it and update this project whenever Facebook releases a new version.
11+
Facebook released [v3.4.1](https://github.com/facebook/create-react-app/releases/tag/v3.4.1) of `Create-React-App`. I'm preparing an update and should be done soon.
12+
13+
Until then you can continue to create new projects using [v3.4.0](https://github.com/facebook/create-react-app/releases/tag/v3.4.0). When the new release is ready,
14+
[updating is easy](https://github.com/devloco/create-react-wptheme/tree/master#updating-existing-themes)!
815

916
---
1017

‎packages/create-react-wptheme/createReactWpTheme.js‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,23 @@ const _wpThemeVersion = packageJson.version;
4343
const _createReactAppVersion = _wpThemeVersion.split("-wp.")[0];
4444

4545
// Check these!!!!
46-
const _reactScriptsWpThemeVersion = "^3.4.0-wp.1";
47-
const _getScriptsPath = function() {
46+
const _reactScriptsWpThemeVersion = "^3.4.0-wp.9";
47+
const _getScriptsPath = function () {
4848
return scriptsFromNpm();
4949
};
5050

51-
const scriptsFromNpm = function() {
51+
const scriptsFromNpm = function () {
5252
//console.log("SCRIPTS FROM NPM");
5353
return {
54-
path: `@devloco/react-scripts-wptheme@${_reactScriptsWpThemeVersion}`
54+
path: `@devloco/react-scripts-wptheme@${_reactScriptsWpThemeVersion}`,
5555
};
5656
};
5757

58-
const scriptsFromGit = function() {
58+
const scriptsFromGit = function () {
5959
console.log("SCRIPTS FROM GIT");
6060
const deleteFolderRecursive = (path) => {
6161
if (fs.existsSync(path)) {
62-
fs.readdirSync(path).forEach(function(file) {
62+
fs.readdirSync(path).forEach(function (file) {
6363
let curPath = path + "/" + file;
6464
if (fs.statSync(curPath).isDirectory()) {
6565
// recurse
@@ -84,9 +84,9 @@ const scriptsFromGit = function() {
8484
let scriptsPath = "file:" + path.join(tempPath, "create-react-app", "packages", "react-scripts");
8585
return {
8686
path: scriptsPath,
87-
callback: function() {
87+
callback: function () {
8888
deleteFolderRecursive(tempPath);
89-
}
89+
},
9090
};
9191
};
9292

@@ -122,11 +122,11 @@ if (program.info) {
122122
Binaries: ["Node", "npm", "Yarn"],
123123
Browsers: ["Chrome", "Edge", "Internet Explorer", "Firefox", "Safari"],
124124
npmPackages: ["react", "react-dom", "react-scripts"],
125-
npmGlobalPackages: ["create-react-app"]
125+
npmGlobalPackages: ["create-react-app"],
126126
},
127127
{
128128
duplicates: true,
129-
showNotFound: true
129+
showNotFound: true,
130130
}
131131
)
132132
.then(console.log);
@@ -199,7 +199,7 @@ function createWpTheme(root, appName, version, verbose, originalDirectory, templ
199199
.then((packageName) =>
200200
checkIfOnline(useYarn).then((isOnline) => ({
201201
isOnline: isOnline,
202-
packageName: packageName
202+
packageName: packageName,
203203
}))
204204
)
205205
.then((info) => {
@@ -241,14 +241,14 @@ function createReactApp(createWpThemeReactRoot, appName, version, verbose, origi
241241
args.push(scriptsPath.path);
242242

243243
const child = spawn(command, args, { stdio: "inherit" })
244-
.on("error", function(err) {
244+
.on("error", function (err) {
245245
console.log(`createReactWpTheme.js ERROR for command: ${command} ${args.join(" ")}`);
246246
throw err;
247247
})
248248
.on("close", (code) => {
249249
if (code !== 0) {
250250
reject({
251-
command: `${command} ${args.join(" ")}`
251+
command: `${command} ${args.join(" ")}`,
252252
});
253253

254254
return;
@@ -288,9 +288,7 @@ function getProxy() {
288288
} else {
289289
try {
290290
// Trying to read https-proxy from .npmrc
291-
let httpsProxy = execSync("npm config get https-proxy")
292-
.toString()
293-
.trim();
291+
let httpsProxy = execSync("npm config get https-proxy").toString().trim();
294292
return httpsProxy !== "null" ? httpsProxy : undefined;
295293
} catch (e) {
296294
return;

‎packages/create-react-wptheme/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-react-wptheme",
3-
"version": "3.4.0-wp.3",
3+
"version": "3.4.0-wp.7",
44
"description": "Create React-enabled WP themes.",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)