mirror of
https://github.com/enso-org/enso.git
synced 2024-11-23 08:08:34 +03:00
Remove vite-plugin-top-level-await plugin (#9038)
We've used the vite-plugin-top-level-await to support top level await. But most of them were removed anyway, because the ide-desktop/lib/client is bundled as CJS and use some of gui2 code. And the plugin [is causing problems](https://github.com/Menci/vite-plugin-top-level-await/issues/25), [also in our CI](https://github.com/enso-org/enso/actions/runs/7842841953/job/21402194728?pr=9013#step:8:458)
This commit is contained in:
parent
5c7947ce60
commit
ee381369b0
@ -1,5 +1,6 @@
|
|||||||
import 'enso-dashboard/src/tailwind.css'
|
import 'enso-dashboard/src/tailwind.css'
|
||||||
import { createPinia } from 'pinia'
|
import { createPinia } from 'pinia'
|
||||||
|
import { initializeFFI } from 'shared/ast/ffi'
|
||||||
import { createApp, ref } from 'vue'
|
import { createApp, ref } from 'vue'
|
||||||
import { mockDataHandler, mockLSHandler } from '../mock/engine'
|
import { mockDataHandler, mockLSHandler } from '../mock/engine'
|
||||||
import '../src/assets/base.css'
|
import '../src/assets/base.css'
|
||||||
@ -55,4 +56,4 @@ provideVisualizationConfig._mock(
|
|||||||
},
|
},
|
||||||
app,
|
app,
|
||||||
)
|
)
|
||||||
app.mount('#app')
|
initializeFFI().then(() => app.mount('#app'))
|
||||||
|
@ -129,7 +129,6 @@
|
|||||||
"unbzip2-stream": "^1.4.3",
|
"unbzip2-stream": "^1.4.3",
|
||||||
"vite": "^4.4.9",
|
"vite": "^4.4.9",
|
||||||
"vite-plugin-inspect": "^0.7.38",
|
"vite-plugin-inspect": "^0.7.38",
|
||||||
"vite-plugin-top-level-await": "^1.3.1",
|
|
||||||
"vitest": "^0.34.2",
|
"vitest": "^0.34.2",
|
||||||
"vue-react-wrapper": "^0.3.1",
|
"vue-react-wrapper": "^0.3.1",
|
||||||
"vue-tsc": "^1.8.8"
|
"vue-tsc": "^1.8.8"
|
||||||
|
@ -17,9 +17,12 @@ import {
|
|||||||
import type { AstId } from '@/util/ast/abstract'
|
import type { AstId } from '@/util/ast/abstract'
|
||||||
import { unwrap } from '@/util/data/result'
|
import { unwrap } from '@/util/data/result'
|
||||||
import { tryIdentifier, tryQualifiedName } from '@/util/qualifiedName'
|
import { tryIdentifier, tryQualifiedName } from '@/util/qualifiedName'
|
||||||
|
import { initializeFFI } from 'shared/ast/ffi'
|
||||||
import type { ExternalId, Uuid } from 'shared/yjsModel'
|
import type { ExternalId, Uuid } from 'shared/yjsModel'
|
||||||
import { expect, test } from 'vitest'
|
import { expect, test } from 'vitest'
|
||||||
|
|
||||||
|
await initializeFFI()
|
||||||
|
|
||||||
test.each([
|
test.each([
|
||||||
['', 0, { type: 'insert', position: 0 }, {}],
|
['', 0, { type: 'insert', position: 0 }, {}],
|
||||||
[
|
[
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
<script lang="ts">
|
<script setup lang="ts">
|
||||||
import { nodeEditBindings } from '@/bindings'
|
import { nodeEditBindings } from '@/bindings'
|
||||||
import CircularMenu from '@/components/CircularMenu.vue'
|
import CircularMenu from '@/components/CircularMenu.vue'
|
||||||
import GraphNodeError from '@/components/GraphEditor/GraphNodeError.vue'
|
import GraphNodeError from '@/components/GraphEditor/GraphNodeError.vue'
|
||||||
@ -38,9 +38,7 @@ const prefixes = Prefixes.FromLines({
|
|||||||
skip: 'SKIP __',
|
skip: 'SKIP __',
|
||||||
freeze: 'FREEZE __',
|
freeze: 'FREEZE __',
|
||||||
})
|
})
|
||||||
</script>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
node: Node
|
node: Node
|
||||||
edited: boolean
|
edited: boolean
|
||||||
|
@ -9,11 +9,14 @@ import {
|
|||||||
import { GraphDb } from '@/stores/graph/graphDatabase'
|
import { GraphDb } from '@/stores/graph/graphDatabase'
|
||||||
import { Ast } from '@/util/ast'
|
import { Ast } from '@/util/ast'
|
||||||
import { ApplicationKind, ArgumentInfoKey } from '@/util/callTree'
|
import { ApplicationKind, ArgumentInfoKey } from '@/util/callTree'
|
||||||
|
import { initializeFFI } from 'shared/ast/ffi'
|
||||||
import { describe, expect, test } from 'vitest'
|
import { describe, expect, test } from 'vitest'
|
||||||
import { defineComponent } from 'vue'
|
import { defineComponent } from 'vue'
|
||||||
import type { PortId } from '../portInfo'
|
import type { PortId } from '../portInfo'
|
||||||
import { DisplayMode, argsWidgetConfigurationSchema } from '../widgetRegistry/configuration'
|
import { DisplayMode, argsWidgetConfigurationSchema } from '../widgetRegistry/configuration'
|
||||||
|
|
||||||
|
await initializeFFI()
|
||||||
|
|
||||||
describe('WidgetRegistry', () => {
|
describe('WidgetRegistry', () => {
|
||||||
function makeMockWidget<T extends WidgetInput>(
|
function makeMockWidget<T extends WidgetInput>(
|
||||||
name: string,
|
name: string,
|
||||||
|
@ -1,9 +1,12 @@
|
|||||||
import { asNodeId, GraphDb } from '@/stores/graph/graphDatabase'
|
import { asNodeId, GraphDb } from '@/stores/graph/graphDatabase'
|
||||||
import { Ast, RawAst } from '@/util/ast'
|
import { Ast, RawAst } from '@/util/ast'
|
||||||
import assert from 'assert'
|
import assert from 'assert'
|
||||||
|
import { initializeFFI } from 'shared/ast/ffi'
|
||||||
import { IdMap, type ExternalId } from 'shared/yjsModel'
|
import { IdMap, type ExternalId } from 'shared/yjsModel'
|
||||||
import { expect, test } from 'vitest'
|
import { expect, test } from 'vitest'
|
||||||
|
|
||||||
|
await initializeFFI()
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a predictable fake UUID which contains given number in decimal at the end.
|
* Create a predictable fake UUID which contains given number in decimal at the end.
|
||||||
* @param x sequential value, e.g. 15
|
* @param x sequential value, e.g. 15
|
||||||
|
@ -28,9 +28,12 @@
|
|||||||
import { assertDefined } from '@/util/assert'
|
import { assertDefined } from '@/util/assert'
|
||||||
import { AliasAnalyzer } from '@/util/ast/aliasAnalysis'
|
import { AliasAnalyzer } from '@/util/ast/aliasAnalysis'
|
||||||
import { MappedKeyMap, MappedSet } from '@/util/containers'
|
import { MappedKeyMap, MappedSet } from '@/util/containers'
|
||||||
|
import { initializeFFI } from 'shared/ast/ffi'
|
||||||
import { sourceRangeKey, type SourceRange } from 'shared/yjsModel'
|
import { sourceRangeKey, type SourceRange } from 'shared/yjsModel'
|
||||||
import { expect, test } from 'vitest'
|
import { expect, test } from 'vitest'
|
||||||
|
|
||||||
|
await initializeFFI()
|
||||||
|
|
||||||
/** The type of annotation. */
|
/** The type of annotation. */
|
||||||
enum AnnotationType {
|
enum AnnotationType {
|
||||||
/** An identifier binding (introducing variable). */
|
/** An identifier binding (introducing variable). */
|
||||||
|
@ -8,12 +8,9 @@ import {
|
|||||||
readTokenSpan,
|
readTokenSpan,
|
||||||
} from '@/util/ast'
|
} from '@/util/ast'
|
||||||
import { MappedKeyMap, MappedSet, NonEmptyStack } from '@/util/containers'
|
import { MappedKeyMap, MappedSet, NonEmptyStack } from '@/util/containers'
|
||||||
import { initializeFFI } from 'shared/ast/ffi'
|
|
||||||
import type { LazyObject } from 'shared/ast/parserSupport'
|
import type { LazyObject } from 'shared/ast/parserSupport'
|
||||||
import { rangeIsBefore, sourceRangeKey, type SourceRange } from 'shared/yjsModel'
|
import { rangeIsBefore, sourceRangeKey, type SourceRange } from 'shared/yjsModel'
|
||||||
|
|
||||||
await initializeFFI()
|
|
||||||
|
|
||||||
const ACCESSOR_OPERATOR = '.'
|
const ACCESSOR_OPERATOR = '.'
|
||||||
|
|
||||||
const LAMBDA_OPERATOR = '->'
|
const LAMBDA_OPERATOR = '->'
|
||||||
|
@ -6,7 +6,6 @@ import postcssNesting from 'postcss-nesting'
|
|||||||
import tailwindcss from 'tailwindcss'
|
import tailwindcss from 'tailwindcss'
|
||||||
import tailwindcssNesting from 'tailwindcss/nesting'
|
import tailwindcssNesting from 'tailwindcss/nesting'
|
||||||
import { defineConfig, type Plugin } from 'vite'
|
import { defineConfig, type Plugin } from 'vite'
|
||||||
import topLevelAwait from 'vite-plugin-top-level-await'
|
|
||||||
// @ts-expect-error
|
// @ts-expect-error
|
||||||
import * as tailwindConfig from '../ide-desktop/lib/dashboard/tailwind.config'
|
import * as tailwindConfig from '../ide-desktop/lib/dashboard/tailwind.config'
|
||||||
import { createGatewayServer } from './ydoc-server'
|
import { createGatewayServer } from './ydoc-server'
|
||||||
@ -18,7 +17,7 @@ const IS_CLOUD_BUILD = process.env.CLOUD_BUILD === 'true'
|
|||||||
// https://vitejs.dev/config/
|
// https://vitejs.dev/config/
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
cacheDir: '../../node_modules/.cache/vite',
|
cacheDir: '../../node_modules/.cache/vite',
|
||||||
plugins: [vue(), gatewayServer(), topLevelAwait()],
|
plugins: [vue(), gatewayServer()],
|
||||||
optimizeDeps: {
|
optimizeDeps: {
|
||||||
entries: 'index.html',
|
entries: 'index.html',
|
||||||
},
|
},
|
||||||
|
143
package-lock.json
generated
143
package-lock.json
generated
@ -118,7 +118,6 @@
|
|||||||
"unbzip2-stream": "^1.4.3",
|
"unbzip2-stream": "^1.4.3",
|
||||||
"vite": "^4.4.9",
|
"vite": "^4.4.9",
|
||||||
"vite-plugin-inspect": "^0.7.38",
|
"vite-plugin-inspect": "^0.7.38",
|
||||||
"vite-plugin-top-level-await": "^1.3.1",
|
|
||||||
"vitest": "^0.34.2",
|
"vitest": "^0.34.2",
|
||||||
"vue-react-wrapper": "^0.3.1",
|
"vue-react-wrapper": "^0.3.1",
|
||||||
"vue-tsc": "^1.8.8"
|
"vue-tsc": "^1.8.8"
|
||||||
@ -3763,22 +3762,6 @@
|
|||||||
"node": ">=14.0.0"
|
"node": ">=14.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@rollup/plugin-virtual": {
|
|
||||||
"version": "3.0.1",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=14.0.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"rollup": "^1.20.0||^2.0.0||^3.0.0"
|
|
||||||
},
|
|
||||||
"peerDependenciesMeta": {
|
|
||||||
"rollup": {
|
|
||||||
"optional": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@rollup/pluginutils": {
|
"node_modules/@rollup/pluginutils": {
|
||||||
"version": "5.0.2",
|
"version": "5.0.2",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
@ -3935,107 +3918,6 @@
|
|||||||
"url": "https://github.com/sindresorhus/is?sponsor=1"
|
"url": "https://github.com/sindresorhus/is?sponsor=1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@swc/core": {
|
|
||||||
"version": "1.3.85",
|
|
||||||
"dev": true,
|
|
||||||
"hasInstallScript": true,
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"@swc/types": "^0.1.4"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=10"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/swc"
|
|
||||||
},
|
|
||||||
"optionalDependencies": {
|
|
||||||
"@swc/core-darwin-arm64": "1.3.85",
|
|
||||||
"@swc/core-darwin-x64": "1.3.85",
|
|
||||||
"@swc/core-linux-arm-gnueabihf": "1.3.85",
|
|
||||||
"@swc/core-linux-arm64-gnu": "1.3.85",
|
|
||||||
"@swc/core-linux-arm64-musl": "1.3.85",
|
|
||||||
"@swc/core-linux-x64-gnu": "1.3.85",
|
|
||||||
"@swc/core-linux-x64-musl": "1.3.85",
|
|
||||||
"@swc/core-win32-arm64-msvc": "1.3.85",
|
|
||||||
"@swc/core-win32-ia32-msvc": "1.3.85",
|
|
||||||
"@swc/core-win32-x64-msvc": "1.3.85"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"@swc/helpers": "^0.5.0"
|
|
||||||
},
|
|
||||||
"peerDependenciesMeta": {
|
|
||||||
"@swc/helpers": {
|
|
||||||
"optional": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@swc/core-darwin-arm64": {
|
|
||||||
"version": "1.3.85",
|
|
||||||
"cpu": [
|
|
||||||
"arm64"
|
|
||||||
],
|
|
||||||
"dev": true,
|
|
||||||
"license": "Apache-2.0 AND MIT",
|
|
||||||
"optional": true,
|
|
||||||
"os": [
|
|
||||||
"darwin"
|
|
||||||
],
|
|
||||||
"engines": {
|
|
||||||
"node": ">=10"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@swc/core-darwin-x64": {
|
|
||||||
"version": "1.3.85",
|
|
||||||
"cpu": [
|
|
||||||
"x64"
|
|
||||||
],
|
|
||||||
"dev": true,
|
|
||||||
"license": "Apache-2.0 AND MIT",
|
|
||||||
"optional": true,
|
|
||||||
"os": [
|
|
||||||
"darwin"
|
|
||||||
],
|
|
||||||
"engines": {
|
|
||||||
"node": ">=10"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@swc/core-linux-x64-gnu": {
|
|
||||||
"version": "1.3.85",
|
|
||||||
"cpu": [
|
|
||||||
"x64"
|
|
||||||
],
|
|
||||||
"dev": true,
|
|
||||||
"license": "Apache-2.0 AND MIT",
|
|
||||||
"optional": true,
|
|
||||||
"os": [
|
|
||||||
"linux"
|
|
||||||
],
|
|
||||||
"engines": {
|
|
||||||
"node": ">=10"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@swc/core-win32-x64-msvc": {
|
|
||||||
"version": "1.3.85",
|
|
||||||
"cpu": [
|
|
||||||
"x64"
|
|
||||||
],
|
|
||||||
"dev": true,
|
|
||||||
"license": "Apache-2.0 AND MIT",
|
|
||||||
"optional": true,
|
|
||||||
"os": [
|
|
||||||
"win32"
|
|
||||||
],
|
|
||||||
"engines": {
|
|
||||||
"node": ">=10"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@swc/types": {
|
|
||||||
"version": "0.1.4",
|
|
||||||
"dev": true,
|
|
||||||
"license": "Apache-2.0"
|
|
||||||
},
|
|
||||||
"node_modules/@szmarczak/http-timer": {
|
"node_modules/@szmarczak/http-timer": {
|
||||||
"version": "4.0.6",
|
"version": "4.0.6",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
@ -17367,18 +17249,6 @@
|
|||||||
"node": ">= 0.4.0"
|
"node": ">= 0.4.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/uuid": {
|
|
||||||
"version": "9.0.1",
|
|
||||||
"dev": true,
|
|
||||||
"funding": [
|
|
||||||
"https://github.com/sponsors/broofa",
|
|
||||||
"https://github.com/sponsors/ctavan"
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
|
||||||
"bin": {
|
|
||||||
"uuid": "dist/bin/uuid"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/v8-to-istanbul": {
|
"node_modules/v8-to-istanbul": {
|
||||||
"version": "9.1.3",
|
"version": "9.1.3",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
@ -17552,19 +17422,6 @@
|
|||||||
"node": ">=14.14"
|
"node": ">=14.14"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/vite-plugin-top-level-await": {
|
|
||||||
"version": "1.3.1",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"@rollup/plugin-virtual": "^3.0.1",
|
|
||||||
"@swc/core": "^1.3.10",
|
|
||||||
"uuid": "^9.0.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"vite": ">=2.8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/vite/node_modules/@esbuild/android-arm": {
|
"node_modules/vite/node_modules/@esbuild/android-arm": {
|
||||||
"version": "0.18.20",
|
"version": "0.18.20",
|
||||||
"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
|
"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
|
||||||
|
Loading…
Reference in New Issue
Block a user