diff --git a/frontend/packages/core/builder/env.js b/frontend/packages/core/builder/env.js index b16da41aa6a459071c47c2af6654fbe9d662aba0..f7bb09b4da9195355fbd6eff94cfda9f8f27baa9 100644 --- a/frontend/packages/core/builder/env.js +++ b/frontend/packages/core/builder/env.js @@ -54,4 +54,4 @@ export const SNOWPACK_PUBLIC_DEFAULT_LANGUAGE = process.env.DEFAULT_LANGUAGE || // theme export const SNOWPACK_PUBLIC_THEME = process.env.THEME || ''; // demo -export const DEMO = ''; +export const SERVER = ''; diff --git a/frontend/packages/core/snowpack.config.js b/frontend/packages/core/snowpack.config.js index c7330dc4aa3b742dc00a316c25b4282fd71a6552..7c30625ba235ca9ade8d3bdb66f1e70f138263c6 100644 --- a/frontend/packages/core/snowpack.config.js +++ b/frontend/packages/core/snowpack.config.js @@ -38,7 +38,6 @@ function isWorkspace() { const iconsPath = path.dirname(resolve.sync(cwd, '@visualdl/icons')); const netronPath = path.dirname(resolve.sync(cwd, '@visualdl/netron')); const wasmPath = path.dirname(resolve.sync(cwd, '@visualdl/wasm')); -const mockPath = path.dirname(resolve.sync(cwd, '@visualdl/mock')); const dest = path.resolve(cwd, './dist/__snowpack__/link/packages'); /** @type {import("snowpack").SnowpackUserConfig } */ @@ -101,14 +100,6 @@ export default { { source: [path.join(wasmPath, '*.{js,wasm}')], destination: path.join(dest, 'wasm/dist') - }, - { - source: ['./{data,assets}/**/*'], - destination: path.join(dest, 'mock'), - options: { - cwd: mockPath, - parents: true - } } ] } diff --git a/frontend/packages/core/src/index.tsx b/frontend/packages/core/src/index.tsx index 3ec3a6a5d01e66ca35c445df7ba6f0e816315363..9a7c0ce9ac25d6f8479d1799194320df61e1d5cf 100644 --- a/frontend/packages/core/src/index.tsx +++ b/frontend/packages/core/src/index.tsx @@ -56,7 +56,7 @@ function render() { } } -if (import.meta.env.MODE === 'development' && !import.meta.env.DEMO) { +if (import.meta.env.MODE === 'development' && !import.meta.env.SERVER) { import('@visualdl/mock').then(async ({initMock}) => { await initMock(); render(); diff --git a/frontend/packages/mock/middleware.js b/frontend/packages/mock/middleware.js index b936bd7c33e487aa3eb58c6182e5643b7c186241..9c40f3aedd7b3cb972d48d852f058d2d57ccfc1c 100644 --- a/frontend/packages/mock/middleware.js +++ b/frontend/packages/mock/middleware.js @@ -14,6 +14,8 @@ * limitations under the License. */ +import 'isomorphic-fetch'; + import {fileURLToPath} from 'url'; import path from 'path'; diff --git a/frontend/packages/mock/package.json b/frontend/packages/mock/package.json index 88fcdb2aae9020108b85a41f1eacbd52b62bd0ee..859820ca2ae05527f13cc727be6f69900eeec8db 100644 --- a/frontend/packages/mock/package.json +++ b/frontend/packages/mock/package.json @@ -41,6 +41,7 @@ }, "dependencies": { "fetch-mock": "9.11.0", + "isomorphic-fetch": "3.0.0", "mime-types": "2.1.31" }, "devDependencies": { diff --git a/frontend/packages/server/index.ts b/frontend/packages/server/index.ts index 564448986d4690e1b06fe83a64145dc9bc603742..a6dea7e1573cec70be25c1ad9725a7b7e564c1d8 100644 --- a/frontend/packages/server/index.ts +++ b/frontend/packages/server/index.ts @@ -27,6 +27,7 @@ const cwd = path.dirname(fileURLToPath(import.meta.url)); config(); +process.env.SERVER = '1'; const isDev = process.env.NODE_ENV === 'development'; const isDemo = !!process.env.DEMO; diff --git a/frontend/yarn.lock b/frontend/yarn.lock index d0ba9ee902959f8d3dcbf7501f27f100bf17f744..c2bdadd540d761438f56db0e8a4053799a65642d 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -7280,6 +7280,14 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= +isomorphic-fetch@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz#0267b005049046d2421207215d45d6a262b8b8b4" + integrity sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA== + dependencies: + node-fetch "^2.6.1" + whatwg-fetch "^3.4.1" + isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" @@ -12049,6 +12057,11 @@ webpack@5.38.1: watchpack "^2.2.0" webpack-sources "^2.3.0" +whatwg-fetch@^3.4.1: + version "3.6.2" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c" + integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA== + whatwg-url@^6.5.0: version "6.5.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"