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

feat(remix): generate remix vite application #28555

Merged
merged 1 commit into from
Oct 29, 2024
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions docs/generated/packages/remix/generators/application.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
"description": "The name of the application.",
"x-priority": "important"
},
"js": {
"type": "boolean",
"description": "Generate JavaScript files rather than TypeScript files.",
"default": false
},
"linter": {
"description": "The tool to use for running lint checks.",
"type": "string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@
"x-prompt": "What project would you like to add Tailwind to?",
"pattern": "^[a-zA-Z].*$"
},
"js": {
"type": "boolean",
"description": "Generate a JavaScript config file instead of a TypeScript config file",
"default": false
},
"skipFormat": {
"type": "boolean",
"description": "Skip formatting files after generator runs",
Expand Down
10 changes: 5 additions & 5 deletions e2e/nx/src/workspace.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ describe('@nx/workspace:infer-targets', () => {
// default case, everything is generated with crystal, everything should be skipped
const remixApp = uniq('remix');
runCLI(
`generate @nx/remix:app apps/${remixApp} --unitTestRunner jest --e2eTestRunner=playwright --projectNameAndDirectoryFormat=as-provided --no-interactive`
`generate @nx/remix:app apps/${remixApp} --unitTestRunner jest --e2eTestRunner=playwright --no-interactive`
);

const output = runCLI(`generate infer-targets --no-interactive`);
const output = runCLI(`generate infer-targets --no-interactive --verbose`);

expect(output).toContain('@nx/remix:convert-to-inferred - Skipped');
expect(output).toContain('@nx/playwright:convert-to-inferred - Skipped');
Expand All @@ -60,7 +60,7 @@ describe('@nx/workspace:infer-targets', () => {
return json;
});

const output2 = runCLI(`generate infer-targets --no-interactive`);
const output2 = runCLI(`generate infer-targets --no-interactive --verbose`);

expect(output2).toContain('@nx/remix:convert-to-inferred - Success');
expect(output2).toContain('@nx/eslint:convert-to-inferred - Success');
Expand All @@ -70,7 +70,7 @@ describe('@nx/workspace:infer-targets', () => {
// default case, everything is generated with crystal, relevant plugins should be skipped
const remixApp = uniq('remix');
runCLI(
`generate @nx/remix:app apps/${remixApp} --unitTestRunner jest --e2eTestRunner=playwright --projectNameAndDirectoryFormat=as-provided --no-interactive`
`generate @nx/remix:app apps/${remixApp} --unitTestRunner jest --e2eTestRunner=playwright --no-interactive`
);

const output = runCLI(
Expand Down Expand Up @@ -116,7 +116,7 @@ describe('@nx/workspace:infer-targets', () => {
// even if we make sure there are executors for remix & remix-e2e, only remix conversions will run with --project option
const remixApp = uniq('remix');
runCLI(
`generate @nx/remix:app apps/${remixApp} --unitTestRunner jest --e2eTestRunner=playwright --projectNameAndDirectoryFormat=as-provided --no-interactive`
`generate @nx/remix:app apps/${remixApp} --unitTestRunner jest --e2eTestRunner=playwright --no-interactive`
);

updateJson('nx.json', (json) => {
Expand Down
2 changes: 1 addition & 1 deletion e2e/remix/src/nx-remix.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ describe('Remix E2E Tests', () => {

const result = runCLI(`build ${plugin}`);
expect(result).toContain('Successfully ran target build');
checkFilesExist(`subdir/build/index.js`);
checkFilesExist(`subdir/build/server/index.js`);
}, 120000);
});

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
"@pnpm/lockfile-types": "^6.0.0",
"@reduxjs/toolkit": "1.9.0",
"@remix-run/dev": "^2.8.1",
"@remix-run/node": "^2.8.1",
"@remix-run/dev": "^2.13.1",
"@remix-run/node": "^2.13.1",
"@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-image": "^3.0.3",
Expand Down
29 changes: 29 additions & 0 deletions packages/remix/migrations.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,35 @@
"alwaysAddToPackageJson": true
}
}
},
"20.1.0": {
"version": "20.1.0-beta.0",
"packages": {
"@remix-run/node": {
"version": "^2.13.1",
"alwaysAddToPackageJson": true
},
"@remix-run/react": {
"version": "^2.13.1",
"alwaysAddToPackageJson": true
},
"@remix-run/serve": {
"version": "^2.13.1",
"alwaysAddToPackageJson": true
},
"@remix-run/dev": {
"version": "^2.13.1",
"alwaysAddToPackageJson": true
},
"@remix-run/css-bundle": {
"version": "^2.13.1",
"alwaysAddToPackageJson": true
},
"@remix-run/eslint-config": {
"version": "^2.13.1",
"alwaysAddToPackageJson": true
}
}
}
}
}
4 changes: 3 additions & 1 deletion packages/remix/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@
"tslib": "^2.3.1",
"@phenomnomnominal/tsquery": "~5.0.1"
},
"peerDependencies": {},
"peerDependencies": {
"@remix-run/dev": "^2.13.1"
},
"publishConfig": {
"access": "public"
},
Expand Down
Loading
Loading