Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix .default is not a function errors #18188

Merged
merged 5 commits into from
Apr 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/extensions-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
"@directus/constants": "workspace:*",
"@directus/types": "workspace:*",
"@directus/utils": "workspace:*",
"@rollup/plugin-commonjs": "23.0.4",
"@rollup/plugin-commonjs": "24.1.0",
"@rollup/plugin-json": "6.0.0",
"@rollup/plugin-node-resolve": "15.0.1",
"@rollup/plugin-replace": "5.0.2",
"@rollup/plugin-terser": "0.4.0",
"@rollup/plugin-terser": "0.4.1",
"@rollup/plugin-virtual": "3.0.1",
"@vue/compiler-sfc": "3.2.47",
"chalk": "4.1.2",
Expand Down
42 changes: 26 additions & 16 deletions packages/extensions-sdk/src/cli/commands/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ import type {
ExtensionManifest as TExtensionManifest,
} from '@directus/types';
import { isIn, isTypeIn } from '@directus/utils';
import commonjs from '@rollup/plugin-commonjs';
import json from '@rollup/plugin-json';
import commonjsDefault from '@rollup/plugin-commonjs';
import jsonDefault from '@rollup/plugin-json';
import { nodeResolve } from '@rollup/plugin-node-resolve';
import replace from '@rollup/plugin-replace';
import terser from '@rollup/plugin-terser';
import virtual from '@rollup/plugin-virtual';
import replaceDefault from '@rollup/plugin-replace';
import terserDefault from '@rollup/plugin-terser';
import virtualDefault from '@rollup/plugin-virtual';
import chalk from 'chalk';
import fse from 'fs-extra';
import ora from 'ora';
Expand All @@ -33,9 +33,9 @@ import {
rollup,
watch as rollupWatch,
} from 'rollup';
import esbuild from 'rollup-plugin-esbuild';
import styles from 'rollup-plugin-styles';
import vue from 'rollup-plugin-vue';
import esbuildDefault from 'rollup-plugin-esbuild';
import stylesDefault from 'rollup-plugin-styles';
import vueDefault from 'rollup-plugin-vue';
import type { Language, RollupConfig, RollupMode } from '../types.js';
import { getLanguageFromPath, isLanguage } from '../utils/languages.js';
import { clear, log } from '../utils/logger.js';
Expand All @@ -44,6 +44,16 @@ import generateBundleEntrypoint from './helpers/generate-bundle-entrypoint.js';
import loadConfig from './helpers/load-config.js';
import { validateSplitEntrypointOption } from './helpers/validate-cli-options.js';

// Workaround for https://github.com/rollup/plugins/issues/1329
const virtual = virtualDefault as unknown as typeof virtualDefault.default;
const vue = vueDefault as unknown as typeof vueDefault.default;
const esbuild = esbuildDefault as unknown as typeof esbuildDefault.default;
const styles = stylesDefault as unknown as typeof stylesDefault.default;
const commonjs = commonjsDefault as unknown as typeof commonjsDefault.default;
const json = jsonDefault as unknown as typeof jsonDefault.default;
const replace = replaceDefault as unknown as typeof replaceDefault.default;
const terser = terserDefault as unknown as typeof terserDefault.default;

type BuildOptions = {
type?: string;
input?: string;
Expand Down Expand Up @@ -560,21 +570,21 @@ function getRollupOptions({
input: typeof input !== 'string' ? 'entry' : input,
external: mode === 'browser' ? APP_SHARED_DEPS : API_SHARED_DEPS,
plugins: [
typeof input !== 'string' ? virtual.default(input) : null,
mode === 'browser' ? (vue.default({ preprocessStyles: true }) as Plugin) : null,
languages.includes('typescript') ? esbuild.default({ include: /\.tsx?$/, sourceMap: sourcemap }) : null,
mode === 'browser' ? styles.default() : null,
typeof input !== 'string' ? virtual(input) : null,
mode === 'browser' ? (vue({ preprocessStyles: true }) as Plugin) : null,
languages.includes('typescript') ? esbuild({ include: /\.tsx?$/, sourceMap: sourcemap }) : null,
mode === 'browser' ? styles() : null,
...plugins,
nodeResolve({ browser: mode === 'browser' }),
commonjs.default({ esmExternals: mode === 'browser', sourceMap: sourcemap }),
json.default(),
replace.default({
commonjs({ esmExternals: mode === 'browser', sourceMap: sourcemap }),
json(),
replace({
values: {
'process.env.NODE_ENV': JSON.stringify('production'),
},
preventAssignment: true,
}),
minify ? terser.default() : null,
minify ? terser() : null,
],
};
}
Expand Down
38 changes: 10 additions & 28 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.