Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci(scripts) patch #8102

Merged
merged 4 commits into from
Jul 31, 2022
Merged

ci(scripts) patch #8102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fce9383
build fast
ShaMan123 Jul 31, 2022
43c1bc4
Update transform_files.js
ShaMan123 Jul 31, 2022
077d448
Update index.js
ShaMan123 Jul 31, 2022
64e92bc
Update index.js
ShaMan123 Jul 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ export default {
name: 'fabric',
format: 'cjs',
},
{
Number(process.env.MINIFY) ?
{
file: './dist/fabric.min.js',
format: 'cjs',
name: 'fabric',
plugins: [terser()],
},
} : null,
],
plugins: [
ts({
Expand Down
4 changes: 2 additions & 2 deletions scripts/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class ICheckbox extends Checkbox {
inquirer.registerPrompt('test-selection', ICheckbox);

function build(options = {}) {
// _.defaults(options, { exclude: ['gestures', 'accessors', 'erasing'] });
// _.defaults(options, { exclude: ['gestures', 'accessors', 'erasing'] });
// const args = [
// `npm run`,
// `build.js`,
Expand All @@ -91,7 +91,7 @@ function build(options = {}) {
// `exclude=${options.exclude.join(',')}`
// ]
const args = ['npm run', 'build-rollup'];
cp.execSync(args.join(' '), { stdio: 'inherit', cwd: wd });
cp.execSync(args.join(' '), { stdio: 'inherit', cwd: wd, env: { ...process.env, MINIFY: Number(!options.fast) } });
}

function startWebsite() {
Expand Down
46 changes: 23 additions & 23 deletions scripts/transform_files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ function parseRawClass(raw) {
result && fields.push(result[1])
}
}

index++;
}
commas.reverse().forEach(pos => {
Expand Down Expand Up @@ -175,16 +175,16 @@ function generateMixin(rawClass, mixinName, baseClassNS, useExports) {
const funcName = `${mixinName}Generator`;
return `
${useExports ? 'export ' : ''}function ${funcName}(Klass) {
return class ${mixinName||''} extends Klass ${rawClass}
return class ${mixinName || ''} extends Klass ${rawClass}
}

${baseClassNS ? `${baseClassNS} = ${funcName}(${baseClassNS});`:''}
${baseClassNS ? `${baseClassNS} = ${funcName}(${baseClassNS});` : ''}
`;
}

function getMixinName(file) {
const name = path.parse(file).name.replace('mixin', '').split('.').map(val=>_.upperFirst(_.camelCase(val))).join('');
return name.replace('Itext','IText') + 'Mixin';
const name = path.parse(file).name.replace('mixin', '').split('.').map(val => _.upperFirst(_.camelCase(val))).join('');
return name.replace('Itext', 'IText') + 'Mixin';
}

function transformFile(raw, { namespace, name } = {}) {
Expand All @@ -197,7 +197,7 @@ function transformFile(raw, { namespace, name } = {}) {
const result = annoyingCheck.exec(raw);
if (result) {
const found = findObject(raw, '{', '}', result.index);
raw = raw.slice(0, result.index) + raw.slice(found.end+1);
raw = raw.slice(0, result.index) + raw.slice(found.end + 1);
}
raw = `//@ts-nocheck\n${raw}`;
return raw;
Expand Down Expand Up @@ -247,7 +247,7 @@ function transformClass(type, raw, options = {}) {
rawClass = rawClass.replace(regex, `${whitespace}${key === 'initialize' ? 'constructor' : key}(`);
if (regex.exec(rawClass)) {
throw new Error(`dupliate method found ${name}#${key}`);
}
}
}
else {
const start = getPropStart(key, rawClass);
Expand All @@ -264,15 +264,15 @@ function transformClass(type, raw, options = {}) {
}
} while (transformed !== rawClass);
const classDirective = type === 'mixin' ?
generateMixin(rawClass, `${_.upperFirst(name)}${className.replace(new RegExp(name.toLowerCase()==='staticcanvas'?'canvas':name, 'i'), '')}` || name, namespace, useExports) :
generateMixin(rawClass, `${_.upperFirst(name)}${className.replace(new RegExp(name.toLowerCase() === 'staticcanvas' ? 'canvas' : name, 'i'), '')}` || name, namespace, useExports) :
generateClass(rawClass, className || name, superClass, useExports);
raw = `${raw.slice(0, match.index)}${classDirective}${raw.slice(end + 1).replace(/\s*\)\s*;?/, '')}`;
if (type === 'mixin') {
// in case of multiple mixins in one file
try {
return transformClass(type, raw, options);
} catch (error) {

}
}
if (type === 'class' && !useExports) {
Expand All @@ -288,7 +288,7 @@ function convertFile(type, source, dest, options) {
name,
raw,
staticCandidantes,
requiresSuperClassResolution,
requiresSuperClassResolution,
superClasses
} = transformClass(type, readFile(source), {
className: type === 'mixin' && getMixinName(path.parse(source).name),
Expand All @@ -303,7 +303,7 @@ function convertFile(type, source, dest, options) {
destination: path.relative(wd, dest),
class: name,
requiresSuperClassResolution: requiresSuperClassResolution ? superClasses : false,
staticCandidantes: staticCandidantes.length > 0? staticCandidantes: 'none'
staticCandidantes: staticCandidantes.length > 0 ? staticCandidantes : 'none'
});
return dest;
} catch (error) {
Expand All @@ -327,7 +327,7 @@ function generateIndexFile(dir, files, ext) {
const file = path.resolve(dir, `index.${ext}`);
fs.writeFileSync(file, _.compact(files).map(file => {
const name = path.parse(file).name;
return `export * from ./${name};\n`;
return `export * from './${name}';\n`;
}).join(''));
console.log(chalk.bold(`created ${path.relative(wd, file)}`));
}
Expand All @@ -348,7 +348,7 @@ function listFiles() {
const dir = path.resolve(srcDir, klsDir);
fs.readdirSync(dir).map(file => {
paths.push({
dir,
dir,
file,
type: 'class'
});
Expand All @@ -364,14 +364,14 @@ function listFiles() {
});

const additionalFiles = fs.readdirSync(srcDir).filter(file => !fs.lstatSync(path.resolve(srcDir, file)).isDirectory());
additionalFiles.map(file => {
paths.push({
dir: srcDir,
file,
type: 'class'
});
});
additionalFiles.map(file => {
paths.push({
dir: srcDir,
file,
type: 'class'
});
});

return paths;
}

Expand All @@ -389,7 +389,7 @@ function transform(options = {}) {
{ dir, file, type }
);
});

const [errors, files] = _.partition(result, file => file instanceof Error);
const dirs = files.reduce((dirs, { dir, file }) => {
(dirs[dir] || (dirs[dir] = [])).push(file);
Expand All @@ -398,7 +398,7 @@ function transform(options = {}) {
options.createIndex && _.map(dirs, (files, dir) => generateIndexFile(dir, files, options.ext));
options.overwriteExisitingFiles && options.ext === 'ts' &&
files.forEach(({ dir, file }) => fs.removeSync(path.resolve(dir, file.replace('.ts', '.js'))));

if (!options.verbose) {
console.error(`failed files:`);
errors.map(console.error);
Expand Down