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

OSOE-430: Fix PNPM link error and reapply #103 #109

Merged
merged 8 commits into from
Jan 29, 2024
Merged

OSOE-430: Fix PNPM link error and reapply #103 #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
647ae4d
Revert "Revert "OSOE-430: Use get-cwd and don't resolve symlink path""
sarahelsaig Oct 31, 2023
a6191a7
Add verbosity to pnpm link.
sarahelsaig Oct 31, 2023
d02d9f0
more verbosity
sarahelsaig Oct 31, 2023
bc0c7b4
Revert importance changes.
sarahelsaig Oct 31, 2023
1a08315
Adding --loglevel debug --use-stderr isn't helpful.
sarahelsaig Oct 31, 2023
eeb96ce
Merge remote-tracking branch 'origin/dev' into issue/OSOE-430-newer
sarahelsaig Dec 28, 2023
4d96538
Merge branch 'dev' into issue/OSOE-430-newer
sarahelsaig Jan 18, 2024
073deb3
Merge remote-tracking branch 'origin/dev' into issue/OSOE-430-newer
sarahelsaig Jan 28, 2024
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
21 changes: 15 additions & 6 deletions Lombiq.VueJs/Assets/Scripts/helpers/process-helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const { handleErrorObject, handleErrorMessage } = require('.nx/scripts/handle-error');
const path = require('path');
const fs = require('fs');
const getProjectDirectory = require('.nx/scripts/get-project-directory');
const { handleErrorObject, handleErrorMessage, handleWarningMessage } = require('.nx/scripts/handle-error');

async function executeFunctionByCommandLineArgument(functions) {
const [functionName, argumentOptionsJson] = process.argv.slice(2);
Expand Down Expand Up @@ -33,11 +34,19 @@ async function executeFunctionByCommandLineArgument(functions) {
}

function leaveNodeModule() {
const location = process.cwd().split(path.sep).slice(-2).join('/');
const projectDirectory = getProjectDirectory();

// Need to check both because Windows and Linux resolve the directory symlink between the two differently.
if (location === 'node_modules/lombiq-vuejs' || location === 'node_modules/.lv') {
process.chdir(path.resolve('..', '..'));
if (!projectDirectory) {
handleWarningMessage(
'The project directory is not specified. Your environment may be misconfigured, see ' +
'get-project-directory for information about what the script is looking for.');
}
else if (fs.existsSync(projectDirectory)) {
process.chdir(projectDirectory);
}
else {
handleWarningMessage(
`The project directory according to get-project-directory.js (${projectDirectory}) is not found.`);
}
}

Expand Down
4 changes: 2 additions & 2 deletions Lombiq.VueJs/Assets/Scripts/helpers/vue-sfc-compiler-pipeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ const { executeFunctionByCommandLineArgument, leaveNodeModule } = require('./pro
leaveNodeModule();

const defaultOptions = {
sfcRootPath: path.resolve('Assets', 'Scripts', 'VueComponents'),
sfcDestinationPath: path.resolve('wwwroot', 'vue'),
sfcRootPath: path.join('Assets', 'Scripts', 'VueComponents'),
sfcDestinationPath: path.join('wwwroot', 'vue'),
vueJsNodeModulesPath: path.resolve(__dirname, '..', '..', '..', 'node_modules'),
rollupAlias: {},
isProduction: false,
Expand Down