Skip to content

Commit

Permalink
build: update to rollup 3
Browse files Browse the repository at this point in the history
  • Loading branch information
diegopf committed Nov 16, 2023
1 parent d40ae0a commit 5fb60eb
Show file tree
Hide file tree
Showing 11 changed files with 2,857 additions and 8,002 deletions.
2 changes: 1 addition & 1 deletion packages/x-archetype-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@vue/test-utils": "~1.0.3",
"jest": "~27.5.0",
"rimraf": "~3.0.2",
"rollup": "~2.79.1",
"rollup": "~3.29.4",
"rollup-plugin-copy": "~3.4.0",
"rollup-plugin-delete": "~2.0.0",
"rollup-plugin-typescript2": "~0.34.1",
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions packages/x-components/build/rollup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const rollupConfig = createRollupOptions({
* Because of that, when rollup detects a circular dependency (it emits a warning), we stop
* the build with an error */
if (warning.code === 'CIRCULAR_DEPENDENCY') {
throw Error(`Circular dependency found: ${warning.cycle?.join(' ') as string}`);
throw Error(`Circular dependency found: ${warning.ids?.join(' ') as string}`);
}
},
external(id) {
Expand Down Expand Up @@ -136,9 +136,9 @@ export const rollupConfig = createRollupOptions({
const commonCssOptions = createRollupOptions({
output: {
dir: cssOutputDirectory,
assetFileNames: '[name][extname]'
},
preserveModules: true
assetFileNames: '[name][extname]',
preserveModules: true
}
});

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/x-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
"postcss-dir-pseudo-class": "~7.0.0",
"postcss-logical": "~4.0.2",
"rimraf": "~3.0.2",
"rollup": "~2.79.1",
"rollup": "~3.29.4",
"rollup-plugin-copy": "~3.4.0",
"rollup-plugin-delete": "~2.0.0",
"rollup-plugin-rename": "~1.0.1",
Expand Down
1 change: 0 additions & 1 deletion packages/x-components/src/types/origin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ export type QueryOrigin = `${QueryFeature}:${FeatureLocation}`;
* @public
*/
export type ResultOrigin = `${ResultFeature}:${FeatureLocation}`;

/**
* The name of the tool that generated the query.
*
Expand Down
3 changes: 2 additions & 1 deletion packages/x-components/src/views/base-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export const baseInstallXOptions: InstallXOptions = {
config: {
filtersStrategyForRequest: 'leaves-only'
}
}
},
search: {}
}
};
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import { resolve } from 'path';
import commonjs from '@rollup/plugin-commonjs';
import typescript from 'rollup-plugin-typescript2';
import vue from 'rollup-plugin-vue';
import * as url from 'url';
const __dirname = url.fileURLToPath(new URL('.', import.meta.url));

export default {
input: resolve(__dirname, 'src/index.ts'),
Expand Down
4 changes: 2 additions & 2 deletions packages/x-tailwindcss/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"dev": "vite serve demo",
"dev:build": "vite build demo",
"prebuild": "rimraf ./dist ./showcase ./*.tgz",
"build": "rollup -c && rollup -c demo/rollup.config.js",
"build": "rollup -c && rollup -c demo/rollup.config.mjs",
"postbuild": "pnpm pack",
"lint": "eslint . --ext .ts,.vue",
"prepublishOnly": "pnpm run build"
Expand Down Expand Up @@ -62,7 +62,7 @@
"postcss": "~8.4.12",
"postcss-import": "~15.1.0",
"rimraf": "~3.0.2",
"rollup": "~2.79.1",
"rollup": "~3.29.4",
"rollup-plugin-typescript2": "~0.34.1",
"rollup-plugin-vue": "~5.1.9",
"tailwindcss": "~3.3.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { resolve } from 'path';
import typescript from 'rollup-plugin-typescript2';
import commonjs from '@rollup/plugin-commonjs';
import * as url from 'url';
const __dirname = url.fileURLToPath(new URL('.', import.meta.url));

export default {
input: resolve(__dirname, 'src/index.ts'),
Expand Down
2 changes: 1 addition & 1 deletion packages/x-types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@microsoft/api-extractor": "~7.35.0",
"@types/jest": "~27.5.0",
"jest": "~27.5.0",
"rollup": "~2.79.1",
"rollup": "~3.29.4",
"rollup-plugin-delete": "~2.0.0",
"rollup-plugin-typescript2": "~0.34.1",
"typescript": "~4.9.4"
Expand Down
Loading

0 comments on commit 5fb60eb

Please sign in to comment.