chore: fix mixin and external mod (#1817)

* chore: fix mixin and external mod

* chore: add back to root

* chore: add systemjs build of stardust

* chore: trigger diff

* fix: remove typo import
This commit is contained in:
Tobias Åström
2025-10-02 18:55:27 +02:00
committed by GitHub
parent 3744c2ec69
commit d227626473
7 changed files with 56 additions and 30 deletions

View File

@@ -13,7 +13,7 @@
"@nebula.js/supernova": "^6.0.0", "@nebula.js/supernova": "^6.0.0",
"@nebula.js/theme": "^6.0.0", "@nebula.js/theme": "^6.0.0",
"@nebula.js/ui": "^6.0.0", "@nebula.js/ui": "^6.0.0",
"@qlik/api": "1.44.0", "@qlik/api": "1.46.0",
"@testing-library/dom": "^10.4.1", "@testing-library/dom": "^10.4.1",
"@testing-library/react": "^16.3.0", "@testing-library/react": "^16.3.0",
"extend": "3.0.2", "extend": "3.0.2",

View File

@@ -52,7 +52,7 @@
"@nebula.js/supernova": "^6.0.0", "@nebula.js/supernova": "^6.0.0",
"@nebula.js/theme": "^6.0.0", "@nebula.js/theme": "^6.0.0",
"@nebula.js/ui": "^6.0.0", "@nebula.js/ui": "^6.0.0",
"@qlik/api": "1.44.0", "@qlik/api": "1.46.0",
"@scriptappy/cli": "0.10.0", "@scriptappy/cli": "0.10.0",
"@scriptappy/from-jsdoc": "0.19.0", "@scriptappy/from-jsdoc": "0.19.0",
"@scriptappy/to-dts": "1.0.0", "@scriptappy/to-dts": "1.0.0",

View File

@@ -7,7 +7,6 @@ const json = require('@rollup/plugin-json');
const { nodeResolve } = require('@rollup/plugin-node-resolve'); const { nodeResolve } = require('@rollup/plugin-node-resolve');
const commonjs = require('@rollup/plugin-commonjs'); const commonjs = require('@rollup/plugin-commonjs');
const terser = require('@rollup/plugin-terser'); const terser = require('@rollup/plugin-terser');
const jsxPlugin = require('@babel/plugin-transform-react-jsx');
const babelPreset = require('@babel/preset-env'); const babelPreset = require('@babel/preset-env');
const { visualizer } = require('rollup-plugin-visualizer'); const { visualizer } = require('rollup-plugin-visualizer');
const browsersList = require('@qlik/browserslist-config'); const browsersList = require('@qlik/browserslist-config');
@@ -153,7 +152,7 @@ const config = ({
}, },
}, },
], ],
[babelPresetReact], [babelPresetReact, { runtime: 'automatic' }],
]; ];
if (typescript) { if (typescript) {
@@ -195,6 +194,7 @@ const config = ({
postcss({ postcss({
exclude: /\.module\.css$/, exclude: /\.module\.css$/,
}), }),
// Handle all CSS with conditional modules processing
postcss({ postcss({
include: /\.module\.css$/, include: /\.module\.css$/,
modules: true, modules: true,
@@ -204,7 +204,6 @@ const config = ({
ignoreTryCatch: false, // Avoids problems with require() inside try catch (https://github.com/rollup/plugins/issues/1004) ignoreTryCatch: false, // Avoids problems with require() inside try catch (https://github.com/rollup/plugins/issues/1004)
}), }),
json(), json(),
// Handle all CSS with conditional modules processing
babel({ babel({
babelHelpers: 'bundled', babelHelpers: 'bundled',
@@ -212,7 +211,6 @@ const config = ({
inputSourceMap: sourcemap, inputSourceMap: sourcemap,
extensions, extensions,
presets: babelPresets, presets: babelPresets,
plugins: [[jsxPlugin]],
}), }),
...[ ...[
mode === 'production' mode === 'production'

View File

@@ -6,6 +6,7 @@ const systemjsBehaviours = {
'picasso-plugin-q', 'picasso-plugin-q',
'react', 'react',
'react-dom', 'react-dom',
'@qlik-trial/sprout-css-modules',
/^(?!@qlik-trial\/qmfe-data-client-parcels)(@qlik-trial\/qmfe-)/, /^(?!@qlik-trial\/qmfe-data-client-parcels)(@qlik-trial\/qmfe-)/,
]; ];
const { external } = cfg.systemjs || {}; const { external } = cfg.systemjs || {};

View File

@@ -23,7 +23,6 @@
"dependencies": { "dependencies": {
"@babel/cli": "7.28.3", "@babel/cli": "7.28.3",
"@babel/core": "7.28.4", "@babel/core": "7.28.4",
"@babel/plugin-transform-react-jsx": "7.27.1",
"@babel/preset-env": "7.28.3", "@babel/preset-env": "7.28.3",
"@babel/preset-react": "7.27.1", "@babel/preset-react": "7.27.1",
"@babel/preset-typescript": "7.27.1", "@babel/preset-typescript": "7.27.1",

View File

@@ -94,6 +94,7 @@ const config = ({ format = 'umd', debug = false, file, targetPkg }) => {
// peers that are not devDeps should be externals for full bundle // peers that are not devDeps should be externals for full bundle
// const bundleExternals = peers.filter((p) => typeof (pkg.devDependencies || {})[p] === 'undefined'); // const bundleExternals = peers.filter((p) => typeof (pkg.devDependencies || {})[p] === 'undefined');
const useDirectoryOutput = format === 'systemjs';
const external = peers; const external = peers;
const globals = {}; const globals = {};
@@ -123,17 +124,28 @@ const config = ({ format = 'umd', debug = false, file, targetPkg }) => {
warn(warning); warn(warning);
}, },
input: path.resolve(cwd, 'src', 'index'), input: path.resolve(cwd, 'src', 'index'),
output: { output: useDirectoryOutput
// file: path.resolve(targetDir, getFileName(isEsm ? 'esm' : '', dev)), ? {
file, dir: path.dirname(file),
format, entryFileNames: path.basename(file),
exports: ['test-utils', 'stardust'].indexOf(targetName) !== -1 ? 'named' : 'default', chunkFileNames: 'chunks/[name]-[hash].js',
name: umdName, format,
sourcemap: true, exports: ['test-utils', 'stardust'].indexOf(targetName) !== -1 ? 'named' : 'default',
banner, sourcemap: true,
globals, banner,
inlineDynamicImports: true, globals,
}, inlineDynamicImports: false,
}
: {
file,
format,
exports: ['test-utils', 'stardust'].indexOf(targetName) !== -1 ? 'named' : 'default',
name: umdName,
sourcemap: true,
banner,
globals,
inlineDynamicImports: true,
},
external, external,
plugins: [ plugins: [
replace({ replace({
@@ -227,6 +239,23 @@ let dist = [
}) })
: false, : false,
targetName === 'stardust'
? config({
format: 'systemjs',
targetPkg: pkg,
file: path.resolve(targetDir, getFileName('systemjs', false)),
})
: false,
targetName === 'stardust'
? config({
debug: true,
format: 'systemjs',
targetPkg: pkg,
file: path.resolve(targetDir, getFileName('systemjs', true)),
})
: false,
// core esm // core esm
corePkg && corePkg.module corePkg && corePkg.module
? config({ ? config({

View File

@@ -4313,7 +4313,6 @@ __metadata:
dependencies: dependencies:
"@babel/cli": "npm:7.28.3" "@babel/cli": "npm:7.28.3"
"@babel/core": "npm:7.28.4" "@babel/core": "npm:7.28.4"
"@babel/plugin-transform-react-jsx": "npm:7.27.1"
"@babel/preset-env": "npm:7.28.3" "@babel/preset-env": "npm:7.28.3"
"@babel/preset-react": "npm:7.27.1" "@babel/preset-react": "npm:7.27.1"
"@babel/preset-typescript": "npm:7.27.1" "@babel/preset-typescript": "npm:7.27.1"
@@ -4469,7 +4468,7 @@ __metadata:
"@nebula.js/supernova": "npm:^6.0.0" "@nebula.js/supernova": "npm:^6.0.0"
"@nebula.js/theme": "npm:^6.0.0" "@nebula.js/theme": "npm:^6.0.0"
"@nebula.js/ui": "npm:^6.0.0" "@nebula.js/ui": "npm:^6.0.0"
"@qlik/api": "npm:1.44.0" "@qlik/api": "npm:1.46.0"
"@testing-library/dom": "npm:^10.4.1" "@testing-library/dom": "npm:^10.4.1"
"@testing-library/react": "npm:^16.3.0" "@testing-library/react": "npm:^16.3.0"
extend: "npm:3.0.2" extend: "npm:3.0.2"
@@ -4506,7 +4505,7 @@ __metadata:
"@nebula.js/supernova": "npm:^6.0.0" "@nebula.js/supernova": "npm:^6.0.0"
"@nebula.js/theme": "npm:^6.0.0" "@nebula.js/theme": "npm:^6.0.0"
"@nebula.js/ui": "npm:^6.0.0" "@nebula.js/ui": "npm:^6.0.0"
"@qlik/api": "npm:1.44.0" "@qlik/api": "npm:1.46.0"
"@scriptappy/cli": "npm:0.10.0" "@scriptappy/cli": "npm:0.10.0"
"@scriptappy/from-jsdoc": "npm:0.19.0" "@scriptappy/from-jsdoc": "npm:0.19.0"
"@scriptappy/to-dts": "npm:1.0.0" "@scriptappy/to-dts": "npm:1.0.0"
@@ -5105,16 +5104,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@qlik/api@npm:1.44.0": "@qlik/api@npm:1.46.0":
version: 1.44.0 version: 1.46.0
resolution: "@qlik/api@npm:1.44.0" resolution: "@qlik/api@npm:1.46.0"
dependencies: dependencies:
enigma.js: "npm:^2.14.0" enigma.js: "npm:^2.14.0"
extend: "npm:3.0.2" extend: "npm:3.0.2"
lodash: "npm:^4.17.21" lodash: "npm:^4.17.21"
nanoid: "npm:^5.1.5" nanoid: "npm:^5.1.6"
ws: "npm:^8.18.3" ws: "npm:^8.18.3"
checksum: 10c0/f92bf7333f4fcfb3698cb4b17f1e1c96fa0b220ecf71e6ec7974d3bba36980943d39eaeb9963b35f9371629e4c7df2ca4ccc7466e1eeecb0ff4d3d01f8c5dfbe checksum: 10c0/5f0993cb0e8880a7f89c4410354db4b945e0f8624db7d4b604165adcd42a59b2292b1de926749bf5bc0842e424731cccca4ffc7d808987a689ce24b7bba3ddac
languageName: node languageName: node
linkType: hard linkType: hard
@@ -15996,12 +15995,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"nanoid@npm:^5.1.5": "nanoid@npm:^5.1.6":
version: 5.1.5 version: 5.1.6
resolution: "nanoid@npm:5.1.5" resolution: "nanoid@npm:5.1.6"
bin: bin:
nanoid: bin/nanoid.js nanoid: bin/nanoid.js
checksum: 10c0/e6004f1ad6c7123eeb037062c4441d44982037dc043aabb162457ef6986e99964ba98c63c975f96c547403beb0bf95bc537bd7bf9a09baf381656acdc2975c3c checksum: 10c0/27b5b055ad8332cf4f0f9f6e2a494aa7e5ded89df4cab8c8490d4eabefe72c4423971d2745d22002868b1d50576a5e42b7b05214733b19f576382323282dd26e
languageName: node languageName: node
linkType: hard linkType: hard