From 78af7d6c2ae17dffbc79f4f2326d0e1733bfe6c0 Mon Sep 17 00:00:00 2001 From: Michael Cartner <32543275+michaelcartner@users.noreply.github.com> Date: Fri, 26 Jan 2024 17:27:57 +0100 Subject: [PATCH] fix: update package name, commit #dedd2f4f1487462cc80454d0d8c72bc6b99eb898 didn't address the whole issue (#12) --- package-lock.json | 8 ++++---- package.json | 4 ++-- packages/noodl-editor/package.json | 2 +- packages/noodl-editor/src/editor/src/pages/AppRoute.ts | 2 +- scripts/noodl-editor/build-editor.ts | 4 ++-- scripts/start.ts | 2 +- scripts/test-editor.ts | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 08697e8..81ab15b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35443,7 +35443,7 @@ "dev": true, "license": "MIT" }, - "node_modules/Noodl": { + "node_modules/Noodl-Editor": { "resolved": "packages/noodl-editor", "link": true }, @@ -48967,8 +48967,8 @@ "dev": true }, "packages/noodl-editor": { - "name": "Noodl", - "version": "1.0.0", + "name": "Noodl-Editor", + "version": "1.0.1", "dependencies": { "@electron/remote": "^2.1.1", "@jaames/iro": "^5.5.2", @@ -80984,7 +80984,7 @@ "version": "2.0.10", "dev": true }, - "Noodl": { + "Noodl-Editor": { "version": "file:packages/noodl-editor", "requires": { "@babel/core": "^7.19.1", diff --git a/package.json b/package.json index 75493f0..f0b8ac1 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "graph": "npx nx graph", "ci:prepare:editor": "ts-node ./scripts/ci-editor-prepare.ts", "ci:build:viewer": "lerna exec --scope @noodl/noodl-viewer-react -- npm run build", - "ci:build:editor": "lerna exec --scope Noodl -- npm run ci:build", + "ci:build:editor": "lerna exec --scope Noodl-Editor -- npm run ci:build", "build:editor": "ts-node ./scripts/build-editor.ts", "build:editor:_viewer": "ts-node ./scripts/noodl-editor/build-viewer.ts", "build:editor:_editor": "ts-node ./scripts/noodl-editor/build-editor.ts", @@ -20,7 +20,7 @@ "build:cloud-runtime": "lerna run build --scope @noodl/cloud-runtime --stream && lerna run build:pack --scope @noodl/cloud-runtime --stream", "start:storybook": "lerna exec --scope @noodl/noodl-core-ui -- npm run start", "start:viewer": "lerna run start --scope @noodl/noodl-viewer-react --stream", - "start:editor": "lerna run start --scope Noodl --stream", + "start:editor": "lerna run start --scope Noodl-Editor --stream", "dev": "ts-node ./scripts/start.ts", "start": "ts-node ./scripts/start.ts -- --build-viewer", "test:editor": "ts-node ./scripts/test-editor.ts", diff --git a/packages/noodl-editor/package.json b/packages/noodl-editor/package.json index 413f66b..5acd25e 100644 --- a/packages/noodl-editor/package.json +++ b/packages/noodl-editor/package.json @@ -1,5 +1,5 @@ { - "name": "Noodl", + "name": "Noodl-Editor", "productName": "Noodl Editor", "description": "Low-code for when experience matter", "author": "Noodl ", diff --git a/packages/noodl-editor/src/editor/src/pages/AppRoute.ts b/packages/noodl-editor/src/editor/src/pages/AppRoute.ts index 297a4d5..2c0b1c4 100644 --- a/packages/noodl-editor/src/editor/src/pages/AppRoute.ts +++ b/packages/noodl-editor/src/editor/src/pages/AppRoute.ts @@ -1,4 +1,4 @@ -import { AppRouter } from "Noodl/src/editor/src/pages/AppRouter"; +import { AppRouter } from "Noodl-Editor/src/editor/src/pages/AppRouter"; export class AppRoute { constructor(public readonly router: AppRouter) {} diff --git a/scripts/noodl-editor/build-editor.ts b/scripts/noodl-editor/build-editor.ts index ad73895..4f386da 100644 --- a/scripts/noodl-editor/build-editor.ts +++ b/scripts/noodl-editor/build-editor.ts @@ -70,7 +70,7 @@ import { getCurrentPlatform } from '../helper'; // NOTE: Getting error "Cannot set properties of null (setting 'dev')" here, // It basically means that some package is not relative to this path. console.log("--- Run 'npm install' ..."); - execSync(`npm install --arch=${arch} --scope Noodl`, { + execSync(`npm install --arch=${arch} --scope Noodl-Editor`, { stdio: 'inherit', env: process.env }); @@ -89,7 +89,7 @@ import { getCurrentPlatform } from '../helper'; // Build: Replace "dugite" // Build: Replace "desktop-trampoline" console.log("--- Run 'npm run build' ..."); - execSync('npx lerna exec --scope Noodl -- npm run build', { + execSync('npx lerna exec --scope Noodl-Editor -- npm run build', { stdio: 'inherit', env: { ...process.env, diff --git a/scripts/start.ts b/scripts/start.ts index 531132f..3a4f550 100644 --- a/scripts/start.ts +++ b/scripts/start.ts @@ -74,7 +74,7 @@ const cloudRuntimeProcess = attachStdio( } ); -const editorProcess = attachStdio(exec('npx lerna exec --scope Noodl -- npm run start', processOptions), { +const editorProcess = attachStdio(exec('npx lerna exec --scope Noodl-Editor -- npm run start', processOptions), { prefix: 'Editor', color: ConsoleColor.FgCyan }); diff --git a/scripts/test-editor.ts b/scripts/test-editor.ts index 36341b2..992eb00 100644 --- a/scripts/test-editor.ts +++ b/scripts/test-editor.ts @@ -25,7 +25,7 @@ console.log( ); console.log("---"); -execSync("npx lerna exec --scope Noodl -- npm run test", { +execSync("npx lerna exec --scope Noodl-Editor -- npm run test", { cwd: CWD, stdio: "inherit", env: {