Skip to content

fix(js-toolkit): fix various integration problems with DXP #156

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

Merged
wincent merged 3 commits into from
Oct 14, 2020
Merged

fix(js-toolkit): fix various integration problems with DXP #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
405ad15
fix(js-toolkit): add prepublishOnly scripts everywhere
wincent Oct 14, 2020
c204ca0
fix(js-toolkit): fix mangled path when configuring webpack
wincent Oct 14, 2020
9a75db4
fix(js-toolkit): remove redundant `bundler` path segment
wincent Oct 14, 2020
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
2 changes: 1 addition & 1 deletion projects/js-toolkit/packages/generator-js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
1 change: 1 addition & 0 deletions projects/js-toolkit/packages/js-toolkit-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion projects/js-toolkit/packages/js-toolkit-scripts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion projects/js-toolkit/packages/npm-bridge-generator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
1 change: 1 addition & 0 deletions projects/js-toolkit/packages/npm-bundler/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion projects/js-toolkit/packages/npm-bundler/src/bundle/configure.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}`);

Expand Down
4 changes: 2 additions & 2 deletions projects/js-toolkit/packages/npm-bundler/src/globals.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down