diff --git a/.gitignore b/.gitignore index 3d3e7740b..fc1d176b3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,6 @@ node_modules/ aot/ scripts/ionic-native-bower dist/ -src/plugins/**/ngx +src/@ionic-native/plugins/**/ngx *.d.ts injectable-classes.json diff --git a/scripts/build/transformers/imports.ts b/scripts/build/transformers/imports.ts index 3b1a14ab8..40faa3cb4 100644 --- a/scripts/build/transformers/imports.ts +++ b/scripts/build/transformers/imports.ts @@ -19,13 +19,15 @@ function transformImports(file: ts.SourceFile, ctx: ts.TransformationContext, ng const decoratorRegex: RegExp = /@([a-zA-Z]+)\(/g; + const ignored: string [] = ['Plugin', 'Component']; + let m; while ((m = decoratorRegex.exec(file.text)) !== null) { if (m.index === decoratorRegex.lastIndex) { decoratorRegex.lastIndex++; } - if (m && m[1] && decorators.indexOf(m[1]) === -1 && m[1] !== 'Plugin') decorators.push(m[1]); + if (m && m[1] && decorators.indexOf(m[1]) === -1 && ignored.indexOf(m[1]) === -1) decorators.push(m[1]); } if (decorators.length) { diff --git a/scripts/tasks/publish.ts b/scripts/tasks/publish.ts index 1d2939acc..854596bda 100644 --- a/scripts/tasks/publish.ts +++ b/scripts/tasks/publish.ts @@ -20,7 +20,7 @@ const PACKAGE_JSON_BASE = { } }; -const DIST = path.resolve(ROOT, 'dist'); +const DIST = path.resolve(ROOT, 'dist/@ionic-native'); const PACKAGES = []; @@ -66,8 +66,8 @@ function prepare() { function publish() { // TODO apply queue system so it doesn't publish everything at once PACKAGES.forEach((pkg: string) => { - // console.log('Going to run the following command: ', `npm publish ${ pkg } ${ FLAGS }`); - exec(`npm publish ${ pkg } ${ FLAGS }`); + console.log('Going to run the following command: ', `npm publish ${ pkg } ${ FLAGS }`); + // exec(`npm publish ${ pkg } ${ FLAGS }`); }); }