Skip to content

Commit cbbd354

Browse files
committed
import
1 parent 3f936dd commit cbbd354

File tree

144 files changed

+1451
-840
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+1451
-840
lines changed

.gitignore

Lines changed: 108 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,108 @@
1-
.idea
2-
.vscode
3-
.env
1+
# Documentation at https://git-scm.com/docs/gitignore.
2+
3+
#
4+
# Misc Ignores
5+
#
6+
7+
\#*#
8+
*.pid
9+
*.pid.oldbin
10+
*_temp.json
11+
*~
12+
**/.bundle
13+
**/.vscode
14+
dashboard/brakeman_security_report.htm
15+
.DS_Store
16+
.dropbox
17+
.tmputils
18+
.rakeTasks
19+
.tscache/
20+
.idea/
21+
.irb_history
22+
jsconfig.json
23+
npm-debug.log
24+
/.dropbox.cache
25+
/.gdrive_session
26+
/build-started
27+
/coverage
28+
/crontab
29+
/globals.yml
30+
/levelbuilder_ci_last_run
31+
/locals.yml
32+
/log
33+
/rebuild
34+
/rebuild-apps
35+
/rebuild-shared
36+
/rebuild-code-studio
37+
38+
#
39+
# JS Ignores
40+
#
41+
42+
/apps/.babel-cache
43+
/apps/build
44+
/apps/build-times.log
45+
/apps/build-times-to-upload.log
46+
/apps/coverage
47+
/apps/log
48+
/apps/node_modules/
49+
/bin/i18n/node_modules/
50+
/apps/npm-debug.log
51+
/apps/src/generated/*
52+
!/apps/src/generated/README.md
53+
/apps/src/util/color.js
54+
/apps/src/styleConstants.js
55+
/apps/src/fontConstants.js
56+
/apps/storybook-deploy
57+
/apps/generated-scripts/
58+
/apps/yarn-error.log
59+
60+
# Yarn ignores based on documentation at https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
61+
/apps/.pnp.*
62+
/apps/.yarn/*
63+
!/apps/.yarn/patches
64+
!/apps/.yarn/plugins
65+
!/apps/.yarn/releases
66+
!/apps/.yarn/sdks
67+
!/apps/.yarn/versions
68+
69+
#
70+
# Other Subdirectory-Specific Ignores
71+
#
72+
73+
/aws/.code-studio-built
74+
/aws/.code-studio-commit-built
75+
/aws/.shared-built
76+
/aws/.shared-commit-built
77+
/aws/offsite/lambda/*/node_modules/
78+
/aws/offsite/lambda/*.zip
79+
/bin/cron/.dts
80+
/bin/cron/log
81+
/bin/i18n/*_credentials.yml
82+
/bin/i18n/crowdin/etags/*testing_etags.json
83+
/bin/i18n/crowdin/etags/*test_etags.json
84+
/bin/i18n/crowdin/etags/**/*testing.json
85+
/bin/i18n/crowdin/etags/**/*test.json
86+
/bin/test/coverage
87+
/dashboard/config/newrelic.yml
88+
/dashboard/db/ui_test_data.*
89+
/dashboard/public/blockly
90+
/dashboard/public/code-studio
91+
/dashboard/public/shared
92+
/dashboard/public/styleguide
93+
/pegasus/config/newrelic.yml
94+
/pegasus/.sass-cache
95+
/pegasus/sites.v3/*/public/css/generated
96+
/tools/scripts/brokenLinkChecker/node_modules/
97+
/i18n/crowdin/*
98+
/i18n/locales/*/codeorg-markdown/
99+
/i18n/locales/*/curriculum_content/
100+
/i18n/locales/*/piskel/
101+
/i18n/locales/*/standards/
102+
/i18n/locales/*/docs/
103+
104+
# python venv:
105+
.venv
106+
.pdm-python
107+
108+
skaffold-build-tags.json

frontend/.nvmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

frontend/apps/design-system-storybook/.storybook/main.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import {join, dirname, resolve} from 'node:path';
21
import {StorybookConfig} from '@storybook/react-webpack5';
2+
import {join, dirname, resolve} from 'node:path';
3+
import {IgnorePlugin} from 'webpack';
34

45
/**
56
* This function is used to resolve the absolute path of a package.
@@ -72,6 +73,7 @@ const config: StorybookConfig = {
7273
name: getAbsolutePath('@storybook/react-webpack5'),
7374
options: {},
7475
},
76+
staticDirs: ['../public'],
7577
swc: () => ({
7678
// Removes the need to import React by specifying we are targeting React 17+ using the React jsx transform
7779
// See: https://storybook.js.org/docs/8.5/configure/integration/compilers#the-swc-compiler-doesnt-work-with-react
@@ -88,9 +90,21 @@ const config: StorybookConfig = {
8890
config.resolve.alias = {
8991
...config.resolve.alias,
9092
'@': resolve(__dirname, '../../../packages/component-library/src'),
93+
'@public': resolve(__dirname, '../public'),
9194
};
9295
}
9396

97+
if (config.plugins) {
98+
// Ignore the auto generated index.css which is bundled by tsup
99+
// webpack generates its own css in the styling plugin above
100+
config.plugins.push(
101+
new IgnorePlugin({
102+
resourceRegExp: /^\.\/index.css$/,
103+
contextRegExp: /component-library\/src/,
104+
}),
105+
);
106+
}
107+
94108
return config;
95109
},
96110
typescript: {

frontend/apps/design-system-storybook/.storybook/preview.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {default as RtlPreview} from 'storybook-addon-rtl/preview';
2+
23
import {loadFonts} from '@code-dot-org/fonts';
34

45
import '@code-dot-org/fonts/index.css';

frontend/apps/design-system-storybook/.storybook/styles/fonts

Lines changed: 0 additions & 1 deletion
This file was deleted.

frontend/apps/design-system-storybook/.storybook/test-runner.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import type {TestRunnerConfig} from '@storybook/test-runner';
22
import {getStoryContext} from '@storybook/test-runner';
3-
43
import {injectAxe, checkA11y} from 'axe-playwright';
54

65
/*

frontend/apps/design-system-storybook/applitools.config.cjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ module.exports = {
1111
showLogs: !!process.env.APPLITOOLS_SHOW_LOGS,
1212
appName: 'Code.org Design System',
1313
batchName: 'Component Library',
14+
dontCloseBatches: true,
1415
browser: [
1516
{width: 1200, height: 800, name: 'chrome'},
1617
{width: 1200, height: 800, name: 'firefox'},

frontend/apps/design-system-storybook/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"include": [".storybook/**/*"],
44
"compilerOptions": {
55
"paths": {
6-
"@/*": ["../../packages/component-library/src/*"]
6+
"@/*": ["../../packages/component-library/src/*"],
7+
"@public/*": ["./public/*"]
78
}
89
}
910
}

frontend/apps/marketing/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@ WORKDIR /app
5959
# First install the dependencies (as they change less often)
6060
COPY --link --from=source-code /app/out/json/ .
6161
RUN yarn install
62-
62+
6363
# Build the project
64+
COPY --link --from=source-code /app/.turbo .turbo
6465
COPY --link --from=source-code /app/out/full/ .
6566
RUN yarn turbo run build
6667

@@ -76,15 +77,15 @@ RUN yarn turbo run build
7677

7778
FROM base AS runner
7879
WORKDIR /app
79-
80+
8081
# Don't run production as root
8182
RUN addgroup --system --gid 1001 nodejs
8283
RUN adduser --system --uid 1001 nextjs
8384
USER nextjs
84-
85+
8586
# Automatically leverage output traces to reduce image size
8687
# https://nextjs.org/docs/advanced-features/output-file-tracing
8788
COPY --link --from=builder --chown=nextjs:nodejs /app/apps/marketing/.next/standalone ./
8889
COPY --link --from=builder --chown=nextjs:nodejs /app/apps/marketing/.next/static ./apps/marketing/.next/static
89-
90+
9091
CMD ["node", "apps/marketing/server.js"]

frontend/apps/marketing/eslint.config.mjs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import cdoReactConfig from '@code-dot-org/lint-config/eslint/react.mjs';
2-
import cdoJestConfig from '@code-dot-org/lint-config/eslint/jest.mjs';
31
import nextPlugin from '@next/eslint-plugin-next';
42

3+
import cdoJestConfig from '@code-dot-org/lint-config/eslint/jest.mjs';
4+
import cdoReactConfig from '@code-dot-org/lint-config/eslint/react.mjs';
5+
56
/** @type {import('eslint').Linter.Config[]} */
67
export default [
78
{

0 commit comments

Comments
 (0)