Skip to content

K
kus-admin
Commit c207cb35 by Иван Кубота
Options

2/3 working

parent fa381086
Showing with 54 additions and 46 deletions
index.js
......@@ -38,7 +38,6 @@ const serveBundle = async function(tpl, res){
);
transformJSX(jsx+'', path.posix.join(pack.src, pack.entry.js), function(err, result) {
debugger
if(err){
console.error(err)
cache[ '/' + cacheEntry ] = JSON.stringify(err, null,2);
......@@ -88,7 +87,7 @@ var transformJSX = function(code, fileName, cb) {
}
} );
};
var sass = require('node-sass');
var transformServe = function(dir) {
return function (req, res, next) {
if (req.url in cache) {
......@@ -99,29 +98,41 @@ var transformServe = function(dir) {
}*/
if (req.url.substr(-5) === '.scss') {
fs.readFile(path.join(dir, req.url), function(err, data){
// not secure
fs.readFile(path.join(__dirname,req.url), function(err, data){
if( err ){
next();
}else{
sass.render({
file: path.join(dir, req.url),
file: path.join(__dirname,req.url),
sourceMap: true,
importer: function(url, prev, done) {
console.log(url, prev, done)
// url is the path in import as is, which LibSass encountered.
// prev is the previously resolved path.
// done is an optional callback, either consume it or return value synchronously.
// this.options contains this options hash
someAsyncFunction(url, prev, function(result){
setTimeout(function(result){
var name = path.resolve(path.dirname(prev), url)
done({
file: result.path, // only one of them is required, see section Special Behaviours.
contents: result.data
file: name, // only one of them is required, see section Special Behaviours.
contents: fs.readFileSync(name)+''
});
});
},10);
// OR
var result = someSyncFunction(url, prev);
return {file: result.path, contents: result.data};
//var result = someSyncFunction(url, prev);
//return {file: result.path, contents: result.data};
}
}, function(err, result) {
if(err){
const errorText = `Error at ${err.file}:\n`+err.formatted;
return res.end(errorText)
}
}, function(err, result) { /*...*/ });
res.header('Content-Type', 'text/css');
res.end(result.css)
debugger
/*...*/ });
}
});
}else if (req.url.substr(-4) === '.jsx') {
......@@ -172,7 +183,7 @@ app.use('/', function(req, res, next) {
}
});
app.use(App.static(dir(pack.public)))
app.use(App.static(dir(pack.src)))
//app.use(App.static(dir(pack.src)))
......
package.json
......@@ -20,9 +20,7 @@
"devDependencies": {
"@babel/core": "^7.8.3",
"@babel/plugin-transform-modules-amd": "^7.8.3",
"@babel/plugin-transform-react-jsx": "^7.8.3",
"babel-plugin-async-import": "ssh://git@github.com:bernardmcmanus/babel-plugin-async-import.git",
"babel-plugin-func-wrap": "^1.1.0"
"@babel/plugin-transform-react-jsx": "^7.8.3"
},
"plugins": [
"@babel/plugin-transform-react-jsx"
......
src/controller/require.js → public/controller/require.js
......@@ -138,10 +138,22 @@
link.setAttribute('href', fileName);
head.appendChild(link);
};
var jsLoader = function(fileName) {
fileName = fileName.replace(/src\//,'');
var script = document.createElement('script');
script.setAttribute('type', script.type = 'text/javascript');
script.onload = function(){
};
script.setAttribute('src', script.src = fileName);
head.appendChild(script);
};
var InstantLoaders = [
{name: '.scss', loader: cssLoader},
{name: '.css', loader: cssLoader},
{name: '.jsx', loader: jsLoader},
{name: '.js', loader: jsLoader},
];
var Ready = function() {}; Ready.prototype = {ready: true};
......@@ -154,8 +166,10 @@
for( var i = 0, _i = InstantLoaders.length; i < _i; i++ ){
const instantLoader = InstantLoaders[ i ];
if(this.fileName.substr(-instantLoader.name.length).toLowerCase()===instantLoader.name){
instantLoader.loader(this.fileName);
return true;
if(instantLoader.loader(this.fileName)) {
return true;
}
break;
}
}
return false;
......@@ -173,13 +187,14 @@
};
var exec = function(def) {
var exports = {};
defined[def.fileName] = def.fn.apply(null, def.deps.map(function(dep) {
def.fn.apply(null, def.deps.map(function(dep) {
if(dep === 'exports'){
return exports;
}
return defined[resolve(def.fileName, dep)];
}));
defined[def.fileName] = exports;
wait[def.fileName] = new Ready();
for( var i = 0, _i = wait.length; i < _i; i++ ){
var waitElement = wait[ i ];
......
src/base.scss 0 → 100644
$black: #000;
$white: #fff;
src/index.html
......@@ -59,12 +59,9 @@
<script>
initDataProvider($DATA$);
debugger
define('begin', ['src/main.jsx'], function(main) {
debugger
main();
main.default();
});
</script>
</body>
</html>
\ No newline at end of file
src/main.jsx
data = null;
import './main.scss';
import {Button} from './view/cmp/button.jsx'
export default function() {
let tagField, exportEl;
......@@ -7,7 +8,7 @@ export default function() {
renderTo: document.body,
cls: 'content'
},
<Button value={22}/>,
div({
cls: 'main-menu'
},
......
src/main.scss
@import "base.scss";
body {
font-family: Verdana, Serif;
}
......
src/view/cmp/button.jsx
import './button.scss';
D.declare('cmp.Button', function(cfg) {
export const Button = D.declare('cmp.Button', function(cfg) {
return <input type='button' {...cfg} cls='button'/>
});
\ No newline at end of file
yarn.lock
......@@ -83,7 +83,7 @@
"@babel/types" "^7.8.3"
lodash "^4.17.13"
"@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
"@babel/helper-plugin-utils@^7.8.3":
version "7.8.3"
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
......@@ -126,13 +126,6 @@
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.3.tgz#790874091d2001c9be6ec426c2eed47bc7679081"
integrity sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ==
"@babel/plugin-syntax-dynamic-import@^7.2.0":
version "7.8.3"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
dependencies:
"@babel/helper-plugin-utils" "^7.8.0"
"@babel/plugin-syntax-jsx@^7.8.3":
version "7.8.3"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz#521b06c83c40480f1e58b4fd33b92eceb1d6ea94"
......@@ -168,7 +161,7 @@
"@babel/helper-plugin-utils" "^7.8.3"
"@babel/plugin-syntax-jsx" "^7.8.3"
"@babel/template@^7.4.4", "@babel/template@^7.8.3":
"@babel/template@^7.8.3":
version "7.8.3"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8"
integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==
......@@ -367,13 +360,6 @@ aws4@^1.8.0:
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
"babel-plugin-async-import@ssh://git@github.com:bernardmcmanus/babel-plugin-async-import.git":
version "2.1.0"
resolved "ssh://git@github.com:bernardmcmanus/babel-plugin-async-import.git#55aad29d8947247deffc56f3d0c38a9bf9773cb0"
dependencies:
"@babel/plugin-syntax-dynamic-import" "^7.2.0"
"@babel/template" "^7.4.4"
babel-plugin-dynamic-import-node@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"
......@@ -381,11 +367,6 @@ babel-plugin-dynamic-import-node@^2.3.0:
dependencies:
object.assign "^4.1.0"
babel-plugin-func-wrap@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/babel-plugin-func-wrap/-/babel-plugin-func-wrap-1.1.0.tgz#302e479eb9cc15ddb3db2c65f4b48a748b6e69a1"
integrity sha512-C6e8mUVg3c/o9LwGk3tYvRq8MlyZdqimtQHzcZdsb2nEywlOkmp3zlCllo8QAmcsnwSB30iEcZ6rr2AhhTwO3w==
balanced-match@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment