diff --git a/projects/js-toolkit/packages/generator-js/package.json b/projects/js-toolkit/packages/generator-js/package.json index eefa7d561f..777b888454 100644 --- a/projects/js-toolkit/packages/generator-js/package.json +++ b/projects/js-toolkit/packages/generator-js/package.json @@ -29,7 +29,7 @@ "build": "tsc && yarn copyfiles", "clean": "node ../../scripts/clean.js", "copyfiles": "node ../../scripts/copyfiles.js", - "prepublish": "yarn build" + "prepublishOnly": "yarn build" }, "version": "3.0.0-alpha.1" } diff --git a/projects/js-toolkit/packages/js-toolkit-core/package.json b/projects/js-toolkit/packages/js-toolkit-core/package.json index 6488a8adde..daed3a9ce4 100644 --- a/projects/js-toolkit/packages/js-toolkit-core/package.json +++ b/projects/js-toolkit/packages/js-toolkit-core/package.json @@ -30,6 +30,7 @@ "clean": "node ../../scripts/clean.js", "copyfiles": "node ../../scripts/copyfiles.js", "postversion": "npx liferay-js-publish", + "prepublishOnly": "yarn build", "preversion": "yarn ci" }, "version": "3.0.0-alpha.2" diff --git a/projects/js-toolkit/packages/js-toolkit-scripts/package.json b/projects/js-toolkit/packages/js-toolkit-scripts/package.json index 2e60ca4841..77d401112a 100644 --- a/projects/js-toolkit/packages/js-toolkit-scripts/package.json +++ b/projects/js-toolkit/packages/js-toolkit-scripts/package.json @@ -31,7 +31,7 @@ "build": "tsc && yarn copyfiles", "clean": "node ../../scripts/clean.js", "copyfiles": "node ../../scripts/copyfiles.js", - "prepublish": "yarn build" + "prepublishOnly": "yarn build" }, "version": "3.0.0-alpha.1" } diff --git a/projects/js-toolkit/packages/npm-bridge-generator/package.json b/projects/js-toolkit/packages/npm-bridge-generator/package.json index 1142e4099c..3c9f9347c5 100644 --- a/projects/js-toolkit/packages/npm-bridge-generator/package.json +++ b/projects/js-toolkit/packages/npm-bridge-generator/package.json @@ -21,7 +21,7 @@ "build": "tsc && yarn copyfiles", "clean": "node ../../scripts/clean.js", "copyfiles": "node ../../scripts/copyfiles.js", - "prepublish": "yarn build" + "prepublishOnly": "yarn build" }, "version": "3.0.0-alpha.1" } diff --git a/projects/js-toolkit/packages/npm-bundler/package.json b/projects/js-toolkit/packages/npm-bundler/package.json index 474937ae3d..c984e1f40d 100644 --- a/projects/js-toolkit/packages/npm-bundler/package.json +++ b/projects/js-toolkit/packages/npm-bundler/package.json @@ -35,6 +35,7 @@ "clean": "node ../../scripts/clean.js", "copyfiles": "node ../../scripts/copyfiles.js", "postversion": "npx liferay-js-publish", + "prepublishOnly": "yarn build", "preversion": "yarn ci" }, "version": "3.0.0-alpha.5" diff --git a/projects/js-toolkit/packages/npm-bundler/src/bundle/configure.ts b/projects/js-toolkit/packages/npm-bundler/src/bundle/configure.ts index 76e10d9181..a418a82252 100644 --- a/projects/js-toolkit/packages/npm-bundler/src/bundle/configure.ts +++ b/projects/js-toolkit/packages/npm-bundler/src/bundle/configure.ts @@ -38,7 +38,7 @@ export default function configure(): webpack.Configuration { generatedFile = exportDependencyModule(id, moduleName); } - entry[id] = `./${generatedFile.asPosix}`; + entry[id] = generatedFile.asPosix; log.debug(`Generated entry point with id ${id} for ${moduleName}`); diff --git a/projects/js-toolkit/packages/npm-bundler/src/globals.ts b/projects/js-toolkit/packages/npm-bundler/src/globals.ts index 7855b3ca49..93febae9a9 100644 --- a/projects/js-toolkit/packages/npm-bundler/src/globals.ts +++ b/projects/js-toolkit/packages/npm-bundler/src/globals.ts @@ -12,8 +12,8 @@ export const project = new Project('.'); const {workDir} = project; -export const bundlerGeneratedDir = workDir.join('bundler', 'generated'); -export const bundlerWebpackDir = workDir.join('bundler', 'webpack'); +export const bundlerGeneratedDir = workDir.join('generated'); +export const bundlerWebpackDir = workDir.join('webpack'); fs.ensureDirSync(project.outputDir.asNative); fs.ensureDirSync(bundlerGeneratedDir.asNative);