@@ -79,27 +79,28 @@ public static function getRequireJs(array $config = [], array $plugins = [])
79
79
'tmpPath ' => \sys_get_temp_dir (),
80
80
// 'basePath' => __DIR__,
81
81
'basePath ' =>array_merge ($ conf ['basePath ' ], [
82
- getcwd ().\DIRECTORY_SEPARATOR .'modules ' ,
82
+ //Nee getcwd().\DIRECTORY_SEPARATOR.'modules',
83
83
getenv ('FRDL_WORKSPACE ' ).\DIRECTORY_SEPARATOR .'modules ' ,
84
- 'https://webfan.de/install/modules ' ,
84
+ getenv ('FRDL_WORKSPACE ' ).\DIRECTORY_SEPARATOR .'node_modules ' ,
85
+ 'https://startdir.de/install/modules ' ,
85
86
'https://webfan.de/install/stable ' ,
86
87
'https://webfan.de/install/latest ' ,
87
- getcwd (),
88
+ 'https://webfan.de/install/modules ' ,
89
+ // getcwd(),
88
90
]),
89
91
'modulesExt ' => '.php ' ,
90
92
'folderAsModuleFileName ' => 'index.php ' ,
91
93
'packageInfoFileName ' => 'package.php ' ,
92
94
// 'autoNamespacing' => false,
93
95
'autoNamespacing ' => true ,
94
- 'autoNamespacingCacheExpires ' => 24 *60 *60 ,
96
+ 'autoNamespacingCacheExpires ' => 31 * 24 *60 *60 ,
95
97
'validators ' => [],
96
98
), $ conf );
97
99
98
100
$ config ['basePath ' ] = array_merge ($ config ['basePath ' ], [
99
- getcwd ().\DIRECTORY_SEPARATOR .'modules ' ,
100
101
'https://webfan.de/install/modules ' ,
101
102
getenv ('FRDL_WORKSPACE ' ).\DIRECTORY_SEPARATOR .'modules ' ,
102
- getcwd () ,
103
+ getenv ( ' FRDL_WORKSPACE ' ).\ DIRECTORY_SEPARATOR . ' node_modules ' ,
103
104
]);
104
105
105
106
$ config ['basePath ' ] = array_unique ($ config ['basePath ' ]);
@@ -340,8 +341,12 @@ public static function getRequireJs(array $config = [], array $plugins = [])
340
341
// eval($moduleFileContent);
341
342
$ tempFilename = \Webfan \CommonJavascript::temporaryFile ($ moduleFileContent , null , $ autoNamespacingCacheExpires , $ tmpPath );
342
343
$ exp = var_export ([
344
+ 'id ' => $ module ['id ' ],
343
345
'file ' =>$ tempFilename ,
344
346
'time ' =>time (),
347
+ 'sha1 ' => sha1 ($ moduleFileContent ),
348
+ 'size ' => strlen ($ moduleFileContent ),
349
+ 'source ' => $ moduleFilePath ,
345
350
],true );
346
351
$ phpCode = "<?php \n return $ exp; " ;
347
352
0 commit comments