From aa198970311410260650f9ae6c2dd79217c4a0be Mon Sep 17 00:00:00 2001 From: "Julien Carion (juca)" Date: Thu, 13 Apr 2023 10:04:07 +0200 Subject: [PATCH] [FIX] devtools: Fix build commands for windows users This commit adapts the commands used and the rollup file to be compatible with windows console commands syntax. --- package.json | 4 ++-- tools/devtools/rollup.config.js | 24 ++++++++++++++++-------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 855038f4..6cd04e9f 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,8 @@ "build:devtools": "rollup -c ./tools/devtools/rollup.config.js", "dev:devtools-chrome": "npm run build:devtools -- --config-browser=chrome", "dev:devtools-firefox": "npm run build:devtools -- --config-browser=firefox", - "build:devtools-chrome": "NODE_ENV=production npm run dev:devtools-chrome", - "build:devtools-firefox": "NODE_ENV=production npm run dev:devtools-firefox", + "build:devtools-chrome": "npm run dev:devtools-chrome -- --config-env=production", + "build:devtools-firefox": "npm run dev:devtools-firefox -- --config-env=production", "test": "jest", "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand --watch --testTimeout=5000000", "test:watch": "jest --watch", diff --git a/tools/devtools/rollup.config.js b/tools/devtools/rollup.config.js index 71841a51..eac1d383 100644 --- a/tools/devtools/rollup.config.js +++ b/tools/devtools/rollup.config.js @@ -4,8 +4,10 @@ import execute from "rollup-plugin-execute"; import del from "rollup-plugin-delete"; import { string } from "rollup-plugin-string"; -export default ({ "config-browser": browser }) => { - const isProduction = process.env.NODE_ENV === "production"; +const isWindows = process.platform === "win32"; + +export default ({ "config-browser": browser, "config-env": env }) => { + const isProduction = env === "production"; const isChrome = browser === "chrome"; const filesToMove = [ { src: "tools/devtools/assets/**/*", dest: "dist/devtools/assets/" }, @@ -53,13 +55,19 @@ export default ({ "config-browser": browser }) => { }; } const commands = new Array(2); - commands[1] = - "npm run compile_templates -- tools/devtools/src && mv templates.js tools/devtools/assets/templates.js"; + commands[1] = isWindows + ? "npm run compile_templates -- tools\\devtools\\src && move templates.js tools\\devtools\\assets\\templates.js" + : "npm run compile_templates -- tools/devtools/src && mv templates.js tools/devtools/assets/templates.js"; const firstRule = generateRule("tools/devtools/src/page_scripts/owl_devtools_global_hook.js"); - if (isProduction) - commands[0] = - "npm run build && cp dist/owl.iife.js tools/devtools/assets/owl.js && npm run build:compiler"; - else commands[0] = "cp dist/owl.iife.js tools/devtools/assets/owl.js"; + if (isProduction) { + commands[0] = isWindows + ? "npm run build && copy dist\\owl.iife.js tools\\devtools\\assets\\owl.js && npm run build:compiler" + : "npm run build && cp dist/owl.iife.js tools/devtools/assets/owl.js && npm run build:compiler"; + } else { + commands[0] = isWindows + ? "copy dist\\owl.iife.js tools\\devtools\\assets\\owl.js" + : "cp dist/owl.iife.js tools/devtools/assets/owl.js"; + } firstRule.plugins.push(execute(commands, true)); const secondRule = generateRule("tools/devtools/src/content.js"); secondRule.plugins.push(copy({ targets: filesToMove }));