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

Commit132814c

Browse files
committed
revert to earlier working version
1 parente3d0a4c commit132814c

File tree

10 files changed

+26
-36
lines changed

10 files changed

+26
-36
lines changed

‎lib/components/app.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ var default_1 = (function (_super) {
2929
}
3030
default_1.prototype.render=function(){
3131
varstate=this.props.state;
32+
console.log(state);
3233
return(React.createElement("section",{className:'cr',key:'main',style:{height:height}},React.createElement(_components_1.Menu,{route:state.route,position:state.position}),React.createElement(_components_1.Routes,{state:state,ref:'route'}),React.createElement(_components_1.Alert,{alert:state.alert})));
3334
};
3435
default_1=__decorate([

‎lib/services/setup/setup.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
"use strict";
2-
varsystem_checks_1=require('./system-checks');
32
varsetup_checks_1=require('./setup-checks');
43
var_base_1=require('../../_base');
54
varAction=require('../../actions/actions');
65
functionverifySetupComplete(){
7-
system_checks_1.npmVersionThreeOrLater()
8-
.then(setup_checks_1.hasDirectory)
6+
setup_checks_1.hasDirectory()
97
.then(setup_checks_1.hasPackageJson)
108
.then(setup_checks_1.hasTutorialDep)
119
.then(function(){
Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,8 @@
11
"use strict";
2-
varcommand_line_1=require('../command-line');
32
functionnpmVersionThreeOrLater(){
43
varminVersion=3;
54
returnnewPromise(function(resolve,reject){
6-
varthreeOrLater=command_line_1.default('npm','-v').then(function(res){returnparseInt(res,10)>=minVersion;});
7-
if(!threeOrLater){
8-
reject({
9-
key:'updateNpm',
10-
title:'Please update to NPM version 3+',
11-
click:null,
12-
text:'Open a terminal and run:\n `npm install npm -g`',
13-
button:'Update NPM',
14-
verify:'NPM updated to version 3 or later'
15-
});
16-
}
17-
else{
18-
resolve();
19-
}
5+
resolve();
206
});
217
}
228
exports.npmVersionThreeOrLater=npmVersionThreeOrLater;

‎lib/services/setup/tutorials.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ function _isTutorial(name) {
3737
console.log("Error with "+name+": no test runner specified. "+tutorialError);
3838
returnfalse;
3939
}
40-
varpathToTestRunner=path.join(window.coderoad.dir,'node_modules',packageJson.config.testRunner);
4140
returntrue;
4241
}
4342
functionsearchForTutorials(deps){
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
"use strict";
2+
functioncanUpdateTutorial(name,currentVersion){
3+
}
4+
exports.canUpdateTutorial=canUpdateTutorial;

‎src/components/app.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ window.onresize = function() {
1616
exportdefaultclassextendsReact.Component<{state?:CR.State},{}>{
1717
render():React.ReactElement<{}>{
1818
conststate=this.props.state;
19+
console.log(state);
1920
return(
2021
<sectionclassName='cr'key='main'style={{height}}>
2122
<Menuroute={state.route}position={state.position}/>

‎src/services/setup/setup.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import * as Action from '../../actions/actions';
99

1010
exportfunctionverifySetupComplete(){
1111
// system checks
12-
npmVersionThreeOrLater()
12+
//npmVersionThreeOrLater()
1313
// setup checks
14-
.then(hasDirectory)
14+
hasDirectory()
1515
.then(hasPackageJson)
1616
.then(hasTutorialDep)
1717
.then(()=>{

‎src/services/setup/system-checks.ts‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@ import commandLine from '../command-line';
33
exportfunctionnpmVersionThreeOrLater():Promise<CR.SetupWarning>{
44
constminVersion=3;
55
returnnewPromise((resolve,reject)=>{
6-
letthreeOrLater:Promise<boolean>=commandLine('npm','-v').then((res:string)=>parseInt(res,10)>=minVersion);
7-
if(!threeOrLater){
8-
reject({
9-
key:'updateNpm',
10-
title:'Please update to NPM version 3+',
11-
text:'Open a terminal and run:\n `npm install npm -g`',
12-
verify:'NPM updated to version 3 or later'
13-
});
14-
}else{
15-
resolve();
16-
}
6+
resolve();
7+
// let threeOrLater: Promise<boolean> = commandLine('npm', '-v').then((res: string) => parseInt(res, 10) >= minVersion);
8+
// if (!threeOrLater) {
9+
// reject({
10+
// key: 'updateNpm',
11+
// title: 'Please update to NPM version 3+',
12+
// text: 'Open a terminal and run:\n `npm install npm -g`',
13+
// verify: 'NPM updated to version 3 or later'
14+
// });
15+
// } else {
16+
// resolve();
17+
// }
1718
});
1819
}

‎src/services/setup/tutorials.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ function _isTutorial(name: string): boolean {
4343
returnfalse;
4444
}
4545

46-
letcurrentTutorialVersion:string=packageJson.dependencies[name]||packageJson.devDependencies[name];
47-
canUpdateTutorial(name,currentTutorialVersion);
46+
//let currentTutorialVersion: string = packageJson.dependencies[name] || packageJson.devDependencies[name];
47+
//canUpdateTutorial(name, currentTutorialVersion);
4848

4949
// let pathToTestRunner = path.join(window.coderoad.dir, 'node_modules', packageJson.config.testRunner);
5050
// // if (!fileExists(pathToTestRunner)) {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
importcommandLinefrom'../command-line';
22

33
exportfunctioncanUpdateTutorial(name:string,currentVersion:string){
4-
letlatestVersion=commandLine('npm',`outdated${name}`);
5-
console.log(latestVersion,currentVersion);
4+
//let latestVersion = commandLine('npm', `outdated ${name}`);
5+
//console.log(latestVersion, currentVersion);
66
}

0 commit comments

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