From c593a134b39d4fa08c45b8e2f9ad39f87794c78d Mon Sep 17 00:00:00 2001 From: Eric Tuvesson Date: Thu, 8 Aug 2024 21:23:23 +0200 Subject: [PATCH] chore: rename project name (#60) --- .github/workflows/build-noodl-editor.yml | 14 +- .github/workflows/test-noodl-editor.yml | 2 +- package-lock.json | 285 ++++++++++++----------- package.json | 6 +- packages/noodl-editor/package.json | 2 +- scripts/noodl-editor/build-editor.ts | 14 +- scripts/start.ts | 2 +- scripts/test-editor.ts | 37 ++- 8 files changed, 177 insertions(+), 185 deletions(-) diff --git a/.github/workflows/build-noodl-editor.yml b/.github/workflows/build-noodl-editor.yml index 0cef2de..6b26058 100644 --- a/.github/workflows/build-noodl-editor.yml +++ b/.github/workflows/build-noodl-editor.yml @@ -1,15 +1,15 @@ -name: Build noodl-editor +name: Build fluxscape-editor on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: - + # Allows you to run this workflow from another workflow workflow_call: # release: # types: [created] - + jobs: build_noodl_editor: runs-on: ${{ matrix.os }} @@ -32,11 +32,11 @@ jobs: platform: linux-x64 steps: - - if: ${{ matrix.platform == 'darwin-arm64' }} + - if: ${{ matrix.platform == 'darwin-arm64' }} name: Setup uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: '3.11' - name: Checkout uses: actions/checkout@v4 @@ -72,6 +72,6 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v3 with: - name: noodl-editor-${{ matrix.platform }}-${{ github.head_ref }}-${{ github.sha }} + name: fluxscape-editor-${{ matrix.platform }}-${{ github.head_ref }}-${{ github.sha }} path: publish - retention-days: "12" + retention-days: '12' diff --git a/.github/workflows/test-noodl-editor.yml b/.github/workflows/test-noodl-editor.yml index f6fa735..fb860c4 100644 --- a/.github/workflows/test-noodl-editor.yml +++ b/.github/workflows/test-noodl-editor.yml @@ -1,4 +1,4 @@ -name: Test noodl-editor +name: Test fluxscape-editor on: # Allows you to run this workflow manually from the Actions tab diff --git a/package-lock.json b/package-lock.json index 5c21753..7ab57a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27211,6 +27211,10 @@ "react": "^15.0.2 || ^16.0.0 || ^17.0.0" } }, + "node_modules/fluxscape-editor": { + "resolved": "packages/noodl-editor", + "link": true + }, "node_modules/focus-lock": { "version": "0.8.1", "dev": true, @@ -35451,10 +35455,6 @@ "dev": true, "license": "MIT" }, - "node_modules/noodl-editor": { - "resolved": "packages/noodl-editor", - "link": true - }, "node_modules/nopt": { "version": "1.0.10", "license": "MIT", @@ -48980,6 +48980,7 @@ "dev": true }, "packages/noodl-editor": { + "name": "fluxscape-editor", "version": "1.0.0", "dependencies": { "@electron/remote": "^2.1.2", @@ -75431,6 +75432,144 @@ "fbjs": "^3.0.1" } }, + "fluxscape-editor": { + "version": "file:packages/noodl-editor", + "requires": { + "@babel/core": "^7.19.1", + "@babel/preset-react": "^7.18.6", + "@electron/remote": "^2.1.2", + "@jaames/iro": "^5.5.2", + "@microsoft/fetch-event-source": "^2.0.1", + "@noodl/git": "file:../noodl-git", + "@noodl/noodl-parse-dashboard": "file:../noodl-parse-dashboard", + "@noodl/platform": "file:../noodl-platform", + "@noodl/platform-electron": "file:../noodl-platform-electron", + "@svgr/webpack": "^6.4.0", + "@types/checksum": "^0.1.33", + "@types/jasmine": "^4.3.0", + "@types/jquery": "^3.5.14", + "@types/react": "^17.0.50", + "@types/react-dom": "^18.0.0", + "@types/remarkable": "^2.0.3", + "@types/rimraf": "^3.0.2", + "@types/split2": "^3.2.1", + "@types/string.prototype.matchall": "^4.0.1", + "@types/underscore": "^1.11.4", + "@types/webpack-env": "^1.18.0", + "about-window": "^1.15.2", + "algoliasearch": "^4.14.2", + "archiver": "^5.3.0", + "async": "^3.2.4", + "babel-loader": "^8.2.4", + "classnames": "^2.3.2", + "concurrently": "^7.4.0", + "css-loader": "^6.7.1", + "diff3": "0.0.4", + "dmg-license": "^1.0.11", + "electron": "31.3.1", + "electron-builder": "^24.9.1", + "electron-store": "^8.1.0", + "electron-updater": "^6.1.7", + "express": "^4.17.3", + "file-loader": "^6.2.0", + "highlight.js": "^11.5.1", + "html-loader": "^3.1.0", + "isbinaryfile": "^5.0.0", + "md5": "^2.3.0", + "md5-file": "^5.0.0", + "mixpanel-browser": "^2.45.0", + "mkdirp": "0.5.1", + "mkdirp-sync": "0.0.2", + "monaco-editor": "^0.34.0", + "monaco-editor-webpack-plugin": "^7.0.1", + "ncp": "^2.0.0", + "react": "^17.0.2", + "react-dom": "^17.0.0", + "react-hot-toast": "^2.4.0", + "react-instantsearch-hooks-web": "^6.38.0", + "react-json-view": "^1.21.3", + "react-rnd": "^10.3.7", + "remarkable": "^2.0.1", + "rimraf": "^3.0.2", + "s3": "git+https://github.com/noodlapp/node-s3-client.git", + "sass": "^1.55.0", + "sass-loader": "^12.6.0", + "string.prototype.matchall": "^4.0.7", + "stringify": "^5.2.0", + "style-loader": "^3.3.1", + "ts-loader": "^9.4.1", + "ts-node": "^10.7.0", + "typescript": "^4.8.3", + "underscore": "^1.13.6", + "url-loader": "^4.1.1", + "webpack": "^5.74.0", + "webpack-cli": "^4.10.0", + "webpack-dev-server": "^4.11.1", + "webpack-merge": "^5.8.0", + "websocket-stream": "^5.5.2", + "ws": "^8.9.0" + }, + "dependencies": { + "@webpack-cli/configtest": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz", + "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==", + "dev": true, + "requires": {} + }, + "@webpack-cli/info": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz", + "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==", + "dev": true, + "requires": { + "envinfo": "^7.7.3" + } + }, + "@webpack-cli/serve": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz", + "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==", + "dev": true, + "requires": {} + }, + "commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "dev": true + }, + "rechoir": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", + "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", + "dev": true, + "requires": { + "resolve": "^1.9.0" + } + }, + "webpack-cli": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz", + "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==", + "dev": true, + "requires": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^1.2.0", + "@webpack-cli/info": "^1.5.0", + "@webpack-cli/serve": "^1.7.0", + "colorette": "^2.0.14", + "commander": "^7.0.0", + "cross-spawn": "^7.0.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^2.2.0", + "rechoir": "^0.7.0", + "webpack-merge": "^5.7.3" + } + } + } + }, "focus-lock": { "version": "0.8.1", "dev": true, @@ -81006,144 +81145,6 @@ "version": "2.0.10", "dev": true }, - "noodl-editor": { - "version": "file:packages/noodl-editor", - "requires": { - "@babel/core": "^7.19.1", - "@babel/preset-react": "^7.18.6", - "@electron/remote": "^2.1.2", - "@jaames/iro": "^5.5.2", - "@microsoft/fetch-event-source": "^2.0.1", - "@noodl/git": "file:../noodl-git", - "@noodl/noodl-parse-dashboard": "file:../noodl-parse-dashboard", - "@noodl/platform": "file:../noodl-platform", - "@noodl/platform-electron": "file:../noodl-platform-electron", - "@svgr/webpack": "^6.4.0", - "@types/checksum": "^0.1.33", - "@types/jasmine": "^4.3.0", - "@types/jquery": "^3.5.14", - "@types/react": "^17.0.50", - "@types/react-dom": "^18.0.0", - "@types/remarkable": "^2.0.3", - "@types/rimraf": "^3.0.2", - "@types/split2": "^3.2.1", - "@types/string.prototype.matchall": "^4.0.1", - "@types/underscore": "^1.11.4", - "@types/webpack-env": "^1.18.0", - "about-window": "^1.15.2", - "algoliasearch": "^4.14.2", - "archiver": "^5.3.0", - "async": "^3.2.4", - "babel-loader": "^8.2.4", - "classnames": "^2.3.2", - "concurrently": "^7.4.0", - "css-loader": "^6.7.1", - "diff3": "0.0.4", - "dmg-license": "^1.0.11", - "electron": "31.3.1", - "electron-builder": "^24.9.1", - "electron-store": "^8.1.0", - "electron-updater": "^6.1.7", - "express": "^4.17.3", - "file-loader": "^6.2.0", - "highlight.js": "^11.5.1", - "html-loader": "^3.1.0", - "isbinaryfile": "^5.0.0", - "md5": "^2.3.0", - "md5-file": "^5.0.0", - "mixpanel-browser": "^2.45.0", - "mkdirp": "0.5.1", - "mkdirp-sync": "0.0.2", - "monaco-editor": "^0.34.0", - "monaco-editor-webpack-plugin": "^7.0.1", - "ncp": "^2.0.0", - "react": "^17.0.2", - "react-dom": "^17.0.0", - "react-hot-toast": "^2.4.0", - "react-instantsearch-hooks-web": "^6.38.0", - "react-json-view": "^1.21.3", - "react-rnd": "^10.3.7", - "remarkable": "^2.0.1", - "rimraf": "^3.0.2", - "s3": "git+https://github.com/noodlapp/node-s3-client.git", - "sass": "^1.55.0", - "sass-loader": "^12.6.0", - "string.prototype.matchall": "^4.0.7", - "stringify": "^5.2.0", - "style-loader": "^3.3.1", - "ts-loader": "^9.4.1", - "ts-node": "^10.7.0", - "typescript": "^4.8.3", - "underscore": "^1.13.6", - "url-loader": "^4.1.1", - "webpack": "^5.74.0", - "webpack-cli": "^4.10.0", - "webpack-dev-server": "^4.11.1", - "webpack-merge": "^5.8.0", - "websocket-stream": "^5.5.2", - "ws": "^8.9.0" - }, - "dependencies": { - "@webpack-cli/configtest": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz", - "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==", - "dev": true, - "requires": {} - }, - "@webpack-cli/info": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz", - "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==", - "dev": true, - "requires": { - "envinfo": "^7.7.3" - } - }, - "@webpack-cli/serve": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz", - "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==", - "dev": true, - "requires": {} - }, - "commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", - "dev": true - }, - "rechoir": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", - "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", - "dev": true, - "requires": { - "resolve": "^1.9.0" - } - }, - "webpack-cli": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz", - "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==", - "dev": true, - "requires": { - "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.2.0", - "@webpack-cli/info": "^1.5.0", - "@webpack-cli/serve": "^1.7.0", - "colorette": "^2.0.14", - "commander": "^7.0.0", - "cross-spawn": "^7.0.3", - "fastest-levenshtein": "^1.0.12", - "import-local": "^3.0.2", - "interpret": "^2.2.0", - "rechoir": "^0.7.0", - "webpack-merge": "^5.7.3" - } - } - } - }, "nopt": { "version": "1.0.10", "requires": { diff --git a/package.json b/package.json index b052cee..d27561a 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-editor -- npm run ci:build", + "ci:build:editor": "lerna exec --scope fluxscape-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-editor --stream", + "start:editor": "lerna run start --scope fluxscape-editor --stream", "dev": "ts-node ./scripts/start.ts", "start": "ts-node ./scripts/start.ts -- --build-viewer", "test:editor": "ts-node ./scripts/test-editor.ts", @@ -47,4 +47,4 @@ "npm": ">=6.0.0", "node": ">=16.0.0 <=18" } -} +} \ No newline at end of file diff --git a/packages/noodl-editor/package.json b/packages/noodl-editor/package.json index 10a660c..17e04b0 100644 --- a/packages/noodl-editor/package.json +++ b/packages/noodl-editor/package.json @@ -1,5 +1,5 @@ { - "name": "noodl-editor", + "name": "fluxscape-editor", "productName": "Fluxscape", "description": "Node-Based App Builder for Scalability & Rapid Development, a fork of Noodl", "author": "Fluxscape ", diff --git a/scripts/noodl-editor/build-editor.ts b/scripts/noodl-editor/build-editor.ts index 203a665..42d1207 100644 --- a/scripts/noodl-editor/build-editor.ts +++ b/scripts/noodl-editor/build-editor.ts @@ -72,18 +72,18 @@ 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' ..."); - - if (platform === "darwin") { + + if (platform === 'darwin') { execSync(`npm install electron-notarize`, { stdio: 'inherit', env: process.env - }) + }); } - execSync(`npm install --arch=${arch} --scope noodl-editor`, { + execSync(`npm install --arch=${arch} --scope fluxscape-editor`, { stdio: 'inherit', env: process.env - }) + }); console.log("--- 'npm install' done!"); // NOTE: npm install --arch= does this too @@ -99,13 +99,13 @@ import { getCurrentPlatform } from '../helper'; // Build: Replace "dugite" // Build: Replace "desktop-trampoline" console.log("--- Run 'npm run build' ..."); - execSync('npx lerna exec --scope noodl-editor -- npm run build', { + execSync('npx lerna exec --scope fluxscape-editor -- npm run build', { stdio: 'inherit', env: { ...process.env, TARGET_PLATFORM, DISABLE_SIGNING, - CSC_NAME, + CSC_NAME } }); console.log("--- 'npm run build' done!"); diff --git a/scripts/start.ts b/scripts/start.ts index a010a1f..36431d9 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-editor -- npm run start', processOptions), { +const editorProcess = attachStdio(exec('npx lerna exec --scope fluxscape-editor -- npm run start', processOptions), { prefix: 'Editor', color: ConsoleColor.FgCyan }); diff --git a/scripts/test-editor.ts b/scripts/test-editor.ts index 4170cac..7efdcc3 100644 --- a/scripts/test-editor.ts +++ b/scripts/test-editor.ts @@ -1,36 +1,27 @@ -import path from "path"; -import { execSync } from "child_process"; +import { execSync } from 'child_process'; +import path from 'path'; -const CWD = path.join(__dirname, ".."); -const LOCAL_GIT_DIRECTORY = path.join( - __dirname, - "..", - "node_modules", - "dugite", - "git" -); +const CWD = path.join(__dirname, '..'); +const LOCAL_GIT_DIRECTORY = path.join(__dirname, '..', 'node_modules', 'dugite', 'git'); const LOCAL_GIT_TRAMPOLINE_DIRECTORY = path.join( __dirname, - "..", - "node_modules", - "desktop-trampoline/build/Release/desktop-trampoline" + '..', + 'node_modules', + 'desktop-trampoline/build/Release/desktop-trampoline' ); -console.log("---"); +console.log('---'); console.log(`> CWD: `, CWD); console.log(`> LOCAL_GIT_DIRECTORY: `, LOCAL_GIT_DIRECTORY); -console.log( - `> LOCAL_GIT_TRAMPOLINE_DIRECTORY: `, - LOCAL_GIT_TRAMPOLINE_DIRECTORY -); -console.log("---"); +console.log(`> LOCAL_GIT_TRAMPOLINE_DIRECTORY: `, LOCAL_GIT_TRAMPOLINE_DIRECTORY); +console.log('---'); -execSync("npx lerna exec --scope noodl-editor -- npm run test", { +execSync('npx lerna exec --scope fluxscape-editor -- npm run test', { cwd: CWD, - stdio: "inherit", + stdio: 'inherit', env: { ...process.env, LOCAL_GIT_DIRECTORY, - LOCAL_GIT_TRAMPOLINE_DIRECTORY, - }, + LOCAL_GIT_TRAMPOLINE_DIRECTORY + } });