Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"{projectRoot}/tsconfig.json",
"{projectRoot}/package.json",
"{projectRoot}/modern.config.*",
"{projectRoot}/rslib.config.*",
"{projectRoot}/scripts/**/*"
]
},
Expand Down
5 changes: 0 additions & 5 deletions packages/cli/plugin-bff/modern.config.js

This file was deleted.

33 changes: 29 additions & 4 deletions packages/cli/plugin-bff/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,37 +19,61 @@
"jsnext:source": "./src/cli.ts",
"types": "./src/cli.ts",
"main": "./dist/cjs/cli.js",
"module": "./dist/esm/cli.js",
"module": "./dist/esm-node/cli.mjs",
"exports": {
"./types": "./types.d.ts",
".": {
"types": "./dist/types/cli.d.ts",
"jsnext:source": "./src/cli.ts",
"node": {
"import": "./dist/esm-node/cli.mjs",
"require": "./dist/cjs/cli.js"
},
"default": "./dist/cjs/cli.js"
},
"./cli": {
"types": "./dist/types/cli.d.ts",
"jsnext:source": "./src/cli.ts",
"node": {
"import": "./dist/esm-node/cli.mjs",
"require": "./dist/cjs/cli.js"
},
"default": "./dist/cjs/cli.js"
},
"./server-plugin": {
"types": "./dist/types/server.d.ts",
"jsnext:source": "./src/server.ts",
"node": {
"import": "./dist/esm-node/server.mjs",
"require": "./dist/cjs/server.js"
},
"default": "./dist/cjs/server.js"
},
"./loader": {
"types": "./dist/types/loader.d.ts",
"jsnext:source": "./src/loader.ts",
"node": {
"import": "./dist/esm-node/loader.mjs",
"require": "./dist/cjs/loader.js"
},
"default": "./dist/cjs/loader.js"
},
"./server": {
"types": "./dist/types/runtime/hono/index.d.ts",
"jsnext:source": "./src/runtime/hono/index.ts",
"node": {
"import": "./dist/esm-node/runtime/hono/index.mjs",
"require": "./dist/cjs/runtime/hono/index.js"
},
"default": "./dist/cjs/runtime/hono/index.js"
},
"./client": {
"types": "./dist/types/create-request/index.d.ts",
"jsnext:source": "./src/runtime/create-request/index.ts",
"node": {
"import": "./dist/esm-node/runtime/create-request/index.mjs",
"require": "./dist/cjs/runtime/create-request/index.js"
},
"default": "./dist/cjs/runtime/create-request/index.js"
}
},
Expand All @@ -75,8 +99,8 @@
"scripts": {
"prepublishOnly": "only-allow-pnpm",
"new": "modern-lib new",
"build": "modern-lib build",
"dev": "modern-lib build --watch",
"build": "rslib build",
"dev": "rslib build --watch",
"test": "jest --passWithNoTests"
},
"dependencies": {
Expand All @@ -96,9 +120,10 @@
"@modern-js/plugin": "workspace:*",
"@modern-js/runtime": "workspace:*",
"@modern-js/types": "workspace:*",
"@scripts/build": "workspace:*",
"@rsbuild/core": "1.6.7",
"@scripts/jest-config": "workspace:*",
"@rslib/core": "0.18.0",
"@modern-js/rslib": "workspace:*",
"@types/babel__core": "^7.20.5",
"@types/jest": "^29.5.14",
"@types/node": "^20",
Expand Down
4 changes: 4 additions & 0 deletions packages/cli/plugin-bff/rslib.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { rslibConfig } from '@modern-js/rslib';
import { defineConfig } from '@rslib/core';

export default defineConfig(rslibConfig);
3 changes: 2 additions & 1 deletion packages/cli/plugin-bff/src/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,13 @@ export const bffPlugin = (): CliPlugin<AppTools> => ({
);

const name = isServer ? 'server' : 'client';
const loaderPath = require.resolve('./loader');
chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(apiRegexp);
chain.module
.rule('js-bff-api')
.test(apiRegexp)
.use('custom-loader')
.loader(require.resolve('./loader').replace(/\\/g, '/'))
.loader(loaderPath.replace(/\\/g, '/'))
.options({
prefix,
appDir: appDirectory,
Expand Down
5 changes: 0 additions & 5 deletions packages/cli/plugin-data-loader/modern.config.js

This file was deleted.

11 changes: 6 additions & 5 deletions packages/cli/plugin-data-loader/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"jsnext:source": "./src/runtime/index.ts",
"types": "./src/runtime/index.ts",
"main": "./dist/cjs/runtime/index.js",
"module": "./dist/esm/runtime/index.js",
"module": "./dist/esm/runtime/index.mjs",
"exports": {
"./loader": {
"types": "./dist/types/cli/loader.d.ts",
Expand All @@ -32,7 +32,7 @@
"./runtime": {
"types": "./dist/types/runtime/index.d.ts",
"jsnext:source": "./src/runtime/index.ts",
"default": "./dist/esm/runtime/index.js"
"default": "./dist/esm/runtime/index.mjs"
}
},
"typesVersions": {
Expand All @@ -48,8 +48,8 @@
"scripts": {
"prepublishOnly": "only-allow-pnpm",
"new": "modern-lib new",
"build": "modern-lib build",
"dev": "modern-lib build --watch",
"build": "rslib build",
"dev": "rslib build --watch",
"test": "jest --passWithNoTests"
},
"dependencies": {
Expand All @@ -62,8 +62,9 @@
"devDependencies": {
"@modern-js/server-core": "workspace:*",
"@modern-js/types": "workspace:*",
"@scripts/build": "workspace:*",
"@scripts/jest-config": "workspace:*",
"@rslib/core": "0.18.0",
"@modern-js/rslib": "workspace:*",
"@types/babel__core": "^7.20.5",
"@types/jest": "^29.5.14",
"@types/node": "^20",
Expand Down
4 changes: 4 additions & 0 deletions packages/cli/plugin-data-loader/rslib.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { rslibConfig } from '@modern-js/rslib';
import { defineConfig } from '@rslib/core';

export default defineConfig(rslibConfig);
5 changes: 0 additions & 5 deletions packages/cli/plugin-ssg/modern.config.js

This file was deleted.

26 changes: 14 additions & 12 deletions packages/cli/plugin-ssg/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"jsnext:source": "./src/index.ts",
"types": "./src/index.ts",
"main": "./dist/cjs/index.js",
"module": "./dist/esm/index.js",
"module": "./dist/esm/index.mjs",
"typesVersions": {
"*": {
".": [
Expand All @@ -33,36 +33,37 @@
"exports": {
".": {
"types": "./dist/types/index.d.ts",
"jsnext:source": "./src/index.ts",
"node": {
"jsnext:source": "./src/index.ts",
"import": "./dist/esm-node/index.js",
"import": "./dist/esm-node/index.mjs",
"require": "./dist/cjs/index.js"
},
"default": "./dist/esm/index.js"
"default": "./dist/esm/index.mjs"
},
"./cli": {
"types": "./dist/types/index.d.ts",
"jsnext:source": "./src/index.ts",
"node": {
"import": "./dist/esm-node/index.js",
"import": "./dist/esm-node/index.mjs",
"require": "./dist/cjs/index.js"
},
"default": "./dist/esm/index.js"
"default": "./dist/esm/index.mjs"
},
"./types": {
"types": "./dist/types/types.d.ts",
"jsnext:source": "./src/types.ts",
"node": {
"types": "./dist/types/types.d.ts",
"import": "./dist/esm-node/types.js",
"import": "./dist/esm-node/types.mjs",
"require": "./dist/cjs/types.js"
},
"default": "./dist/esm/types.js"
"default": "./dist/esm/types.mjs"
}
},
"scripts": {
"prepublishOnly": "only-allow-pnpm",
"new": "modern-lib new",
"build": "modern-lib build",
"dev": "modern-lib build --watch",
"build": "rslib build",
"dev": "rslib build --watch",
"test": "jest --passWithNoTests"
},
"dependencies": {
Expand All @@ -83,8 +84,9 @@
"devDependencies": {
"@modern-js/app-tools": "workspace:*",
"@modern-js/types": "workspace:*",
"@scripts/build": "workspace:*",
"@scripts/jest-config": "workspace:*",
"@rslib/core": "0.18.0",
"@modern-js/rslib": "workspace:*",
"@types/jest": "^29.5.14",
"@types/node": "^20",
"jest": "^29.7.0",
Expand Down
4 changes: 4 additions & 0 deletions packages/cli/plugin-ssg/rslib.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { rslibConfig } from '@modern-js/rslib';
import { defineConfig } from '@rslib/core';

export default defineConfig(rslibConfig);
5 changes: 0 additions & 5 deletions packages/cli/plugin-styled-components/modern.config.js

This file was deleted.

25 changes: 20 additions & 5 deletions packages/cli/plugin-styled-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@
"jsnext:source": "./src/index.ts",
"types": "./src/index.ts",
"main": "./dist/cjs/index.js",
"module": "./dist/esm/index.js",
"module": "./dist/esm/index.mjs",
"scripts": {
"build": "modern-lib build"
"dev": "rslib build --watch",
"build": "rslib build"
},
"dependencies": {
"@swc/helpers": "^0.5.17",
Expand All @@ -24,6 +25,8 @@
"devDependencies": {
"@modern-js/app-tools": "workspace:*",
"@modern-js/runtime": "workspace:*",
"@rslib/core": "0.18.0",
"@modern-js/rslib": "workspace:*",
"@types/styled-components": "^5.1.35",
"styled-components": "^5.3.1",
"@types/jest": "^29.5.14",
Expand All @@ -42,17 +45,29 @@
".": {
"types": "./dist/types/index.d.ts",
"jsnext:source": "./src/index.ts",
"default": "./dist/cjs/index.js"
"node": {
"import": "./dist/esm-node/index.mjs",
"require": "./dist/cjs/index.js"
},
"default": "./dist/esm/index.mjs"
},
"./runtime": {
"types": "./dist/types/runtime.d.ts",
"jsnext:source": "./src/runtime.ts",
"default": "./dist/cjs/runtime.js"
"node": {
"import": "./dist/esm-node/runtime.mjs",
"require": "./dist/cjs/runtime.js"
},
"default": "./dist/esm/runtime.mjs"
},
"./styled": {
"types": "./dist/types/styled.d.ts",
"jsnext:source": "./src/styled.ts",
"default": "./dist/cjs/styled.js"
"node": {
"import": "./dist/esm-node/styled.mjs",
"require": "./dist/cjs/styled.js"
},
"default": "./dist/esm/styled.mjs"
}
},
"typesVersions": {
Expand Down
4 changes: 4 additions & 0 deletions packages/cli/plugin-styled-components/rslib.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { rslibConfig } from '@modern-js/rslib';
import { defineConfig } from '@rslib/core';

export default defineConfig(rslibConfig);
5 changes: 0 additions & 5 deletions packages/generator/sandpack-react/modern.config.js

This file was deleted.

25 changes: 16 additions & 9 deletions packages/generator/sandpack-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,30 @@
"jsnext:source": "./src/index.ts",
"types": "./src/index.ts",
"main": "./dist/cjs/index.js",
"module": "./dist/esm/index.js",
"module": "./dist/esm/index.mjs",
"exports": {
".": {
"types": "./dist/types/index.d.ts",
"jsnext:source": "./src/index.ts",
"node": {
"jsnext:source": "./src/index.ts",
"import": "./dist/esm-node/index.js",
"import": "./dist/esm-node/index.mjs",
"require": "./dist/cjs/index.js"
},
"default": {
"types": "./dist/types/index.d.ts",
"import": "./dist/esm/index.js"
}
"default": "./dist/esm/index.mjs"
}
},
"typesVersions": {
"*": {
".": [
"./dist/types/index.d.ts"
]
}
},
"scripts": {
"prepublishOnly": "only-allow-pnpm",
"new": "modern-lib new",
"build": "ts-node scripts/template.ts && modern-lib build",
"build": "ts-node scripts/template.ts && rslib build",
"dev": "rslib build --watch",
"test": "jest --passWithNoTests"
},
"dependencies": {
Expand All @@ -53,8 +59,9 @@
"@modern-js/generator-common": "workspace:*",
"@modern-js/generator-utils": "workspace:*",
"@modern-js/mwa-generator": "workspace:*",
"@scripts/build": "workspace:*",
"@scripts/jest-config": "workspace:*",
"@rslib/core": "0.18.0",
"@modern-js/rslib": "workspace:*",
"@types/jest": "^29.5.14",
"@types/node": "^20",
"@types/react": "^19.1.8",
Expand Down
4 changes: 4 additions & 0 deletions packages/generator/sandpack-react/rslib.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { rslibConfig } from '@modern-js/rslib';
import { defineConfig } from '@rslib/core';

export default defineConfig(rslibConfig);
5 changes: 0 additions & 5 deletions packages/runtime/plugin-i18n/modern.config.js

This file was deleted.

Loading