forked from rancher/dashboard
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Note - Contains tweaks as per comments in test-plugins-build.sh - shell/creators/app/app.package.json - shell/vue.config.js
- Loading branch information
1 parent
b7a64de
commit ad27b2e
Showing
10 changed files
with
92 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,18 @@ | ||
| module.exports = require('@rancher/shell/babel.config.js'); | ||
| module.exports = { | ||
| env: { | ||
| test: { | ||
| plugins: [ | ||
| [ | ||
| 'module-resolver', | ||
| { | ||
| root: ['.'], | ||
| alias: { | ||
| '@': '.', | ||
| '~': '.', | ||
| }, | ||
| }, | ||
| ], | ||
| ], | ||
| }, | ||
| }, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,7 @@ | ||
| /** | ||
| * This file is here purely to support using the typescript version of the vue config vue.config.ts. | ||
| */ | ||
| require('ts-node').register({ | ||
| project: './tsconfig.json', | ||
| compilerOptions: { module: 'commonjs' }, | ||
| logError: true | ||
| }); | ||
| const config = require('./node_modules/@rancher/shell/vue.config'); | ||
|
|
||
| module.exports = require('./vue.config.ts').default; | ||
| module.exports = config(__dirname, { | ||
| excludes: [], | ||
| // excludes: ['fleet', 'example'] | ||
| // autoLoad: ['fleet', 'example'] | ||
| }); |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -108,13 +108,18 @@ if [ "${SKIP_STANDALONE}" == "false" ]; then | |
| yarn install | ||
|
|
||
| echo "Building skeleton app" | ||
| # Fails. Fixed by adding "ts-loader": "^8.0.17" as devDependencies to shell/creators/app/app.package.json | ||
| # (note - @nuxt/[email protected] brings in [email protected], @vue/[email protected] brings in @vue/[email protected]) | ||
| FORCE_COLOR=true yarn build | cat | ||
|
|
||
| # Package creator | ||
| echo "Verifying package creator package" | ||
| yarn create @rancher/pkg test-pkg | ||
| yarn create @rancher/pkg test-pkg # succeeds | ||
|
|
||
| echo "Building test package" | ||
| # Failures | ||
| # # 1 - Missing `@vue/cli-plugin-typescript` dep. Adding "@vue/cli-plugin-babel": "4.5.15" to app.package.json devDependencies causes `yarn build` from above to fail with `orig not function`` | ||
| # # 2 - Fix for `orign not function` `shell/vue.config.js` in `config.module.rules.forEach((r)` const orig = r.exclude.length ? r.exclude[0] : r.exclude. (r.exclude is now an array). Causes issues with worker files `Cannot read properties of undefined (reading 'options')`` | ||
| FORCE_COLOR=true yarn build-pkg test-pkg | cat | ||
|
|
||
| # Add test list component to the test package | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,16 @@ | ||
| require('ts-node').register({ | ||
| project: './tsconfig.json', | ||
| compilerOptions: { module: 'commonjs' }, | ||
| logError: true | ||
| }); | ||
|
|
||
| module.exports = require('./vue.config.ts').default; | ||
| const config = require('./shell/vue.config'); | ||
|
|
||
| // Excludes the following plugins if there's no .env file. | ||
| let defaultExcludes = 'epinio, rancher-components, harvester'; | ||
|
|
||
| if (process.env.RANCHER_ENV === 'harvester') { | ||
| defaultExcludes = defaultExcludes.replace(', harvester', ''); | ||
| } | ||
| const excludes = process.env.EXCLUDES_PKG || defaultExcludes; | ||
|
|
||
| module.exports = config(__dirname, { | ||
| excludes: excludes.replace(/\s/g, '').split(','), | ||
| // excludes: ['fleet', 'example'] | ||
| // autoLoad: ['fleet', 'example'] | ||
| }); |
Oops, something went wrong.