Skip to content

Commit

Permalink
Merge pull request #2117 from RedHatInsights/revert-2116-nx-downgrade
Browse files Browse the repository at this point in the history
Revert "chore: downgrade NX to attempt fix release issues"
  • Loading branch information
florkbr authored Nov 22, 2024
2 parents ef7445e + b249a75 commit c2e8d2e
Show file tree
Hide file tree
Showing 12 changed files with 2,811 additions and 2,919 deletions.
3 changes: 2 additions & 1 deletion examples/demo/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { defineConfig } from 'vite';
import react from '@vitejs/plugin-react';
import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';

export default defineConfig({
root: __dirname,
cacheDir: '../../node_modules/.vite/examples/demo',
plugins: [react(), nxViteTsPaths()],
plugins: [react(), nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
// Uncomment this if you are using workers.
// worker: {
// plugins: [ nxViteTsPaths() ],
Expand Down
12 changes: 8 additions & 4 deletions examples/demo/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// const { NxAppWebpackPlugin } = require('@nx/webpack/app-plugin');
// const { NxReactWebpackPlugin } = require('@nx/react/webpack-plugin');
const { NxWebpackPlugin } = require('@nx/webpack');
const { NxAppWebpackPlugin } = require('@nx/webpack/app-plugin');
const { NxReactWebpackPlugin } = require('@nx/react/webpack-plugin');
const { join } = require('path');

module.exports = {
Expand All @@ -16,7 +15,7 @@ module.exports = {
},
},
plugins: [
new NxWebpackPlugin({
new NxAppWebpackPlugin({
tsConfig: './tsconfig.app.json',
compiler: 'babel',
main: './src/main.tsx',
Expand All @@ -27,5 +26,10 @@ module.exports = {
outputHashing: process.env['NODE_ENV'] === 'production' ? 'all' : 'none',
optimization: process.env['NODE_ENV'] === 'production',
}),
new NxReactWebpackPlugin({
// Uncomment this line if you don't want to use SVGR
// See: https://react-svgr.com/
// svgr: false
}),
],
};
12 changes: 12 additions & 0 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,18 @@
"componentTestingTargetName": "component-test",
"ciTargetName": "e2e-ci"
}
},
{
"plugin": "@nx/js/typescript",
"options": {
"typecheck": {
"targetName": "tsc:typecheck"
},
"build": {
"targetName": "tsc:build",
"configName": "tsconfig.lib.json"
}
}
}
],
"generators": {
Expand Down
Loading

0 comments on commit c2e8d2e

Please sign in to comment.