Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf8241c5

Browse files
committed
refactor setGlobals
1 parenta850bcd commitf8241c5

File tree

4 files changed

+23
-42
lines changed

4 files changed

+23
-42
lines changed

‎lib/reducers/globals/set-globals.js

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@ function setWin() {
1515
}
1616
exports.setWin=setWin;
1717
functionsetGlobals(packageJson){
18-
window.coderoad=Object.assign(window.coderoad,{
18+
returnObject.assign({},{
1919
tutorial:packageJson.name,
2020
suffix:packageJson.config.testSuffix.substring(packageJson.config.testSuffix.lastIndexOf('.')+1,packageJson.config.testSuffix.length),
2121
tutorialDir:path.join(window.coderoad.dir,'node_modules',packageJson.name,packageJson.config.testDir),
2222
testRunner:packageJson.config.testRunner,
23-
testRunnerOptions:packageJson.config.testRunnerOptions||{}
24-
});
25-
loadRepo(packageJson);
26-
loadRunnerDep(packageJson);
23+
testRunnerOptions:packageJson.config.testRunnerOptions||{},
24+
runner:loadRunnerDep(packageJson),
25+
repo:loadRepo(packageJson),
26+
edit:packageJson.config.edit&&!!window.coderoad.repo||false,
27+
issuesPath:packageJson.bugs&&packageJson.bugs.url ?packageJson.bugs.url :null
28+
},window.coderoad);
2729
}
2830
exports.setGlobals=setGlobals;
2931
functionloadRunnerDep(packageJson){
@@ -49,22 +51,19 @@ function loadRunnerDep(packageJson) {
4951
runnerRoot=runnerRoot.substring(0,runnerRoot.lastIndexOf(slash));
5052
varpathToMain=path.join(runnerRoot,runnerMain);
5153
if(!!require(pathToMain).default){
52-
window.coderoad.runner=require(pathToMain).default;
54+
returnrequire(pathToMain).default;
5355
}
5456
else{
55-
window.coderoad.runner=require(pathToMain);
57+
returnrequire(pathToMain);
5658
}
5759
}
5860
functionloadRepo(packageJson){
59-
if(packageJson.bugs&&packageJson.bugs.url){
60-
window.coderoad.issuesPath=packageJson.bugs.url;
61-
}
6261
if(packageJson.repo&&packageJson.repo.url){
6362
varrepo=packageJson.repo.url;
6463
if(!!repo.match(/\.git$/)){
6564
repo=repo.slice(0,repo.length-4);
6665
}
67-
window.coderoad.repo=repo;
66+
returnrepo;
6867
}
69-
window.coderoad.edit=packageJson.config.edit&&!!window.coderoad.repo||false;
68+
returnnull;
7069
}

‎src/reducers/globals/set-globals.ts

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ export function setWin(): boolean {
1313
returnnavigator.appVersion.indexOf('Win')>-1;
1414
}
1515

16-
exportfunctionsetGlobals(packageJson:PackageJson){
17-
window.coderoad=Object.assign(window.coderoad,{
16+
exportfunctionsetGlobals(packageJson:PackageJson):CR.Coderoad{
17+
returnObject.assign({},{
1818
tutorial:packageJson.name,
1919
suffix:packageJson.config.testSuffix.substring(packageJson.config.testSuffix.lastIndexOf('.')+1,
2020
packageJson.config.testSuffix.length),
2121
tutorialDir:path.join(window.coderoad.dir,'node_modules',packageJson.name,packageJson.config.testDir),
2222
testRunner:packageJson.config.testRunner,
23-
testRunnerOptions:packageJson.config.testRunnerOptions||{}
24-
});
25-
// issues, bugs
26-
loadRepo(packageJson);
27-
// set PackageDeps
28-
loadRunnerDep(packageJson);
23+
testRunnerOptions:packageJson.config.testRunnerOptions||{},
24+
runner:loadRunnerDep(packageJson),
25+
repo:loadRepo(packageJson),
26+
edit:packageJson.config.edit&&!!window.coderoad.repo||false,
27+
issuesPath:packageJson.bugs&&packageJson.bugs.url ?packageJson.bugs.url :null
28+
},window.coderoad);
2929
}
3030

3131
functionloadRunnerDep(packageJson:PackageJson){
@@ -57,23 +57,19 @@ function loadRunnerDep(packageJson: PackageJson) {
5757
letpathToMain=path.join(runnerRoot,runnerMain);
5858

5959
if(!!require(pathToMain).default){
60-
window.coderoad.runner=require(pathToMain).default;
60+
returnrequire(pathToMain).default;
6161
}else{
62-
window.coderoad.runner=require(pathToMain);
62+
returnrequire(pathToMain);
6363
}
6464
}
6565

6666
functionloadRepo(packageJson:PackageJson){
67-
if(packageJson.bugs&&packageJson.bugs.url){
68-
window.coderoad.issuesPath=packageJson.bugs.url;
69-
}
7067
if(packageJson.repo&&packageJson.repo.url){
7168
letrepo:string=packageJson.repo.url;
7269
if(!!repo.match(/\.git$/)){
7370
repo=repo.slice(0,repo.length-4);
7471
}
75-
window.coderoad.repo=repo;
72+
returnrepo;
7673
}
77-
78-
window.coderoad.edit=packageJson.config.edit&&!!window.coderoad.repo||false;
74+
returnnull;
7975
}

‎src/store/initialState.ts

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

‎tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@
9797
"src/services/package.ts",
9898
"src/services/polyfills.ts",
9999
"src/services/write.ts",
100-
"src/store/initialState.ts",
101100
"src/store/store.ts",
102101
"src/components/alert/alert.tsx",
103102
"src/components/app.tsx",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp