iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: fix broken merge (#3420)

This commit is contained in:
Jesús Rodríguez 2017-03-24 00:20:04 +01:00 committed by GitHub
parent 38f823e357
commit 77af42dba9
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/example-zipper/exampleZipper.js
View File

@ -65,13 +65,10 @@ class ExampleZipper {
const jsonFileName = configFileName.replace(/^.*[\\\/]/, ''); const jsonFileName = configFileName.replace(/^.*[\\\/]/, '');
const relativeDirName = path.dirname(path.dirname(path.relative(sourceDirName, configFileName))); const relativeDirName = path.dirname(path.dirname(path.relative(sourceDirName, configFileName)));
const exampleDirName = path.dirname(configFileName); const exampleDirName = path.dirname(configFileName);
<<<<<<< 6df8bea575824951ad80a82cb2e1310d4535f085
const examplesPackageJson = 'public/docs/_examples/package.json'; const examplesPackageJson = 'public/docs/_examples/package.json';
const examplesSystemjsConfig = 'public/docs/_examples/_boilerplate/src/systemjs.config.js'; const examplesSystemjsConfig = 'public/docs/_examples/_boilerplate/src/systemjs.config.js';
const examplesSystemjsLoaderConfig = 'public/docs/_examples/_boilerplate/src/systemjs-angular-loader.js'; const examplesSystemjsLoaderConfig = 'public/docs/_examples/_boilerplate/src/systemjs-angular-loader.js';
const exampleTsconfig = 'public/docs/_examples/_boilerplate/src/tsconfig.json'; const exampleTsconfig = 'public/docs/_examples/_boilerplate/src/tsconfig.json';
=======
>>>>>>> chore: better package.json for zipper
let exampleZipName = jsonFileName.replace(/(plnkr|zipper).json/, relativeDirName); let exampleZipName = jsonFileName.replace(/(plnkr|zipper).json/, relativeDirName);
const outputFileName = path.join(outputDirName, relativeDirName, exampleZipName + '.zip'); const outputFileName = path.join(outputDirName, relativeDirName, exampleZipName + '.zip');
let defaultIncludes = ['**/*.ts', '**/*.js', '**/*.css', '**/*.html', '**/*.md', '**/*.json', '**/*.png']; let defaultIncludes = ['**/*.ts', '**/*.js', '**/*.css', '**/*.html', '**/*.md', '**/*.json', '**/*.png'];